[Releng] Increase max line length to 160

1482 files changed, 8937 insertions, 13881 deletions

diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
index 164a03a435..07917e9946 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
@@ -39,8 +39,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminClientImpl extends AbstractCDOAdmin
-    implements CDOAdminClient, IPasswordCredentialsProvider.Provider, IConfirmationProvider.Provider
+public class CDOAdminClientImpl extends AbstractCDOAdmin implements CDOAdminClient, IPasswordCredentialsProvider.Provider, IConfirmationProvider.Provider
 {
   private static final String URL_SEPARATOR = "://";
 
@@ -173,8 +172,7 @@ public class CDOAdminClientImpl extends AbstractCDOAdmin
   {
     try
     {
-      return (IConfirmationProvider)container.getElement(IConfirmationProvider.Factory.PRODUCT_GROUP,
-          IConfirmationProvider.Factory.INTERACTIVE_TYPE, null);
+      return (IConfirmationProvider)container.getElement(IConfirmationProvider.Factory.PRODUCT_GROUP, IConfirmationProvider.Factory.INTERACTIVE_TYPE, null);
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
index b0b39f5362..26f4d2563f 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
@@ -29,8 +29,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminClientProtocol extends AuthenticatingSignalProtocol<CDOAdminClientImpl>
-    implements IConfirmationProvider.Provider
+public class CDOAdminClientProtocol extends AuthenticatingSignalProtocol<CDOAdminClientImpl> implements IConfirmationProvider.Provider
 {
   public CDOAdminClientProtocol(CDOAdminClientImpl admin)
   {
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CreateRepositoryRequest.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CreateRepositoryRequest.java
index 8cacadd983..99d75738cb 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CreateRepositoryRequest.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CreateRepositoryRequest.java
@@ -29,8 +29,7 @@ public class CreateRepositoryRequest extends RequestWithConfirmation<Boolean>
 
   private Map<String, Object> properties;
 
-  public CreateRepositoryRequest(CDOAdminClientProtocol protocol, String name, String type,
-      Map<String, Object> properties)
+  public CreateRepositoryRequest(CDOAdminClientProtocol protocol, String name, String type, Map<String, Object> properties)
   {
     super(protocol, CDOAdminProtocolConstants.SIGNAL_CREATE_REPOSITORY);
     this.name = name;
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
index 67dd1b8002..c246022cda 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.common.db;singleton:=true
-Bundle-Version: 3.0.500.qualifier
+Bundle-Version: 3.0.600.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)"
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.common.db;version="3.0.500",
- org.eclipse.emf.cdo.common.internal.db;version="3.0.500";x-friends:="org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.common.internal.db.bundle;version="3.0.500";x-internal:=true,
- org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.500";x-friends:="org.eclipse.emf.cdo.tests.db"
+Export-Package: org.eclipse.emf.cdo.common.db;version="3.0.600",
+ org.eclipse.emf.cdo.common.internal.db;version="3.0.600";x-friends:="org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.common.internal.db.bundle;version="3.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.600";x-friends:="org.eclipse.emf.cdo.tests.db"
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
index 98515cd2bd..96ab627956 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
@@ -36,8 +36,8 @@ public final class CDOCommonDBUtil
    * <p>
    * TODO Add all config parameters!
    */
-  public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider,
-      CDOListFactory listFactory, CDOPackageRegistry packageRegistry, CDORevisionFactory revisionFactory)
+  public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider, CDOListFactory listFactory,
+      CDOPackageRegistry packageRegistry, CDORevisionFactory revisionFactory)
   {
     DBRevisionCache cache = new DBRevisionCache();
     cache.setDBAdapter(dbAdapter);
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
index 18b1378142..840326240a 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
@@ -39,8 +39,7 @@ public class DBRevisionCacheUtil
   public static String getResourceNodeName(CDORevision revision)
   {
     CheckUtil.checkArg(revision.isResourceNode(), "The revision is not a resource node!");
-    EStructuralFeature feature = revision.getEClass()
-        .getEStructuralFeature(CDOModelConstants.RESOURCE_NODE_NAME_ATTRIBUTE);
+    EStructuralFeature feature = revision.getEClass().getEStructuralFeature(CDOModelConstants.RESOURCE_NODE_NAME_ATTRIBUTE);
     return (String)((InternalCDORevision)revision).getValue(feature);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index 47cbe5ac7d..cc51b0c4d5 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -544,8 +544,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
        * @throws SQLException
        *           the SQL exception
        */
-      private void setResourceNodeValues(InternalCDORevision revision, PreparedStatement preparedStatement)
-          throws SQLException
+      private void setResourceNodeValues(InternalCDORevision revision, PreparedStatement preparedStatement) throws SQLException
       {
         if (revision.isResourceNode())
         {
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
index 330c7f872a..27597a938a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
@@ -34,8 +34,7 @@ import org.eclipse.core.runtime.IAdaptable;
  * @apiviz.landmark
  * @apiviz.has {@link CDOCommonView.Options}
  */
-public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevisionProvider, IOptionsContainer,
-    IPropertiesContainer, IAdaptable, Closeable
+public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevisionProvider, IOptionsContainer, IPropertiesContainer, IAdaptable, Closeable
 {
   public int getViewID();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index 2c60fb3086..5ad33d8750 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -39,8 +39,7 @@ import org.eclipse.core.runtime.IAdaptable;
  * @apiviz.has {@link CDOBranchPoint} oneway - - base
  * @apiviz.composedOf {@link CDOBranch} - - subBranches
  */
-public interface CDOBranch
-    extends CDOBranchPoint, CDONameProvider, IContainer<CDOBranch>, Comparable<CDOBranch>, IAdaptable
+public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<CDOBranch>, Comparable<CDOBranch>, IAdaptable
 {
   /**
    * The fixed ID of the {@link CDOBranchManager#getMainBranch() main branch}.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
index db0d2d8644..933be691b6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
@@ -23,8 +23,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
  * @apiviz.landmark
  * @apiviz.uses {@link CDOCommitInfo} - - manages
  */
-public interface CDOCommitInfoManager
-    extends CDOCommitInfoProvider, CDOCommitHistory.Provider<CDOBranch, CDOCommitHistory>
+public interface CDOCommitInfoManager extends CDOCommitInfoProvider, CDOCommitHistory.Provider<CDOBranch, CDOCommitHistory>
 {
   /**
    * @since 4.2
@@ -51,8 +50,7 @@ public interface CDOCommitInfoManager
   /**
    * @since 4.0
    */
-  public void getCommitInfos(CDOBranch branch, long startTime, String reserved1, String reserved2, int count,
-      CDOCommitInfoHandler handler);
+  public void getCommitInfos(CDOBranch branch, long startTime, String reserved1, String reserved2, int count, CDOCommitInfoHandler handler);
 
   /**
    * @since 4.2
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
index 0c99803030..40b5fa5ce0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
@@ -161,8 +161,7 @@ public final class CDOIDUtil
         return ((CDOIDObjectLongWithClassifierImpl)id).getLongValue();
       }
 
-      throw new IllegalArgumentException(
-          MessageFormat.format(Messages.getString("CDOIDUtil.0"), id.getClass().getName())); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOIDUtil.0"), id.getClass().getName())); //$NON-NLS-1$
 
     case TEMP_OBJECT:
       throw new IllegalArgumentException(Messages.getString("CDOIDUtil.1")); //$NON-NLS-1$
@@ -172,8 +171,7 @@ public final class CDOIDUtil
       throw new IllegalArgumentException(Messages.getString("CDOIDUtil.2")); //$NON-NLS-1$
 
     default:
-      throw new IllegalArgumentException(
-          MessageFormat.format(Messages.getString("CDOIDUtil.3"), id.getClass().getName())); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOIDUtil.3"), id.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
index cca4f184cd..483571f989 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
@@ -117,8 +117,8 @@ public final class CDOLockUtil
     return new CDOLockOwnerImpl(DURABLE_SESSION_ID, DURABLE_VIEW_ID, durableLockingID, true);
   }
 
-  public static CDOLockChangeInfo createLockChangeInfo(long timestamp, CDOLockOwner lockOwner, CDOBranch branch,
-      Operation op, LockType lockType, CDOLockState[] cdoLockStates)
+  public static CDOLockChangeInfo createLockChangeInfo(long timestamp, CDOLockOwner lockOwner, CDOBranch branch, Operation op, LockType lockType,
+      CDOLockState[] cdoLockStates)
   {
     return new CDOLockChangeInfoImpl(branch.getPoint(timestamp), lockOwner, cdoLockStates, op, lockType);
   }
@@ -128,15 +128,14 @@ public final class CDOLockUtil
     return new CDOLockChangeInfoImpl();
   }
 
-  public static CDOLockChangeInfo createLockChangeInfo(long timestamp, CDOCommonView view, CDOBranch viewedBranch,
-      Operation op, LockType lockType, CDOLockState[] cdoLockStates)
+  public static CDOLockChangeInfo createLockChangeInfo(long timestamp, CDOCommonView view, CDOBranch viewedBranch, Operation op, LockType lockType,
+      CDOLockState[] cdoLockStates)
   {
     CDOLockOwner lockOwner = createLockOwner(view);
     return createLockChangeInfo(timestamp, lockOwner, viewedBranch, op, lockType, cdoLockStates);
   }
 
-  public static LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint,
-      boolean readOnly, Map<CDOID, LockGrade> locks)
+  public static LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return new CDOLockAreaImpl(durableLockingID, userID, branchPoint, readOnly, locks);
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
index 34d50cd8e5..39b0b081ee 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
@@ -27,8 +27,8 @@ import java.util.Map;
  */
 public interface IDurableLockingManager
 {
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks) throws LockAreaAlreadyExistsException;
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
+      throws LockAreaAlreadyExistsException;
 
   /**
    * Returns the {@link LockArea lock area} specified by the given durableLockingID, never <code>null</code>.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
index bb4891afe0..d835060d7a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
@@ -264,8 +264,7 @@ public final class CDOModelUtil implements CDOModelConstants
   {
     if (CDOPackageRegistryImpl.SYSTEM_ELEMENTS[6] != null && CDOPackageRegistryImpl.SYSTEM_ELEMENTS[7] != null)
     {
-      return CDOPackageRegistryImpl.SYSTEM_ELEMENTS[6] == eClassifier
-          || CDOPackageRegistryImpl.SYSTEM_ELEMENTS[7] == eClassifier;
+      return CDOPackageRegistryImpl.SYSTEM_ELEMENTS[6] == eClassifier || CDOPackageRegistryImpl.SYSTEM_ELEMENTS[7] == eClassifier;
     }
 
     if (isTypesPackage(eClassifier.getEPackage()))
@@ -612,8 +611,7 @@ public final class CDOModelUtil implements CDOModelConstants
   /**
    * @since 3.0
    */
-  public static EPackage readPackage(ExtendedDataInput in, ResourceSet resourceSet, boolean lookForResource)
-      throws IOException
+  public static EPackage readPackage(ExtendedDataInput in, ResourceSet resourceSet, boolean lookForResource) throws IOException
   {
     String uri = in.readString();
     boolean zipped = in.readBoolean();
@@ -624,8 +622,7 @@ public final class CDOModelUtil implements CDOModelConstants
   /**
    * @since 2.0
    */
-  public static void writePackage(ExtendedDataOutput out, EPackage ePackage, boolean zipped,
-      EPackage.Registry packageRegistry) throws IOException
+  public static void writePackage(ExtendedDataOutput out, EPackage ePackage, boolean zipped, EPackage.Registry packageRegistry) throws IOException
   {
     checkCrossResourceURIs(ePackage);
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index f9c5a42605..c5d98f6824 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -93,14 +93,12 @@ public final class EMFUtil
   /**
    * @since 4.2
    */
-  public static final EAttribute ECLASSIFIER_INSTANCE_CLASS_NAME = EcorePackage.eINSTANCE
-      .getEClassifier_InstanceClassName();
+  public static final EAttribute ECLASSIFIER_INSTANCE_CLASS_NAME = EcorePackage.eINSTANCE.getEClassifier_InstanceClassName();
 
   /**
    * @since 4.2
    */
-  public static final EReference EOPERATION_EGENERIC_EXCEPTIONS = EcorePackage.eINSTANCE
-      .getEOperation_EGenericExceptions();
+  public static final EReference EOPERATION_EGENERIC_EXCEPTIONS = EcorePackage.eINSTANCE.getEOperation_EGenericExceptions();
 
   /**
    * @since 4.2
@@ -115,8 +113,7 @@ public final class EMFUtil
   /**
    * @since 4.2
    */
-  public static final EAttribute ECLASSIFIER_INSTANCE_TYPE_NAME = EcorePackage.eINSTANCE
-      .getEClassifier_InstanceTypeName();
+  public static final EAttribute ECLASSIFIER_INSTANCE_TYPE_NAME = EcorePackage.eINSTANCE.getEClassifier_InstanceTypeName();
 
   /**
    * @since 4.2
@@ -202,12 +199,10 @@ public final class EMFUtil
   {
     List<String> uriFragmentPath = new ArrayList<String>();
     Resource resource;
-    for (InternalEObject container = internalEObject
-        .eInternalContainer(); (resource = internalEObject.eDirectResource()) == null
-            && container != null; container = internalEObject.eInternalContainer())
+    for (InternalEObject container = internalEObject.eInternalContainer(); (resource = internalEObject.eDirectResource()) == null
+        && container != null; container = internalEObject.eInternalContainer())
     {
-      String segment = getPositionalURIFragmentSegment(container, internalEObject.eContainingFeature(),
-          internalEObject);
+      String segment = getPositionalURIFragmentSegment(container, internalEObject.eContainingFeature(), internalEObject);
       uriFragmentPath.add(segment);
       internalEObject = container;
     }
@@ -226,8 +221,7 @@ public final class EMFUtil
   /**
    * @since 4.2
    */
-  private static String getPositionalURIFragmentSegment(EObject container, EStructuralFeature eStructuralFeature,
-      InternalEObject eObject)
+  private static String getPositionalURIFragmentSegment(EObject container, EStructuralFeature eStructuralFeature, InternalEObject eObject)
   {
     StringBuilder builder = new StringBuilder();
     builder.append('@');
@@ -337,8 +331,7 @@ public final class EMFUtil
   /**
    * @since 2.0
    */
-  public static EReference createEReference(EClass eClass, String name, EClassifier type, boolean isRequired,
-      boolean isMany)
+  public static EReference createEReference(EClass eClass, String name, EClassifier type, boolean isRequired, boolean isMany)
   {
     EReference eReference = EcoreFactory.eINSTANCE.createEReference();
     eReference.setName(name);
@@ -418,8 +411,7 @@ public final class EMFUtil
    */
   public static boolean isPersistent(EStructuralFeature feature)
   {
-    if (feature == ECLASS_ESUPER_TYPES || feature == ETYPED_ELEMENT_ETYPE || feature == EOPERATION_EEXCEPTIONS
-        || feature == ECLASSIFIER_INSTANCE_CLASS_NAME)
+    if (feature == ECLASS_ESUPER_TYPES || feature == ETYPED_ELEMENT_ETYPE || feature == EOPERATION_EEXCEPTIONS || feature == ECLASSIFIER_INSTANCE_CLASS_NAME)
     {
       // http://www.eclipse.org/newsportal/article.php?id=26780&group=eclipse.tools.emf#26780
       return false;
@@ -506,8 +498,7 @@ public final class EMFUtil
   /**
    * @since 3.0
    */
-  public static EPackage createEPackage(String uri, byte[] bytes, boolean zipped, ResourceSet resourceSet,
-      boolean lookForResource)
+  public static EPackage createEPackage(String uri, byte[] bytes, boolean zipped, ResourceSet resourceSet, boolean lookForResource)
   {
     try
     {
@@ -684,8 +675,7 @@ public final class EMFUtil
    * @see ExtResourceSet
    * @since 4.0
    */
-  public static ExtResourceSet createExtResourceSet(InternalCDOPackageRegistry packageRegistry, boolean delegating,
-      boolean demandLoading)
+  public static ExtResourceSet createExtResourceSet(InternalCDOPackageRegistry packageRegistry, boolean delegating, boolean demandLoading)
   {
     Resource.Factory resourceFactory = new EcoreResourceFactoryImpl();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
index 0f475c1cd0..dfb75cd4f1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
@@ -133,16 +133,14 @@ public interface CDODataOutput extends ExtendedDataOutput
   /**
    * @since 4.1
    */
-  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext)
-      throws IOException;
+  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException;
 
   /**
    * @since 4.0
    */
   public void writeCDORevisable(CDORevisable revisable) throws IOException;
 
-  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk)
-      throws IOException;
+  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk) throws IOException;
 
   public void writeCDOFeatureValue(EStructuralFeature feature, Object value) throws IOException;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
index b7d123e8ea..e8bc53abb1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
@@ -118,8 +118,7 @@ public interface CDORevisionManager extends INotifier
    * @see #getRevisions(List, CDOBranchPoint, int, int, boolean)
    * @see #getRevisionByVersion(CDOID, CDOBranchVersion, int, boolean)
    */
-  public CDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand);
+  public CDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand);
 
   /**
    * Returns the {@link CDORevision revisions} with the given {@link CDOID IDs} at the given {@link CDOBranchPoint
@@ -141,8 +140,7 @@ public interface CDORevisionManager extends INotifier
    *          the list that is returned.
    * @see #getRevision(CDOID, CDOBranchPoint, int, int, boolean)
    */
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand);
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand);
 
   /**
    * Returns <code>true</code> if the {@link CDORevisionCache revision cache} contains a {@link CDORevision revision}
@@ -169,8 +167,7 @@ public interface CDORevisionManager extends INotifier
    *          whether the revision is loaded from the server or <code>null</code> is returned.
    * @see #getRevision(CDOID, CDOBranchPoint, int, int, boolean)
    */
-  public CDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk,
-      boolean loadOnDemand);
+  public CDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand);
 
   /**
    * @since 4.4
@@ -180,6 +177,5 @@ public interface CDORevisionManager extends INotifier
   /**
    * @since 4.3
    */
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler);
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index b42b2c35d1..204471bee0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -217,8 +217,8 @@ public final class CDORevisionUtil
   /**
    * @since 4.0
    */
-  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, final CDOBranchPoint startPoint,
-      final CDOBranchPoint endPoint, final CDORevisionManager revisionManager)
+  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, final CDOBranchPoint startPoint, final CDOBranchPoint endPoint,
+      final CDORevisionManager revisionManager)
   {
     CDORevisionProvider startProvider = new ManagedRevisionProvider(revisionManager, startPoint);
     CDORevisionProvider endProvider = new ManagedRevisionProvider(revisionManager, endPoint);
@@ -228,8 +228,7 @@ public final class CDORevisionUtil
   /**
    * @since 4.0
    */
-  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, CDORevisionProvider startProvider,
-      CDORevisionProvider endProvider)
+  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, CDORevisionProvider startProvider, CDORevisionProvider endProvider)
   {
     return createChangeSetData(ids, startProvider, endProvider, false);
   }
@@ -237,8 +236,8 @@ public final class CDORevisionUtil
   /**
    * @since 4.1
    */
-  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, CDORevisionProvider startProvider,
-      CDORevisionProvider endProvider, boolean useStartVersions)
+  public static CDOChangeSetData createChangeSetData(Set<CDOID> ids, CDORevisionProvider startProvider, CDORevisionProvider endProvider,
+      boolean useStartVersions)
   {
     List<CDOIDAndVersion> newObjects = new ArrayList<CDOIDAndVersion>();
     List<CDORevisionKey> changedObjects = new ArrayList<CDORevisionKey>();
@@ -285,8 +284,8 @@ public final class CDORevisionUtil
   /**
    * @since 4.0
    */
-  public static CDOChangeSetData createChangeSetData(List<CDOIDAndVersion> newObjects,
-      List<CDORevisionKey> changedObjects, List<CDOIDAndVersion> detachedObjects)
+  public static CDOChangeSetData createChangeSetData(List<CDOIDAndVersion> newObjects, List<CDORevisionKey> changedObjects,
+      List<CDOIDAndVersion> detachedObjects)
   {
     return new CDOChangeSetDataImpl(newObjects, changedObjects, detachedObjects);
   }
@@ -358,8 +357,7 @@ public final class CDORevisionUtil
   /**
    * @since 4.5
    */
-  public static void handleParentRevisions(CDORevision revision, CDORevisionProvider provider,
-      CDORevisionHandler handler)
+  public static void handleParentRevisions(CDORevision revision, CDORevisionProvider provider, CDORevisionHandler handler)
   {
     CDORevision parentRevision = getParentRevision(revision, provider);
     if (parentRevision != null)
@@ -421,8 +419,7 @@ public final class CDORevisionUtil
   /**
    * @since 4.5
    */
-  public static List<CDORevision> getChildRevisions(CDOID container, CDORevisionProvider provider,
-      boolean onlyProperContents)
+  public static List<CDORevision> getChildRevisions(CDOID container, CDORevisionProvider provider, boolean onlyProperContents)
   {
     InternalCDORevision revision = (InternalCDORevision)provider.getRevision(container);
     return getChildRevisions(revision, provider, onlyProperContents);
@@ -439,8 +436,7 @@ public final class CDORevisionUtil
   /**
    * @since 4.5
    */
-  public static List<CDORevision> getChildRevisions(CDORevision container, CDORevisionProvider provider,
-      boolean onlyProperContents)
+  public static List<CDORevision> getChildRevisions(CDORevision container, CDORevisionProvider provider, boolean onlyProperContents)
   {
     List<CDORevision> children = new ArrayList<CDORevision>();
 
@@ -478,8 +474,7 @@ public final class CDORevisionUtil
     return children;
   }
 
-  private static void addChildRevision(Object value, CDORevisionProvider provider, List<CDORevision> children,
-      boolean onlyProperContents)
+  private static void addChildRevision(Object value, CDORevisionProvider provider, List<CDORevision> children, boolean onlyProperContents)
   {
     if (value instanceof CDOID)
     {
@@ -521,8 +516,7 @@ public final class CDORevisionUtil
     return builder.toString();
   }
 
-  private static void getResourceNodePath(InternalCDORevision revision, CDORevisionProvider provider,
-      StringBuilder result)
+  private static void getResourceNodePath(InternalCDORevision revision, CDORevisionProvider provider, StringBuilder result)
   {
     InternalCDORevision container = null;
     if (!revision.isResourceNode())
@@ -722,9 +716,8 @@ public final class CDORevisionUtil
         @Override
         protected void dumpBranch(CDOBranch branch)
         {
-          out()
-              .println(padTimeRange(branch.getName() + "[" + branch.getID() + "]", pad, branch.getBase().getTimeStamp(), //$NON-NLS-1$ //$NON-NLS-2$
-                  CDORevision.UNSPECIFIED_DATE));
+          out().println(padTimeRange(branch.getName() + "[" + branch.getID() + "]", pad, branch.getBase().getTimeStamp(), //$NON-NLS-1$ //$NON-NLS-2$
+              CDORevision.UNSPECIFIED_DATE));
         }
 
         @Override
@@ -804,8 +797,7 @@ public final class CDORevisionUtil
           out.println("&nbsp;&nbsp;&nbsp;&nbsp;</td>");
 
           out.println("<td>");
-          out.println(CDOCommonUtil.formatTimeStamp(revision.getTimeStamp()) + " / "
-              + CDOCommonUtil.formatTimeStamp(revision.getRevised()));
+          out.println(CDOCommonUtil.formatTimeStamp(revision.getTimeStamp()) + " / " + CDOCommonUtil.formatTimeStamp(revision.getRevised()));
           out.println("</td>");
           out.println("</tr>");
         }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOClassNotFoundException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOClassNotFoundException.java
index 479a6c1337..249c59a74f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOClassNotFoundException.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOClassNotFoundException.java
@@ -35,8 +35,7 @@ public final class CDOClassNotFoundException extends CDOException
 
   public CDOClassNotFoundException(String packageURI, String classifierName)
   {
-    super(MessageFormat.format(Messages.getString("CDOSessionImpl.1"),
-        packageURI + CDOClassifierRef.URI_SEPARATOR + classifierName));
+    super(MessageFormat.format(Messages.getString("CDOSessionImpl.1"), packageURI + CDOClassifierRef.URI_SEPARATOR + classifierName));
     this.packageURI = packageURI;
     this.classifierName = classifierName;
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
index 3fc114499c..0353b3fa99 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
@@ -65,8 +65,7 @@ public final class CDOCommonUtil
   /**
    * @since 4.4
    */
-  public static final Pattern DATE_PATTERN = Pattern
-      .compile("(\\d+)[ -/](\\d+)[ -/](\\d+)( +(\\d+):?(\\d*):?(\\d*)\\.?(\\d*))?");
+  public static final Pattern DATE_PATTERN = Pattern.compile("(\\d+)[ -/](\\d+)[ -/](\\d+)( +(\\d+):?(\\d*):?(\\d*)\\.?(\\d*))?");
 
   /**
    * @since 4.2
@@ -104,9 +103,8 @@ public final class CDOCommonUtil
   /**
    * @since 4.0
    */
-  public static CDODataInput createCDODataInput(ExtendedDataInputStream inputStream,
-      final CDOPackageRegistry packageRegistry, final CDOBranchManager branchManager,
-      final CDOCommitInfoManager commitManager, final CDORevisionFactory revisionFactory,
+  public static CDODataInput createCDODataInput(ExtendedDataInputStream inputStream, final CDOPackageRegistry packageRegistry,
+      final CDOBranchManager branchManager, final CDOCommitInfoManager commitManager, final CDORevisionFactory revisionFactory,
       final CDOListFactory listFactory, final CDOLobStore lobStore) throws IOException
   {
     return new CDODataInputImpl(inputStream)
@@ -153,8 +151,8 @@ public final class CDOCommonUtil
    * @deprecated As of 4.3 use {@link #createCDODataOutput(ExtendedDataOutput, CDOPackageRegistry, CDOIDProvider, CDORevisionUnchunker)}.
    */
   @Deprecated
-  public static CDODataOutput createCDODataOutput(ExtendedDataOutput extendedDataOutputStream,
-      final CDOPackageRegistry packageRegistry, final CDOIDProvider idProvider)
+  public static CDODataOutput createCDODataOutput(ExtendedDataOutput extendedDataOutputStream, final CDOPackageRegistry packageRegistry,
+      final CDOIDProvider idProvider)
   {
     return createCDODataOutput(extendedDataOutputStream, packageRegistry, idProvider, null);
   }
@@ -162,8 +160,8 @@ public final class CDOCommonUtil
   /**
    * @since 4.3
    */
-  public static CDODataOutput createCDODataOutput(ExtendedDataOutput extendedDataOutputStream,
-      final CDOPackageRegistry packageRegistry, final CDOIDProvider idProvider, final CDORevisionUnchunker unchunker)
+  public static CDODataOutput createCDODataOutput(ExtendedDataOutput extendedDataOutputStream, final CDOPackageRegistry packageRegistry,
+      final CDOIDProvider idProvider, final CDORevisionUnchunker unchunker)
   {
     return new CDODataOutputImpl(extendedDataOutputStream)
     {
@@ -258,8 +256,8 @@ public final class CDOCommonUtil
       throw new ParseException("Not a valid date: " + trimmed + " --> pattern = " + DATE_PATTERN, 0);
     }
 
-    timeStamp = matcher.group(1) + "-" + matcher.group(2) + "-" + matcher.group(3) + " " + safe(matcher.group(5)) + ":"
-        + safe(matcher.group(6)) + ":" + safe(matcher.group(7)) + "." + safe(matcher.group(8));
+    timeStamp = matcher.group(1) + "-" + matcher.group(2) + "-" + matcher.group(3) + " " + safe(matcher.group(5)) + ":" + safe(matcher.group(6)) + ":"
+        + safe(matcher.group(7)) + "." + safe(matcher.group(8));
 
     Date date = DATE_FORMAT.parse(timeStamp);
     return date.getTime();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
index c9b076c1a5..89c4843dc6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryStateChangedEvent.java
@@ -32,8 +32,7 @@ public class RepositoryStateChangedEvent extends Event implements CDOCommonRepos
 
   private CDOCommonRepository.State newState;
 
-  public RepositoryStateChangedEvent(INotifier source, CDOCommonRepository.State oldState,
-      CDOCommonRepository.State newState)
+  public RepositoryStateChangedEvent(INotifier source, CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
   {
     super(source);
     this.oldState = oldState;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
index 746fce0c2f..03d99d642e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
@@ -32,8 +32,7 @@ public class RepositoryTypeChangedEvent extends Event implements CDOCommonReposi
 
   private CDOCommonRepository.Type newType;
 
-  public RepositoryTypeChangedEvent(INotifier source, CDOCommonRepository.Type oldType,
-      CDOCommonRepository.Type newType)
+  public RepositoryTypeChangedEvent(INotifier source, CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
   {
     super(source);
     this.oldType = oldType;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index 46e20ce37f..9a8deb9b86 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -226,8 +226,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
   {
     checkActive();
 
-    Pair<Integer, Long> result = branchLoader.createBranch(branchID,
-        new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+    Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
     int actualBranchID = result.getElement1();
     long actualBaseTimeStamp = result.getElement2();
 
@@ -327,8 +326,7 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
    * @author Eike Stepper
    */
   @Deprecated
-  private static final class BranchCreatedEvent extends BranchChangedEvent
-      implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
+  private static final class BranchCreatedEvent extends BranchChangedEvent implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
   {
     private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
index 3e34652b06..5079ea978d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
@@ -43,8 +43,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
 
   private CDOChangeKindCache changeKindCache;
 
-  public CDOChangeSetDataImpl(List<CDOIDAndVersion> newObjects, List<CDORevisionKey> changedObjects,
-      List<CDOIDAndVersion> detachedObjects)
+  public CDOChangeSetDataImpl(List<CDOIDAndVersion> newObjects, List<CDORevisionKey> changedObjects, List<CDOIDAndVersion> detachedObjects)
   {
     this.newObjects = newObjects;
     this.changedObjects = changedObjects;
@@ -144,8 +143,7 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
     detachedObjects = new ArrayList<CDOIDAndVersion>(detachedMap.values());
   }
 
-  private void mergeChangedObject(CDORevisionKey key, Map<CDOID, CDOIDAndVersion> newMap,
-      Map<CDOID, CDORevisionKey> changedMap)
+  private void mergeChangedObject(CDORevisionKey key, Map<CDOID, CDOIDAndVersion> newMap, Map<CDOID, CDORevisionKey> changedMap)
   {
     CDOID id = key.getID();
     if (key instanceof CDORevisionDelta)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
index a2fe91d2bd..169a8cfee7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
@@ -25,8 +25,8 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit
 {
   private List<CDOPackageUnit> newPackageUnits;
 
-  public CDOCommitDataImpl(List<CDOPackageUnit> newPackageUnits, List<CDOIDAndVersion> newObjects,
-      List<CDORevisionKey> changedObjects, List<CDOIDAndVersion> detachedObjects)
+  public CDOCommitDataImpl(List<CDOPackageUnit> newPackageUnits, List<CDOIDAndVersion> newObjects, List<CDORevisionKey> changedObjects,
+      List<CDOIDAndVersion> detachedObjects)
   {
     super(newObjects, changedObjects, detachedObjects);
     this.newPackageUnits = newPackageUnits;
@@ -45,9 +45,8 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit
 
   public static String toString(CDOCommitData commitData)
   {
-    return MessageFormat.format(
-        "CommitData[newPackageUnits={0}, newObjects={1}, changedObjects={2}, detachedObjects={3}]", //$NON-NLS-1$
-        commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(),
-        commitData.getChangedObjects().size(), commitData.getDetachedObjects().size());
+    return MessageFormat.format("CommitData[newPackageUnits={0}, newObjects={1}, changedObjects={2}, detachedObjects={3}]", //$NON-NLS-1$
+        commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(), commitData.getChangedObjects().size(),
+        commitData.getDetachedObjects().size());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
index 1bcec1006e..58788c3751 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
@@ -49,8 +49,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
 
   private final CDOBranch branch;
 
-  private final GrowingRandomAccessList<CDOCommitInfo> commitInfos = new GrowingRandomAccessList<CDOCommitInfo>(
-      CDOCommitInfo.class, DEFAULT_LOAD_COUNT);
+  private final GrowingRandomAccessList<CDOCommitInfo> commitInfos = new GrowingRandomAccessList<CDOCommitInfo>(CDOCommitInfo.class, DEFAULT_LOAD_COUNT);
 
   private final Object loadLock = new Object();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
index 63b6ba8f7b..163900a955 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
@@ -26,8 +26,7 @@ import java.util.WeakHashMap;
  * @author Eike Stepper
  * @since 4.2
  */
-public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle
-    implements CDOCommitHistory.Provider<KEY, HISTORY>
+public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle implements CDOCommitHistory.Provider<KEY, HISTORY>
 {
   private Map<CDOCommitHistory, KEY> histories = new WeakHashMap<CDOCommitHistory, KEY>();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
index 35b19df2b1..40f4b1baf1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
@@ -59,8 +59,8 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
 
   // private transient CDOCommitInfo[] parents;
 
-  public CDOCommitInfoImpl(InternalCDOCommitInfoManager commitInfoManager, CDOBranch branch, long timeStamp,
-      long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource, CDOCommitData commitData)
+  public CDOCommitInfoImpl(InternalCDOCommitInfoManager commitInfoManager, CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
+      String comment, CDOBranchPoint mergeSource, CDOCommitData commitData)
   {
     super(branch, timeStamp);
     CheckUtil.checkArg(commitInfoManager, "commitInfoManager"); //$NON-NLS-1$
@@ -102,8 +102,7 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
 
   public CDOCommitInfo getPreviousCommitInfo()
   {
-    return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null
-        : commitInfoManager.getCommitInfo(previousTimeStamp);
+    return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null : commitInfoManager.getCommitInfo(previousTimeStamp);
   }
 
   public String getUserID()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
index 5efc0a76bf..850d014731 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
@@ -33,8 +33,7 @@ import java.util.WeakHashMap;
 /**
  * @author Andre Dietisheim
  */
-public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory>
-    implements InternalCDOCommitInfoManager
+public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory> implements InternalCDOCommitInfoManager
 {
   private final Map<Long, CDOCommitInfo> cache;
 
@@ -129,18 +128,16 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
     }
   }
 
-  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOCommitData commitData)
+  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOCommitData commitData)
   {
     return createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, commitData);
   }
 
-  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource, CDOCommitData commitData)
+  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+      CDOCommitData commitData)
   {
     checkActive();
-    CDOCommitInfo commitInfo = new CDOCommitInfoImpl(this, branch, timeStamp, previousTimeStamp, userID, comment,
-        mergeSource, commitData);
+    CDOCommitInfo commitInfo = new CDOCommitInfoImpl(this, branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
     return intern(commitInfo);
   }
 
@@ -216,8 +213,7 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr
     loader.loadCommitInfos(branch, startTime, endTime, handler);
   }
 
-  public void getCommitInfos(CDOBranch branch, long startTime, String reserved1, String reserved2, int count,
-      CDOCommitInfoHandler handler)
+  public void getCommitInfos(CDOBranch branch, long startTime, String reserved1, String reserved2, int count, CDOCommitInfoHandler handler)
   {
     if (reserved1 != null || reserved2 != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
index 87c1ebd9eb..0833b28e16 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/FailureCommitInfo.java
@@ -61,8 +61,7 @@ public class FailureCommitInfo implements CDOCommitInfo
 
   public CDOCommitInfo getPreviousCommitInfo()
   {
-    return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null
-        : commitInfoManager.getCommitInfo(previousTimeStamp);
+    return previousTimeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? null : commitInfoManager.getCommitInfo(previousTimeStamp);
   }
 
   public CDOBranch getBranch()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
index 5ae6e221d2..ba85a33d95 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
@@ -29,8 +29,7 @@ import java.io.ObjectStreamException;
  * @author Martin Taal
  * @since 3.0
  */
-public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID
-    implements InternalCDOIDObject, CDOClassifierRef.Provider
+public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject, CDOClassifierRef.Provider
 {
   private static final long serialVersionUID = 1L;
 
@@ -76,8 +75,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID
 
   public String toURIFragment()
   {
-    return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
-        + CDOClassifierRef.URI_SEPARATOR + value;
+    return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() + CDOClassifierRef.URI_SEPARATOR + value;
   }
 
   public Type getType()
@@ -170,8 +168,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID
     public synchronized CDOIDObjectLongWithClassifierImpl intern(long value, CDOClassifierRef classifierRef)
     {
       int hashCode = getHashCode(value, classifierRef);
-      for (Entry<CDOIDObjectLongWithClassifierImpl> entry = getEntry(hashCode); entry != null; entry = entry
-          .getNextEntry())
+      for (Entry<CDOIDObjectLongWithClassifierImpl> entry = getEntry(hashCode); entry != null; entry = entry.getNextEntry())
       {
         CDOIDObjectLongWithClassifierImpl id = entry.get();
         if (id != null && id.value == value && id.classifierRef.equals(classifierRef))
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
index c3aed3737d..b30b203b89 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
@@ -29,8 +29,7 @@ import java.io.ObjectStreamException;
  * @author Martin Taal
  * @since 3.0
  */
-public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID
-    implements InternalCDOIDObject, CDOIDString, CDOClassifierRef.Provider
+public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject, CDOIDString, CDOClassifierRef.Provider
 {
   private static final long serialVersionUID = 1L;
 
@@ -76,8 +75,7 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID
 
   public String toURIFragment()
   {
-    return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
-        + CDOClassifierRef.URI_SEPARATOR + value;
+    return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() + CDOClassifierRef.URI_SEPARATOR + value;
   }
 
   public Type getType()
@@ -170,8 +168,7 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID
     public synchronized CDOIDObjectStringWithClassifierImpl intern(String value, CDOClassifierRef classifierRef)
     {
       int hashCode = getHashCode(value, classifierRef);
-      for (Entry<CDOIDObjectStringWithClassifierImpl> entry = getEntry(hashCode); entry != null; entry = entry
-          .getNextEntry())
+      for (Entry<CDOIDObjectStringWithClassifierImpl> entry = getEntry(hashCode); entry != null; entry = entry.getNextEntry())
       {
         CDOIDObjectStringWithClassifierImpl id = entry.get();
         if (id != null && id.value.equals(value) && id.classifierRef.equals(classifierRef))
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
index bc73b9d065..faebd9a22c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
@@ -41,8 +41,7 @@ public class CDOLockAreaImpl implements LockArea
 
   private final boolean missing;
 
-  public CDOLockAreaImpl(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public CDOLockAreaImpl(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     this.durableLockingID = durableLockingID;
     this.userID = userID;
@@ -95,8 +94,8 @@ public class CDOLockAreaImpl implements LockArea
   @Override
   public String toString()
   {
-    return MessageFormat.format("DurableLockArea\nid={0}\nuser={1}\nbranchPoint={2}\nreadOnly={3}\nlocks={4}",
-        durableLockingID, userID, branchPoint, readOnly, locks);
+    return MessageFormat.format("DurableLockArea\nid={0}\nuser={1}\nbranchPoint={2}\nreadOnly={3}\nlocks={4}", durableLockingID, userID, branchPoint, readOnly,
+        locks);
   }
 
   public boolean isMissing()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
index ff6ae8a7b2..0f14c98e79 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockChangeInfoImpl.java
@@ -39,8 +39,7 @@ public final class CDOLockChangeInfoImpl implements CDOLockChangeInfo, CDOBranch
 
   private final boolean isInvalidateAll;
 
-  public CDOLockChangeInfoImpl(CDOBranchPoint branchPoint, CDOLockOwner lockOwner, CDOLockState[] lockStates,
-      Operation operation, LockType lockType)
+  public CDOLockChangeInfoImpl(CDOBranchPoint branchPoint, CDOLockOwner lockOwner, CDOLockState[] lockStates, Operation operation, LockType lockType)
   {
     this.branchPoint = branchPoint;
     this.lockOwner = lockOwner;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
index a09bc3a38f..a3708ddff1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockStateImpl.java
@@ -41,8 +41,7 @@ public class CDOLockStateImpl implements InternalCDOLockState
   public CDOLockStateImpl(Object lockedObject)
   {
     CheckUtil.checkArg(lockedObject, "lockedObject");
-    CheckUtil.checkState(lockedObject instanceof CDOID || lockedObject instanceof CDOIDAndBranch,
-        "lockedObject is of wrong type");
+    CheckUtil.checkState(lockedObject instanceof CDOID || lockedObject instanceof CDOIDAndBranch, "lockedObject is of wrong type");
     this.lockedObject = lockedObject;
   }
 
@@ -280,15 +279,13 @@ public class CDOLockStateImpl implements InternalCDOLockState
       return false;
     }
 
-    if (writeLockOwner == null && other.getWriteLockOwner() != null
-        || writeLockOwner != null && other.getWriteLockOwner() == null
+    if (writeLockOwner == null && other.getWriteLockOwner() != null || writeLockOwner != null && other.getWriteLockOwner() == null
         || writeLockOwner != null && !writeLockOwner.equals(other.getWriteLockOwner()))
     {
       return false;
     }
 
-    if (writeOptionOwner == null && other.getWriteOptionOwner() != null
-        || writeOptionOwner != null && other.getWriteOptionOwner() == null
+    if (writeOptionOwner == null && other.getWriteOptionOwner() != null || writeOptionOwner != null && other.getWriteOptionOwner() == null
         || writeOptionOwner != null && !writeOptionOwner.equals(other.getWriteOptionOwner()))
     {
       return false;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index 44c4704481..b3c140ed1a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -255,8 +255,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
     List<EStructuralFeature> persistentContainments = new ArrayList<EStructuralFeature>();
 
     // Used for tests for containment
-    EStructuralFeature[] containments = ((EClassImpl.FeatureSubsetSupplier)eClass.getEAllStructuralFeatures())
-        .containments();
+    EStructuralFeature[] containments = ((EClassImpl.FeatureSubsetSupplier)eClass.getEAllStructuralFeatures()).containments();
 
     persistentBits.clear();
     persistentOppositeBits.clear();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
index 223304e107..fc4e10c8a1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
@@ -204,8 +204,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
 
       InternalCDOPackageUnit oldPackageUnit = oldPackageInfo.getPackageUnit();
       InternalCDOPackageUnit newPackageUnit = newPackageInfo.getPackageUnit();
-      if (oldPackageUnit.getState() == CDOPackageUnit.State.NEW
-          && newPackageUnit.getState() != CDOPackageUnit.State.NEW)
+      if (oldPackageUnit.getState() == CDOPackageUnit.State.NEW && newPackageUnit.getState() != CDOPackageUnit.State.NEW)
       {
         oldPackageUnit.setState(CDOPackageUnit.State.LOADED);
       }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
index 193d6107ca..afca0d2f46 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
@@ -357,8 +357,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
   public String toString()
   {
     String fmt = "CDOPackageUnit[id={0}, state={1}, type={2}, originalType={3}, timeStamp={4}]"; //$NON-NLS-1$
-    return MessageFormat.format(fmt, getID(), getState(), getType(), getOriginalType(),
-        CDOCommonUtil.formatTimeStamp(getTimeStamp()));
+    return MessageFormat.format(fmt, getID(), getState(), getType(), getOriginalType(), CDOCommonUtil.formatTimeStamp(getTimeStamp()));
   }
 
   private void initPackageInfos(EPackage ePackage, List<InternalCDOPackageInfo> result)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
index b94239f492..b20284f043 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
@@ -1031,14 +1031,12 @@ public abstract class CDOTypeImpl implements CDOType
     out.writeByte(typeID);
   }
 
-  final public Object adjustReferences(CDOReferenceAdjuster adjuster, Object value, EStructuralFeature feature,
-      int index)
+  final public Object adjustReferences(CDOReferenceAdjuster adjuster, Object value, EStructuralFeature feature, int index)
   {
     return value == null ? null : doAdjustReferences(adjuster, value, feature, index);
   }
 
-  protected Object doAdjustReferences(CDOReferenceAdjuster adjuster, Object value, EStructuralFeature feature,
-      int indexs)
+  protected Object doAdjustReferences(CDOReferenceAdjuster adjuster, Object value, EStructuralFeature feature, int indexs)
   {
     return value;
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
index 0d697d5f01..334078933c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
@@ -86,8 +86,7 @@ public abstract class AbstractCDORevisionCache extends Lifecycle implements Inte
       CDOBranchManager actualBranchManager = branch.getBranchManager();
       if (actualBranchManager != branchManager)
       {
-        throw new IllegalArgumentException(
-            "Wrong branch manager: " + actualBranchManager + "; expected: " + branchManager);
+        throw new IllegalArgumentException("Wrong branch manager: " + actualBranchManager + "; expected: " + branchManager);
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
index 6e2037b006..24d5769b3a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisableImpl.java
@@ -74,8 +74,7 @@ public class CDORevisableImpl extends CDOBranchVersionImpl implements CDORevisab
     if (obj instanceof CDORevisable)
     {
       CDORevisable that = (CDORevisable)obj;
-      return timeStamp == that.getTimeStamp() && revised == that.getRevised() && getBranch().equals(that.getBranch())
-          && getVersion() == that.getVersion();
+      return timeStamp == that.getTimeStamp() && revised == that.getRevised() && getBranch().equals(that.getBranch()) && getVersion() == that.getVersion();
     }
 
     return false;
@@ -84,7 +83,7 @@ public class CDORevisableImpl extends CDOBranchVersionImpl implements CDORevisab
   @Override
   public String toString()
   {
-    return MessageFormat.format("{0}v{1}[{2}-{3}]", getBranch().getID(), getVersion(),
-        CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(revised));
+    return MessageFormat.format("{0}v{1}[{2}-{3}]", getBranch().getID(), getVersion(), CDOCommonUtil.formatTimeStamp(timeStamp),
+        CDOCommonUtil.formatTimeStamp(revised));
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index c2fe2613b2..9608000bce 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -235,11 +235,9 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     }
   }
 
-  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk,
-      boolean loadOnDemand)
+  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand)
   {
-    checkArg(branchVersion.getVersion() >= CDOBranchVersion.FIRST_VERSION,
-        "Invalid version: " + branchVersion.getVersion());
+    checkArg(branchVersion.getVersion() >= CDOBranchVersion.FIRST_VERSION, "Invalid version: " + branchVersion.getVersion());
     acquireAtomicRequestLock(loadAndAddLock);
 
     try
@@ -278,28 +276,26 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     return null;
   }
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand)
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
   {
     return getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, null);
   }
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand, SyntheticCDORevision[] synthetics)
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics)
   {
     List<CDOID> ids = Collections.singletonList(id);
     CDORevision result = getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, synthetics).get(0);
     return (InternalCDORevision)result;
   }
 
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand)
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
   {
     return getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, null);
   }
 
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand, SyntheticCDORevision[] synthetics)
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics)
   {
     RevisionInfo[] infos = new RevisionInfo[ids.size()];
     List<RevisionInfo> infosToLoad = createRevisionInfos(ids, branchPoint, prefetchDepth, loadOnDemand, infos);
@@ -311,8 +307,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
       List<? extends CDORevision> primaryLoadedRevisions //
           = getResultsAndSynthetics(infosToLoad.toArray(new RevisionInfo[0]), null);
 
-      if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty()
-          || additionalLoadedRevisions != null && !additionalLoadedRevisions.isEmpty())
+      if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty() || additionalLoadedRevisions != null && !additionalLoadedRevisions.isEmpty())
       {
         if (primaryLoadedRevisions == null)
         {
@@ -331,8 +326,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     return getResultsAndSynthetics(infos, synthetics);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     revisionLoader.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, handler);
   }
@@ -343,8 +337,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     return "RevisionManager";
   }
 
-  private List<RevisionInfo> createRevisionInfos(List<CDOID> ids, CDOBranchPoint branchPoint, int prefetchDepth,
-      boolean loadOnDemand, RevisionInfo[] infos)
+  private List<RevisionInfo> createRevisionInfos(List<CDOID> ids, CDOBranchPoint branchPoint, int prefetchDepth, boolean loadOnDemand, RevisionInfo[] infos)
   {
     List<RevisionInfo> infosToLoad = null;
     Iterator<CDOID> idIterator = ids.iterator();
@@ -388,8 +381,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     return createRevisionInfoMissing(id, branchPoint);
   }
 
-  private RevisionInfo.Available createRevisionInfoAvailable(InternalCDORevision revision,
-      CDOBranchPoint requestedBranchPoint)
+  private RevisionInfo.Available createRevisionInfoAvailable(InternalCDORevision revision, CDOBranchPoint requestedBranchPoint)
   {
     if (revision instanceof PointerCDORevision)
     {
@@ -418,8 +410,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
     return new RevisionInfo.Missing(id, requestedBranchPoint);
   }
 
-  protected List<InternalCDORevision> loadRevisions(List<RevisionInfo> infosToLoad, CDOBranchPoint branchPoint,
-      int referenceChunk, int prefetchDepth)
+  protected List<InternalCDORevision> loadRevisions(List<RevisionInfo> infosToLoad, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     acquireAtomicRequestLock(loadAndAddLock);
 
@@ -474,8 +465,8 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
           CDOBranchVersion target = pointer.getTarget();
           if (target instanceof InternalCDORevision)
           {
-            revision = new PointerCDORevision(pointer.getEClass(), pointer.getID(), pointer.getBranch(),
-                pointer.getRevised(), CDOBranchUtil.copyBranchVersion(target));
+            revision = new PointerCDORevision(pointer.getEClass(), pointer.getID(), pointer.getBranch(), pointer.getRevised(),
+                CDOBranchUtil.copyBranchVersion(target));
           }
         }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
index fc23952703..b7c98650e3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
@@ -28,8 +28,7 @@ import java.io.IOException;
 /**
  * @author Simon McDuff
  */
-public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
-    implements CDOAddFeatureDelta, ListIndexAffecting, ListTargetAdding
+public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOAddFeatureDelta, ListIndexAffecting, ListTargetAdding
 {
   public CDOAddFeatureDeltaImpl(EStructuralFeature feature, int index, Object value)
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
index acb7c6be17..2e8f887b91 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
@@ -137,16 +137,14 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements
     }
 
     CDOContainerFeatureDelta that = (CDOContainerFeatureDelta)obj;
-    return ObjectUtil.equals(newResourceID, that.getResourceID())
-        && ObjectUtil.equals(newContainerID, that.getContainerID())
+    return ObjectUtil.equals(newResourceID, that.getResourceID()) && ObjectUtil.equals(newContainerID, that.getContainerID())
         && newContainerFeatureID == that.getContainerFeatureID();
   }
 
   @Override
   protected String toStringAdditional()
   {
-    return MessageFormat.format("resource={0}, container={1}, feature={2}", newResourceID, newContainerID,
-        newContainerFeatureID);
+    return MessageFormat.format("resource={0}, container={1}, feature={2}", newResourceID, newContainerID, newContainerFeatureID);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
index 2f940855b9..d25f5cb871 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
@@ -166,8 +166,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
   public Pair<ListTargetAdding[], int[]> reconstructAddedIndices()
   {
     reconstructAddedIndicesWithNoCopy();
-    return Pair.create(copyOf(cachedSources, cachedSources.length, cachedSources.getClass()),
-        copyOf(cachedIndices, cachedIndices.length));
+    return Pair.create(copyOf(cachedSources, cachedSources.length, cachedSources.getClass()), copyOf(cachedIndices, cachedIndices.length));
   }
 
   private void reconstructAddedIndicesWithNoCopy()
@@ -203,8 +202,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
         }
       }
 
-      List<CDOFeatureDelta> featureDeltasToBeProcessed = unprocessedFeatureDeltas == null ? listChanges
-          : unprocessedFeatureDeltas;
+      List<CDOFeatureDelta> featureDeltasToBeProcessed = unprocessedFeatureDeltas == null ? listChanges : unprocessedFeatureDeltas;
       for (CDOFeatureDelta featureDelta : featureDeltasToBeProcessed)
       {
         if (featureDelta instanceof ListIndexAffecting)
@@ -606,8 +604,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
   private static <T, U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType)
   {
     @SuppressWarnings("unchecked")
-    T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength]
-        : (T[])Array.newInstance(newType.getComponentType(), newLength);
+    T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength] : (T[])Array.newInstance(newType.getComponentType(), newLength);
     System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
     return copy;
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
index 31aee0351c..da8d1583d6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
@@ -32,8 +32,7 @@ import java.text.MessageFormat;
 /**
  * @author Simon McDuff
  */
-public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl
-    implements CDOMoveFeatureDelta, ListIndexAffecting, WithIndex
+public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOMoveFeatureDelta, ListIndexAffecting, WithIndex
 {
   private int oldPosition;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
index 48ca5e1b12..9305868b68 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
@@ -29,8 +29,7 @@ import java.io.IOException;
 /**
  * @author Simon McDuff
  */
-public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
-    implements CDORemoveFeatureDelta, ListIndexAffecting
+public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDORemoveFeatureDelta, ListIndexAffecting
 {
   public CDORemoveFeatureDeltaImpl(EStructuralFeature feature, int index)
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
index d33ba02f8a..e08af0525f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
@@ -129,12 +129,10 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta
 
     CDOID dirtyResourceID = dirtyData.getResourceID();
     int dirtyContainingFeatureID = dirtyData.getContainingFeatureID();
-    if (!compareValue(originData.getContainerID(), dirtyContainerID)
-        || !compareValue(originData.getContainingFeatureID(), dirtyContainingFeatureID)
+    if (!compareValue(originData.getContainerID(), dirtyContainerID) || !compareValue(originData.getContainingFeatureID(), dirtyContainingFeatureID)
         || !compareValue(originData.getResourceID(), dirtyResourceID))
     {
-      CDOFeatureDelta delta = new CDOContainerFeatureDeltaImpl(dirtyResourceID, dirtyContainerID,
-          dirtyContainingFeatureID);
+      CDOFeatureDelta delta = new CDOContainerFeatureDeltaImpl(dirtyResourceID, dirtyContainerID, dirtyContainingFeatureID);
       addFeatureDelta(delta, null);
     }
   }
@@ -397,8 +395,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta
             }
 
             @Override
-            protected void createAddListChange(EList<Object> oldList, EList<ListChange> listChanges, Object value,
-                int index)
+            protected void createAddListChange(EList<Object> oldList, EList<ListChange> listChanges, Object value, int index)
             {
               CDOFeatureDelta delta = new CDOAddFeatureDeltaImpl(feature, index, value);
               changes.add(delta);
@@ -406,8 +403,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta
             }
 
             @Override
-            protected void createRemoveListChange(EList<?> oldList, EList<ListChange> listChanges, Object value,
-                int index)
+            protected void createRemoveListChange(EList<?> oldList, EList<ListChange> listChanges, Object value, int index)
             {
               CDORemoveFeatureDeltaImpl delta = new CDORemoveFeatureDeltaImpl(feature, index);
               // fix until ListDifferenceAnalyzer delivers the correct value (bug #308618).
@@ -417,8 +413,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta
             }
 
             @Override
-            protected void createMoveListChange(EList<?> oldList, EList<ListChange> listChanges, Object value,
-                int index, int toIndex)
+            protected void createMoveListChange(EList<?> oldList, EList<ListChange> listChanges, Object value, int index, int toIndex)
             {
               CDOMoveFeatureDeltaImpl delta = new CDOMoveFeatureDeltaImpl(feature, toIndex, index);
               // fix until ListDifferenceAnalyzer delivers the correct value (same problem as bug #308618).
@@ -521,8 +516,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta
   @Override
   public String toString()
   {
-    return MessageFormat.format("CDORevisionDelta[{0}@{1}:{2}v{3} --> {4}]", eClass.getName(), id, branch.getID(),
-        version, featureDeltas.values());
+    return MessageFormat.format("CDORevisionDelta[{0}@{1}:{2}v{3} --> {4}]", eClass.getName(), id, branch.getID(), version, featureDeltas.values());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
index d6a9a40e88..43eeb54ddf 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
@@ -29,8 +29,7 @@ import java.text.MessageFormat;
 /**
  * @author Simon McDuff
  */
-public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
-    implements CDOSetFeatureDelta, ListTargetAdding
+public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOSetFeatureDelta, ListTargetAdding
 {
   private static final ThreadLocal<Boolean> TRANSFER_OLD_VALUE = new ThreadLocal<Boolean>();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
index 9efa306cba..dbbbc339ff 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.cdo.common.lock.IDurableLockingManager;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface CDOReplicationContext
-    extends CDOReplicationInfo, CDOBranchHandler, CDOCommitInfoHandler, IDurableLockingManager.LockArea.Handler
+public interface CDOReplicationContext extends CDOReplicationInfo, CDOBranchHandler, CDOCommitInfoHandler, IDurableLockingManager.LockArea.Handler
 {
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
index e6559bdba2..d15189f04f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
@@ -192,8 +192,8 @@ public final class CDOBranchUtil
         branch = branch.getBase().getBranch();
         if (branch == null)
         {
-          throw new IllegalArgumentException("Time " + CDOCommonUtil.formatTimeStamp(timeStamp)
-              + " is before the repository creation time " + CDOCommonUtil.formatTimeStamp(baseTime));
+          throw new IllegalArgumentException(
+              "Time " + CDOCommonUtil.formatTimeStamp(timeStamp) + " is before the repository creation time " + CDOCommonUtil.formatTimeStamp(baseTime));
         }
       }
       else
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
index ff7a63d8b7..7eb525c24e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetDataRevisionProvider.java
@@ -60,8 +60,8 @@ public class CDOChangeSetDataRevisionProvider implements CDORevisionProvider, CD
 
   private Map<CDOID, CDOIDAndVersion> cachedRevisions;
 
-  public CDOChangeSetDataRevisionProvider(CDORevisionProvider delegate, CDOChangeSetData changeSetData,
-      CDORevisionProvider revisionCallback, CDORevisionDeltaProvider revisionDeltaCallback)
+  public CDOChangeSetDataRevisionProvider(CDORevisionProvider delegate, CDOChangeSetData changeSetData, CDORevisionProvider revisionCallback,
+      CDORevisionDeltaProvider revisionDeltaCallback)
   {
     this.delegate = delegate;
     this.changeSetData = changeSetData;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.java
index c8f485dd8f..70a8ada582 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOCommitInfoUtil.java
@@ -58,8 +58,8 @@ public final class CDOCommitInfoUtil
   /**
    * @since 4.2
    */
-  public static CDOCommitData createCommitData(List<CDOPackageUnit> newPackageUnits, List<CDOIDAndVersion> newObjects,
-      List<CDORevisionKey> changedObjects, List<CDOIDAndVersion> detachedObjects)
+  public static CDOCommitData createCommitData(List<CDOPackageUnit> newPackageUnits, List<CDOIDAndVersion> newObjects, List<CDORevisionKey> changedObjects,
+      List<CDOIDAndVersion> detachedObjects)
   {
     return new CDOCommitDataImpl(newPackageUnits, newObjects, changedObjects, detachedObjects);
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java
index e3e237ec12..40e900a05a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/InternalCDOCommitInfoManager.java
@@ -47,14 +47,13 @@ public interface InternalCDOCommitInfoManager extends CDOCommitInfoManager, ILif
   /**
    * @since 4.0
    */
-  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOCommitData commitData);
+  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOCommitData commitData);
 
   /**
    * @since 4.6
    */
-  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource, CDOCommitData commitData);
+  public CDOCommitInfo createCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+      CDOCommitData commitData);
 
   /**
    * @since 4.6
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
index b86d44540e..2ba38d4fa6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
@@ -270,8 +270,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
     }
 
     CDOChangeSetData data = readCDOChangeSetData();
-    return CDOCommitInfoUtil.createCommitData(newPackageUnits, data.getNewObjects(), data.getChangedObjects(),
-        data.getDetachedObjects());
+    return CDOCommitInfoUtil.createCommitData(newPackageUnits, data.getNewObjects(), data.getChangedObjects(), data.getDetachedObjects());
   }
 
   public CDOCommitInfo readCDOCommitInfo() throws IOException
@@ -288,8 +287,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
       CDOBranchPoint mergeSource = CDOBranchUtil.readBranchPointOrNull(this);
       CDOCommitData commitData = readCDOCommitData();
 
-      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-          commitData);
+      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
     }
 
     return new FailureCommitInfo(commitInfoManager, timeStamp, previousTimeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
index 654c9f8014..bac74c7e4e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
@@ -374,8 +374,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
     writeCDORevision(revision, referenceChunk, null);
   }
 
-  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext)
-      throws IOException
+  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException
   {
     if (revision != null)
     {
@@ -396,8 +395,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
     writeLong(revisable.getRevised());
   }
 
-  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk)
-      throws IOException
+  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk) throws IOException
   {
     // TODO Simon: Could most of this stuff be moved into the list?
     // (only if protected methods of this class don't need to become public)
@@ -534,8 +532,7 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
       type = CDOModelUtil.getPrimitiveType(value.getClass());
       if (type == null)
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDODataOutputImpl.6"), value.getClass())); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDODataOutputImpl.6"), value.getClass())); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
index e0c78c0d1b..dc75594251 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
@@ -224,8 +224,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
 
     if (TRACER.isEnabled())
     {
-      TRACER.format(
-          "Reading revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
+      TRACER.format("Reading revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
           id, getEClass().getName(), version, branchPoint, revised, resourceID, containerID, containingFeatureID);
     }
   }
@@ -248,8 +247,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     return unchunked;
   }
 
-  private boolean readValue(CDODataInput in, EClass owner, EStructuralFeature[] features, int i, boolean unchunked)
-      throws IOException
+  private boolean readValue(CDODataInput in, EClass owner, EStructuralFeature[] features, int i, boolean unchunked) throws IOException
   {
     Object value;
     byte unsetState = in.readByte();
@@ -363,8 +361,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
 
     if (TRACER.isEnabled())
     {
-      TRACER.format(
-          "Writing revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
+      TRACER.format("Writing revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
           id, eClass.getName(), getVersion(), branchPoint, revised, resourceID, containerID, containingFeatureID);
     }
 
@@ -395,8 +392,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     }
   }
 
-  private void writeValue(CDODataOutput out, EClass owner, EStructuralFeature[] features, int i, int referenceChunk)
-      throws IOException
+  private void writeValue(CDODataOutput out, EClass owner, EStructuralFeature[] features, int i, int referenceChunk) throws IOException
   {
     EStructuralFeature feature = features[i];
     Object value = getValue(i);
@@ -583,8 +579,8 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     long created = branchPoint.getTimeStamp();
     if (revised != UNSPECIFIED_DATE && revised < Math.max(0, created))
     {
-      throw new IllegalArgumentException("revision=" + this + ", created=" + CDOCommonUtil.formatTimeStamp(created)
-          + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
+      throw new IllegalArgumentException(
+          "revision=" + this + ", created=" + CDOCommonUtil.formatTimeStamp(created) + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
     }
 
     if (TRACER.isEnabled())
@@ -791,16 +787,14 @@ public abstract class BaseCDORevision extends AbstractCDORevision
 
     boolean changed = false;
 
-    CDOID id1 = (CDOID)referenceAdjuster.adjustReference(resourceID, CDOContainerFeatureDelta.CONTAINER_FEATURE,
-        CDOFeatureDelta.NO_INDEX);
+    CDOID id1 = (CDOID)referenceAdjuster.adjustReference(resourceID, CDOContainerFeatureDelta.CONTAINER_FEATURE, CDOFeatureDelta.NO_INDEX);
     if (id1 != resourceID)
     {
       resourceID = id1;
       changed = true;
     }
 
-    Object id2 = referenceAdjuster.adjustReference(containerID, CDOContainerFeatureDelta.CONTAINER_FEATURE,
-        CDOFeatureDelta.NO_INDEX);
+    Object id2 = referenceAdjuster.adjustReference(containerID, CDOContainerFeatureDelta.CONTAINER_FEATURE, CDOFeatureDelta.NO_INDEX);
     if (id2 != containerID)
     {
       containerID = id2;
@@ -874,8 +868,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     }
     catch (ArrayIndexOutOfBoundsException ex)
     {
-      throw new IllegalArgumentException(
-          MessageFormat.format(Messages.getString("AbstractCDORevision.20"), feature, getClassInfo()), ex);
+      throw new IllegalArgumentException(MessageFormat.format(Messages.getString("AbstractCDORevision.20"), feature, getClassInfo()), ex);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
index 354a215c13..28a2937da6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevisionManager.java
@@ -128,32 +128,29 @@ public abstract class DelegatingCDORevisionManager extends Lifecycle implements
     return getDelegate().getObjectType(id);
   }
 
-  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk,
-      boolean loadOnDemand)
+  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand)
   {
     return getDelegate().getRevisionByVersion(id, branchVersion, referenceChunk, loadOnDemand);
   }
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand)
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
   {
     return getDelegate().getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand);
   }
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand, SyntheticCDORevision[] synthetics)
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics)
   {
     return getDelegate().getRevision(id, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, synthetics);
   }
 
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand)
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand)
   {
     return getDelegate().getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand);
   }
 
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand, SyntheticCDORevision[] synthetics)
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics)
   {
     return getDelegate().getRevisions(ids, branchPoint, referenceChunk, prefetchDepth, loadOnDemand, synthetics);
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
index 0e65301b3a..8d436c8a70 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
@@ -78,17 +78,15 @@ public interface InternalCDORevisionManager extends CDORevisionManager, CDORevis
 
   public void reviseVersion(CDOID id, CDOBranchVersion branchVersion, long timeStamp);
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand, SyntheticCDORevision[] synthetics);
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics);
 
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand, SyntheticCDORevision[] synthetics);
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics);
 
-  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth,
-      boolean loadOnDemand);
+  public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand);
 
-  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk,
-      boolean loadOnDemand);
+  public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk, boolean loadOnDemand);
 
   /**
    * If the meaning of this type isn't clear, there really should be more of a description here...
@@ -100,16 +98,14 @@ public interface InternalCDORevisionManager extends CDORevisionManager, CDORevis
    */
   public interface RevisionLoader
   {
-    public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-        int prefetchDepth);
+    public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth);
 
     public InternalCDORevision loadRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk);
 
     /**
      * @since 4.3
      */
-    public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-        CDORevisionHandler handler);
+    public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
index 79d2d5e999..92e018ce6b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
@@ -137,8 +137,7 @@ public abstract class RevisionInfo
   public void execute(InternalCDORevisionManager revisionManager, int referenceChunk)
   {
     SyntheticCDORevision[] synthetics = new SyntheticCDORevision[1];
-    result = revisionManager.getRevision(getID(), requestedBranchPoint, referenceChunk, CDORevision.DEPTH_NONE, true,
-        synthetics);
+    result = revisionManager.getRevision(getID(), requestedBranchPoint, referenceChunk, CDORevision.DEPTH_NONE, true, synthetics);
     synthetic = synthetics[0];
   }
 
@@ -166,8 +165,7 @@ public abstract class RevisionInfo
     synthetic = (SyntheticCDORevision)readResult(in, getID(), requestedBranchPoint.getBranch(), result);
   }
 
-  public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results,
-      SyntheticCDORevision[] synthetics, int i)
+  public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results, SyntheticCDORevision[] synthetics, int i)
   {
     if (result instanceof DetachedCDORevision)
     {
@@ -238,8 +236,7 @@ public abstract class RevisionInfo
   /**
    * @since 4.1
    */
-  public static void writeResult(CDODataOutput out, InternalCDORevision revision, int referenceChunk,
-      CDOBranchPoint securityContext) throws IOException
+  public static void writeResult(CDODataOutput out, InternalCDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException
   {
     if (revision == null)
     {
@@ -278,8 +275,7 @@ public abstract class RevisionInfo
     }
   }
 
-  private static InternalCDORevision readResult(CDODataInput in, CDOID id, CDOBranch branch, InternalCDORevision result)
-      throws IOException
+  private static InternalCDORevision readResult(CDODataInput in, CDOID id, CDOBranch branch, InternalCDORevision result) throws IOException
   {
     byte type = in.readByte();
     switch (type)
@@ -401,8 +397,7 @@ public abstract class RevisionInfo
     }
 
     @Override
-    protected void writeRevision(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext)
-        throws IOException
+    protected void writeRevision(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext) throws IOException
     {
       InternalCDORevision result = getResult();
       if (result != null && result.getBranch() == availableBranchVersion.getBranch())
@@ -471,8 +466,7 @@ public abstract class RevisionInfo
       }
 
       @Override
-      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results,
-          SyntheticCDORevision[] synthetics, int i)
+      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results, SyntheticCDORevision[] synthetics, int i)
       {
         if (!isLoadNeeded())
         {
@@ -495,8 +489,7 @@ public abstract class RevisionInfo
 
       private boolean hasTarget;
 
-      public Pointer(CDOID id, CDOBranchPoint requestedBranchPoint, CDOBranchVersion availableBranchVersion,
-          CDOBranchVersion targetBranchVersion)
+      public Pointer(CDOID id, CDOBranchPoint requestedBranchPoint, CDOBranchVersion availableBranchVersion, CDOBranchVersion targetBranchVersion)
       {
         super(id, requestedBranchPoint, availableBranchVersion);
         this.targetBranchVersion = targetBranchVersion;
@@ -557,8 +550,7 @@ public abstract class RevisionInfo
       }
 
       @Override
-      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results,
-          SyntheticCDORevision[] synthetics, int i)
+      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results, SyntheticCDORevision[] synthetics, int i)
       {
         if (!isLoadNeeded())
         {
@@ -600,8 +592,7 @@ public abstract class RevisionInfo
       }
 
       @Override
-      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results,
-          SyntheticCDORevision[] synthetics, int i)
+      public void processResult(InternalCDORevisionManager revisionManager, List<CDORevision> results, SyntheticCDORevision[] synthetics, int i)
       {
         if (!isLoadNeeded())
         {
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
index b4a04654bd..ba0e2bcff7 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.compare; singleton:=true
-Bundle-Version: 4.3.100.qualifier
+Bundle-Version: 4.3.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,8 +10,8 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.compare.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.compare;version="4.3.100",
- org.eclipse.emf.cdo.internal.compare.bundle;version="4.3.100";x-friends:="org.eclipse.emf.cdo.tests"
+Export-Package: org.eclipse.emf.cdo.compare;version="4.3.200",
+ org.eclipse.emf.cdo.internal.compare.bundle;version="4.3.200";x-friends:="org.eclipse.emf.cdo.tests"
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
  com.google.common.collect;version="[11.0.0,16.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 5ff7e969e6..9cc188caf8 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -100,8 +100,7 @@ public class CDOCompare
   {
     Builder builder = EMFCompare.builder();
 
-    IMatchEngine.Factory.Registry matchEngineFactoryRegistry = createMatchEngineFactoryRegistry(matcher,
-        comparisonFactory);
+    IMatchEngine.Factory.Registry matchEngineFactoryRegistry = createMatchEngineFactoryRegistry(matcher, comparisonFactory);
     if (matchEngineFactoryRegistry != null)
     {
       builder.setMatchEngineFactoryRegistry(matchEngineFactoryRegistry);
@@ -140,8 +139,7 @@ public class CDOCompare
     return builder.build();
   }
 
-  protected IMatchEngine.Factory.Registry createMatchEngineFactoryRegistry(IEObjectMatcher matcher,
-      IComparisonFactory comparisonFactory)
+  protected IMatchEngine.Factory.Registry createMatchEngineFactoryRegistry(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
   {
     IMatchEngine.Factory.Registry registry = new MatchEngineFactoryRegistryImpl();
     registry.add(new CDOMatchEngine.Factory(matcher, comparisonFactory));
@@ -228,22 +226,18 @@ public class CDOCompare
 
     @Override
     protected Set<Match> matchPerId(Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects,
-        Iterator<? extends EObject> originEObjects, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID,
-        List<EObject> originEObjectsNoID)
+        Iterator<? extends EObject> originEObjects, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID)
     {
       if (GETPARENTEOBJECT_METHOD == null)
       {
-        return matchPerIdCompatibility(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID,
-            originEObjectsNoID);
+        return matchPerIdCompatibility(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID, originEObjectsNoID);
       }
 
-      return super.matchPerId(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID,
-          originEObjectsNoID);
+      return super.matchPerId(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID, originEObjectsNoID);
     }
 
-    private Set<Match> matchPerIdCompatibility(Iterator<? extends EObject> leftEObjects,
-        Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects,
-        List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID)
+    private Set<Match> matchPerIdCompatibility(Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects,
+        Iterator<? extends EObject> originEObjects, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID)
     {
       final List<EObject> leftEObjectsNoID1 = leftEObjectsNoID;
       final List<EObject> rightEObjectsNoID1 = rightEObjectsNoID;
@@ -409,8 +403,7 @@ public class CDOCompare
     }
 
     @Override
-    protected void match(Comparison comparison, IComparisonScope scope, final Notifier left, final Notifier right,
-        final Notifier origin, Monitor monitor)
+    protected void match(Comparison comparison, IComparisonScope scope, final Notifier left, final Notifier right, final Notifier origin, Monitor monitor)
     {
       // Omit special treatment of Resources (and ResourceSets). Just match EObjects.
       match(comparison, scope, (EObject)left, (EObject)right, (EObject)origin, monitor);
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
index db366fcaf9..726d926bc3 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
@@ -143,8 +143,7 @@ public final class CDOCompareUtil
   /**
    * @since 4.3
    */
-  public static Comparison compare(CDOView leftView, CDOView rightView, CDOView[] originView, Set<CDOID> ids,
-      CDOViewOpener viewOpener)
+  public static Comparison compare(CDOView leftView, CDOView rightView, CDOView[] originView, Set<CDOID> ids, CDOViewOpener viewOpener)
   {
     if (viewOpener == DEFAULT_VIEW_OPENER)
     {
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
index 4ea9563537..228e0b74ca 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
@@ -86,8 +86,7 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
     this.resolveProxies = resolveProxies;
   }
 
-  private static CDOView openOriginView(CDOView leftView, CDOView rightView, CDOView[] originView,
-      CDOViewOpener viewOpener)
+  private static CDOView openOriginView(CDOView leftView, CDOView rightView, CDOView[] originView, CDOViewOpener viewOpener)
   {
     if (leftView.getSession() != rightView.getSession())
     {
@@ -315,8 +314,7 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
     /**
      * @since 4.3
      */
-    public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView,
-        CDOViewOpener viewOpener)
+    public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView, CDOViewOpener viewOpener)
     {
       CDOView view = openOriginView(leftView, rightView, originView, viewOpener);
 
@@ -335,8 +333,7 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
     /**
      * @since 4.3
      */
-    public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView, Set<CDOID> ids,
-        CDOViewOpener viewOpener)
+    public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView, Set<CDOID> ids, CDOViewOpener viewOpener)
     {
       CDOView view = openOriginView(leftView, rightView, originView, viewOpener);
       return new CDOComparisonScope.Minimal(leftView, rightView, view, ids);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
index a278950a89..982214edee 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit;singleton:=true
-Bundle-Version: 2.0.300.qualifier
+Bundle-Version: 2.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
index fbfa372cac..162bed0027 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
@@ -75,13 +75,10 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addFragmentNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnFragmentGenerator_fragmentName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_fragmentName_feature",
-                "_UI_DawnFragmentGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnFragmentGenerator_fragmentName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_fragmentName_feature", "_UI_DawnFragmentGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -92,13 +89,11 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addDawnEditorClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnFragmentGenerator_dawnEditorClassName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnEditorClassName_feature",
-                "_UI_DawnFragmentGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnFragmentGenerator_dawnEditorClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnEditorClassName_feature", "_UI_DawnFragmentGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+        null));
   }
 
   /**
@@ -108,12 +103,10 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addDawnGeneratorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnFragmentGenerator_dawnGenerator_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnGenerator_feature",
-                "_UI_DawnFragmentGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnFragmentGenerator_dawnGenerator_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnGenerator_feature", "_UI_DawnFragmentGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, true, false, true, null, null, null));
   }
 
   /**
@@ -136,8 +129,7 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((DawnFragmentGenerator)object).getFragmentName();
-    return label == null || label.length() == 0 ? getString("_UI_DawnFragmentGenerator_type")
-        : getString("_UI_DawnFragmentGenerator_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_DawnFragmentGenerator_type") : getString("_UI_DawnFragmentGenerator_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
index cbccfb6888..7c0e04278b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
@@ -75,13 +75,10 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addConflictColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGenerator_conflictColor_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_conflictColor_feature",
-                "_UI_DawnGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_GENERATOR__CONFLICT_COLOR, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGenerator_conflictColor_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_conflictColor_feature", "_UI_DawnGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_GENERATOR__CONFLICT_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -91,13 +88,10 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addLocalLockColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGenerator_localLockColor_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_localLockColor_feature",
-                "_UI_DawnGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_GENERATOR__LOCAL_LOCK_COLOR, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGenerator_localLockColor_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_localLockColor_feature", "_UI_DawnGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_GENERATOR__LOCAL_LOCK_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -107,13 +101,10 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter
    */
   protected void addRemoteLockColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGenerator_remoteLockColor_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_remoteLockColor_feature",
-                "_UI_DawnGenerator_type"),
-            DawngenmodelPackage.Literals.DAWN_GENERATOR__REMOTE_LOCK_COLOR, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGenerator_remoteLockColor_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_remoteLockColor_feature", "_UI_DawnGenerator_type"),
+        DawngenmodelPackage.Literals.DAWN_GENERATOR__REMOTE_LOCK_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -136,8 +127,7 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((DawnGenerator)object).getConflictColor();
-    return label == null || label.length() == 0 ? getString("_UI_DawnGenerator_type")
-        : getString("_UI_DawnGenerator_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_DawnGenerator_type") : getString("_UI_DawnGenerator_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
index 630343fae4..3d31074fe4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
@@ -38,8 +38,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class DawngenmodelItemProviderAdapterFactory extends DawngenmodelAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawngenmodelItemProviderAdapterFactory extends DawngenmodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
index b808763e8f..8df37e2f76 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor;singleton:=true
-Bundle-Version: 2.0.400.qualifier
+Bundle-Version: 2.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation.DawnCodeGenEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.400",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.500",
  org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation;version="2.0.0";
   uses:="org.eclipse.jface.wizard,
    org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
index 95591b687d..541fa78e54 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
@@ -49,8 +49,7 @@ import java.util.Collection;
  * @author Martin Fluegge
  * @generated
  */
-public class DawngenmodelActionBarContributor extends EditingDomainActionBarContributor
-    implements ISelectionChangedListener
+public class DawngenmodelActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -71,8 +70,7 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
    *
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -94,8 +92,7 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
    *
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -185,8 +182,7 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(
-        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditor_menu"),
+    IMenuManager submenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditor_menu"),
         "org.eclipse.emf.cdo.dawn.codegen.dawngenmodelMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
@@ -201,8 +197,7 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(
-        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    createSiblingMenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
@@ -355,8 +350,7 @@ public class DawngenmodelActionBarContributor extends EditingDomainActionBarCont
    *
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
index ee3c44d185..bd46b8a037 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
@@ -130,8 +130,8 @@ import java.util.Map;
  * @author Martin Fluegge
  * @generated
  */
-public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
+public class DawngenmodelEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
@@ -398,11 +398,9 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -566,8 +564,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, null,
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, null,
           new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
@@ -629,8 +626,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -938,10 +934,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1049,8 +1043,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
           {
             IFile dawnGenModelFile = ((FileEditorInput)dawnGenModelEditorInput).getFile();
 
-            IFile file = ResourcesPlugin.getWorkspace().getRoot()
-                .getFile(new Path(dawnGenModelFile.getFullPath() + editorExtension.getFileExtension()));
+            IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(dawnGenModelFile.getFullPath() + editorExtension.getFileExtension()));
             editorInput = new FileEditorInput(file);
           }
           else if (dawnGenModelEditorInput instanceof URIEditorInput)
@@ -1200,14 +1193,12 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1356,8 +1347,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1468,8 +1458,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1584,8 +1574,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
index e7ba7016d5..26c10716cb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
@@ -81,16 +81,16 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE
-      .getString("_UI_DawngenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameExtensions")
+      .replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -152,8 +152,7 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
-        .getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawngenmodel")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawngenmodel")));
   }
 
   /**
@@ -278,13 +277,11 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(), DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -564,8 +561,8 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -586,11 +583,8 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawngenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_label"));
-    newFileCreationPage
-        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_description"));
-    newFileCreationPage
-        .setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameDefaultBase") + "."
-            + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_description"));
+    newFileCreationPage.setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -620,8 +614,7 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
 
           // Make up a unique new name here.
           //
-          String defaultModelBaseFilename = DawnCodeGenEditorPlugin.INSTANCE
-              .getString("_UI_DawngenmodelEditorFilenameDefaultBase");
+          String defaultModelBaseFilename = DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameDefaultBase");
           String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
           String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
           for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -634,8 +627,7 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new DawngenmodelModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
index 5a2049595f..0946320345 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.provider.DawnGenModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
index d3e72c89d9..d6348f5e02 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
@@ -67,12 +67,10 @@ public class DawnEMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addEmfGenModelPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnEMFGenerator_emfGenModel_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnEMFGenerator_emfGenModel_feature",
-                "_UI_DawnEMFGenerator_type"),
-            DawnEmfGenmodelPackage.Literals.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnEMFGenerator_emfGenModel_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnEMFGenerator_emfGenModel_feature", "_UI_DawnEMFGenerator_type"),
+        DawnEmfGenmodelPackage.Literals.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, true, false, true, null, null, null));
   }
 
   /**
@@ -95,8 +93,7 @@ public class DawnEMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
   public String getText(Object object)
   {
     String label = ((DawnEMFGenerator)object).getFragmentName();
-    return label == null || label.length() == 0 ? getString("_UI_DawnEMFGenerator_type")
-        : getString("_UI_DawnEMFGenerator_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_DawnEMFGenerator_type") : getString("_UI_DawnEMFGenerator_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
index db06ad4468..b96518fc8f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
@@ -39,8 +39,7 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnEmfGenmodelItemProviderAdapterFactory extends DawnEmfGenmodelAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawnEmfGenmodelItemProviderAdapterFactory extends DawnEmfGenmodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF
index 493a279543..3a7343ebdf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.presentation.DawnGenModelEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.presentation;version="1.0.0",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.actions;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.creators;version="1.0.400"
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.actions;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.creators;version="1.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
index 26dfa76ee2..bf1e946a0a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
@@ -50,8 +50,7 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarContributor
-    implements ISelectionChangedListener
+public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -72,8 +71,7 @@ public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      DawnGenModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -95,8 +93,7 @@ public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      DawnGenModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -186,8 +183,7 @@ public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarC
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(
-        DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditor_menu"),
+    IMenuManager submenuManager = new MenuManager(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditor_menu"),
         "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodelMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
@@ -202,8 +198,7 @@ public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarC
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(
-        DawnGenModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    createSiblingMenuManager = new MenuManager(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
@@ -356,8 +351,7 @@ public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
index 68c7e25a34..b1993a9ceb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
@@ -396,11 +396,9 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -564,8 +562,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0, null,
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0, null,
           new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
@@ -627,8 +624,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -938,10 +934,8 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1144,14 +1138,12 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1285,8 +1277,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1397,8 +1388,8 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1513,8 +1504,8 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
index b9f6a90958..28c2e94189 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
@@ -81,16 +81,16 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
-      DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnGenModelEditorPlugin.INSTANCE
-      .getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameExtensions")
+      .replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -152,8 +152,8 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
-        .getImageDescriptor(DawnGenModelEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnEmfGenmodel")));
+    setDefaultPageImageDescriptor(
+        ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnGenModelEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnEmfGenmodel")));
   }
 
   /**
@@ -278,13 +278,11 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            DawnGenModelEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(), DawnGenModelEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -564,8 +562,8 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            DawnGenModelEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -586,11 +584,8 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawnEmfGenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_label"));
-    newFileCreationPage
-        .setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_description"));
-    newFileCreationPage
-        .setFileName(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase") + "."
-            + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_description"));
+    newFileCreationPage.setFileName(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -620,8 +615,7 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
 
           // Make up a unique new name here.
           //
-          String defaultModelBaseFilename = DawnGenModelEditorPlugin.INSTANCE
-              .getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase");
+          String defaultModelBaseFilename = DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase");
           String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
           String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
           for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -633,10 +627,8 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
       }
     }
     initialObjectCreationPage = new DawnEmfGenmodelModelWizardInitialObjectCreationPage("Whatever2");
-    initialObjectCreationPage
-        .setTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_label"));
+    initialObjectCreationPage.setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateEMFFragmentAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateEMFFragmentAction.java
index 8f36aa3d18..e9d16b5e05 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateEMFFragmentAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateEMFFragmentAction.java
@@ -56,8 +56,7 @@ public class GenerateEMFFragmentAction implements IObjectActionDelegate
 
           for (Creator creator : creators)
           {
-            IProgressMonitor monitor2 = new org.eclipse.core.runtime.SubProgressMonitor(monitor,
-                1000 / creators.size());
+            IProgressMonitor monitor2 = new org.eclipse.core.runtime.SubProgressMonitor(monitor, 1000 / creators.size());
             creator.create(monitor2);
             monitor2.done();
           }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
index 59555b9b22..b0c6914670 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,10 +17,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.xpand;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.xtend;bundle-version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.util;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.util;version="1.0.400",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.util;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.util;version="1.0.500",
  templates;version="1.0.100",
  workflow;version="1.0.100"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelFactory.java
index 4941d16e2b..98cfc3bd24 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelFactory.java
@@ -27,8 +27,7 @@ public interface DawnEmfGenmodelFactory extends EFactory
    *
    * @generated
    */
-  DawnEmfGenmodelFactory eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl.DawnEmfGenmodelFactoryImpl
-      .init();
+  DawnEmfGenmodelFactory eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl.DawnEmfGenmodelFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Dawn EMF Generator</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelPackage.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelPackage.java
index 72c3afec9b..3545e9fd7d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelPackage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/DawnEmfGenmodelPackage.java
@@ -59,8 +59,7 @@ public interface DawnEmfGenmodelPackage extends EPackage
    *
    * @generated
    */
-  DawnEmfGenmodelPackage eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl.DawnEmfGenmodelPackageImpl
-      .init();
+  DawnEmfGenmodelPackage eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl.DawnEmfGenmodelPackageImpl.init();
 
   /**
    * The meta object id for the '
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEMFGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEMFGeneratorImpl.java
index 8899feacca..99021ea1b9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEMFGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEMFGeneratorImpl.java
@@ -83,8 +83,7 @@ public class DawnEMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              DawnEmfGenmodelPackage.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, oldEmfGenModel, emfGenModel));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, DawnEmfGenmodelPackage.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, oldEmfGenModel, emfGenModel));
         }
       }
     }
@@ -112,8 +111,7 @@ public class DawnEMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     emfGenModel = newEmfGenModel;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawnEmfGenmodelPackage.DAWN_EMF_GENERATOR__EMF_GEN_MODEL,
-          oldEmfGenModel, emfGenModel));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnEmfGenmodelPackage.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, oldEmfGenModel, emfGenModel));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
index df561a8a0e..ae6f6c156c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
@@ -83,8 +83,7 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
 
     // Obtain or create and register package
     DawnEmfGenmodelPackageImpl theDawnEmfGenmodelPackage = (DawnEmfGenmodelPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof DawnEmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new DawnEmfGenmodelPackageImpl());
+        .get(eNS_URI) instanceof DawnEmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DawnEmfGenmodelPackageImpl());
 
     isInited = true;
 
@@ -93,8 +92,8 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
 
     // Obtain or create and register interdependencies
     GenModelPackageImpl theGenmodelPackage = (GenModelPackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(GenModelPackage.eNS_URI) instanceof GenModelPackageImpl
-            ? EPackage.Registry.INSTANCE.getEPackage(GenModelPackage.eNS_URI) : GenModelPackage.eINSTANCE);
+        .getEPackage(GenModelPackage.eNS_URI) instanceof GenModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(GenModelPackage.eNS_URI)
+            : GenModelPackage.eINSTANCE);
 
     // Create package meta-data objects
     theDawnEmfGenmodelPackage.createPackageContents();
@@ -195,10 +194,8 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    DawngenmodelPackage theDawngenmodelPackage = (DawngenmodelPackage)EPackage.Registry.INSTANCE
-        .getEPackage(DawngenmodelPackage.eNS_URI);
-    GenModelPackage theGenmodelPackage = (GenModelPackage)EPackage.Registry.INSTANCE
-        .getEPackage(GenModelPackage.eNS_URI);
+    DawngenmodelPackage theDawngenmodelPackage = (DawngenmodelPackage)EPackage.Registry.INSTANCE.getEPackage(DawngenmodelPackage.eNS_URI);
+    GenModelPackage theGenmodelPackage = (GenModelPackage)EPackage.Registry.INSTANCE.getEPackage(GenModelPackage.eNS_URI);
 
     // Create type parameters
 
@@ -208,11 +205,9 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
     dawnEMFGeneratorEClass.getESuperTypes().add(theDawngenmodelPackage.getDawnFragmentGenerator());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(dawnEMFGeneratorEClass, DawnEMFGenerator.class, "DawnEMFGenerator", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDawnEMFGenerator_EmfGenModel(), theGenmodelPackage.getGenModel(), null, "emfGenModel", null, 0, 1,
-        DawnEMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(dawnEMFGeneratorEClass, DawnEMFGenerator.class, "DawnEMFGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDawnEMFGenerator_EmfGenModel(), theGenmodelPackage.getGenModel(), null, "emfGenModel", null, 0, 1, DawnEMFGenerator.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
index 77ee0f0c97..9a50bc2782 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
@@ -46,8 +46,8 @@ public final class DawnCodeGenEditPlugin extends EMFPlugin
    */
   public DawnCodeGenEditPlugin()
   {
-    super(new ResourceLocator[] { org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin.INSTANCE,
-        EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE, EditorPlugin.INSTANCE, });
+    super(new ResourceLocator[] { org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE,
+        GenModelEditPlugin.INSTANCE, EditorPlugin.INSTANCE, });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
index c8e1478f39..436c8539ea 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
@@ -74,13 +74,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnDocumentProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature"),
-            getString("_UI_PropertyDescriptor_description",
-                "_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -91,13 +89,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditorUtilClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature",
-                "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+        null));
   }
 
   /**
@@ -108,13 +104,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnCreationWizardClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature",
-                "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -125,13 +119,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnCanonicalEditingPolicyClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature"),
-            getString("_UI_PropertyDescriptor_description",
-                "_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature", "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME, true, false,
-            false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME, true, false, false,
+        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -142,13 +134,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnDiagramEditPartClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature",
-                "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -159,13 +149,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPartFactoryClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature",
-                "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -176,13 +164,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPartProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature"),
-            getString("_UI_PropertyDescriptor_description",
-                "_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -193,13 +179,11 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPolicyProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature"),
-            getString("_UI_PropertyDescriptor_description",
-                "_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
-            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false,
-            false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false, false,
+        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -210,13 +194,10 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addGMFGenEditorGeneratorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
         getString("_UI_DawnGMFGenerator_GMFGenEditorGenerator_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_GMFGenEditorGenerator_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, true, false, true, null, null,
-        null));
+        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_GMFGenEditorGenerator_feature", "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, true, false, true, null, null, null));
   }
 
   /**
@@ -239,8 +220,7 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
   public String getText(Object object)
   {
     String label = ((DawnGMFGenerator)object).getFragmentName();
-    return label == null || label.length() == 0 ? getString("_UI_DawnGMFGenerator_type")
-        : getString("_UI_DawnGMFGenerator_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_DawnGMFGenerator_type") : getString("_UI_DawnGMFGenerator_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
index bef2254b11..a2b88c52dc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
@@ -39,8 +39,7 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnGmfGenmodelItemProviderAdapterFactory extends DawnGmfGenmodelAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawnGmfGenmodelItemProviderAdapterFactory extends DawnGmfGenmodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
index fa409a5e79..96b1dccc19 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnCodeGenEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation;version="1.0.0",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.actions;version="1.0.400",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.creators;version="1.0.400"
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.actions;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.creators;version="1.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
index 1e2d215995..e36114c789 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
@@ -49,8 +49,7 @@ public final class DawnCodeGenEditorPlugin extends EMFPlugin
    */
   public DawnCodeGenEditorPlugin()
   {
-    super(new ResourceLocator[] { DawnCodeGenEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE,
-        EditorPlugin.INSTANCE, });
+    super(new ResourceLocator[] { DawnCodeGenEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE, EditorPlugin.INSTANCE, });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
index 05252409ae..8681934d14 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
@@ -50,8 +50,7 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarContributor
-    implements ISelectionChangedListener
+public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -72,8 +71,7 @@ public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -95,8 +93,7 @@ public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -186,8 +183,7 @@ public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarC
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(
-        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditor_menu"),
+    IMenuManager submenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditor_menu"),
         "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodelMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
@@ -202,8 +198,7 @@ public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarC
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(
-        DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    createSiblingMenuManager = new MenuManager(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
@@ -356,8 +351,7 @@ public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarC
    *
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
index 863bd9e631..6baf0f222a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
@@ -397,11 +397,9 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -565,8 +563,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0, null,
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0, null,
           new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
@@ -628,8 +625,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -940,10 +936,8 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1146,14 +1140,12 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1287,8 +1279,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1399,8 +1390,8 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1515,8 +1506,8 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
index 023911d57c..447b46213f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
@@ -81,16 +81,16 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
-      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE
-      .getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameExtensions")
+      .replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -152,8 +152,8 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
-        .getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnGmfGenmodel")));
+    setDefaultPageImageDescriptor(
+        ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnGmfGenmodel")));
   }
 
   /**
@@ -278,13 +278,11 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(), DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -564,8 +562,8 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -586,11 +584,8 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawnGmfGenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_label"));
-    newFileCreationPage
-        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_description"));
-    newFileCreationPage
-        .setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase") + "."
-            + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_description"));
+    newFileCreationPage.setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -620,8 +615,7 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
 
           // Make up a unique new name here.
           //
-          String defaultModelBaseFilename = DawnCodeGenEditorPlugin.INSTANCE
-              .getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase");
+          String defaultModelBaseFilename = DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase");
           String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
           String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
           for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -633,10 +627,8 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
       }
     }
     initialObjectCreationPage = new DawnGmfGenmodelModelWizardInitialObjectCreationPage("Whatever2");
-    initialObjectCreationPage
-        .setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_label"));
+    initialObjectCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
index 7a72932c5e..f80dbac64c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
@@ -45,22 +45,15 @@ public class GenerateDawnGenModelGMFAction extends GenerateDawnGenModelAction
 
     dawnGMFGenerator.setDawnEditorClassName(dawnEditorClassName);
     dawnGMFGenerator.setFragmentName(editorGenerator.getPlugin().getID() + ".dawn");
-    dawnGMFGenerator.setDawnCanonicalEditingPolicyClassName(
-        generalPrefix + editorGenerator.getDiagram().getCanonicalEditPolicyClassName());
+    dawnGMFGenerator.setDawnCanonicalEditingPolicyClassName(generalPrefix + editorGenerator.getDiagram().getCanonicalEditPolicyClassName());
+    dawnGMFGenerator.setDawnCreationWizardClassName(generalPrefix + editorGenerator.getDiagram().getCreationWizardClassName());
+    dawnGMFGenerator.setDawnDiagramEditPartClassName(generalPrefix + editorGenerator.getDiagram().getEditPartClassName());
+    dawnGMFGenerator.setDawnDocumentProviderClassName(generalPrefix + editorGenerator.getDiagram().getDocumentProviderClassName());
+    dawnGMFGenerator.setDawnEditorUtilClassName(generalPrefix + editorGenerator.getDiagram().getDiagramEditorUtilClassName());
+    dawnGMFGenerator.setDawnEditPartFactoryClassName(generalPrefix + editorGenerator.getDiagram().getEditPartFactoryClassName());
+    dawnGMFGenerator.setDawnEditPartProviderClassName(generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName());
     dawnGMFGenerator
-        .setDawnCreationWizardClassName(generalPrefix + editorGenerator.getDiagram().getCreationWizardClassName());
-    dawnGMFGenerator
-        .setDawnDiagramEditPartClassName(generalPrefix + editorGenerator.getDiagram().getEditPartClassName());
-    dawnGMFGenerator
-        .setDawnDocumentProviderClassName(generalPrefix + editorGenerator.getDiagram().getDocumentProviderClassName());
-    dawnGMFGenerator
-        .setDawnEditorUtilClassName(generalPrefix + editorGenerator.getDiagram().getDiagramEditorUtilClassName());
-    dawnGMFGenerator
-        .setDawnEditPartFactoryClassName(generalPrefix + editorGenerator.getDiagram().getEditPartFactoryClassName());
-    dawnGMFGenerator
-        .setDawnEditPartProviderClassName(generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName());
-    dawnGMFGenerator.setDawnEditPolicyProviderClassName(
-        generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName().replace("EditPart", "EditPolicy"));
+        .setDawnEditPolicyProviderClassName(generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName().replace("EditPart", "EditPolicy"));
 
     dawnGMFGenerator.setGMFGenEditorGenerator(editorGenerator);
     return dawnGMFGenerator;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/.settings/org.eclipse.jdt.core.prefs
index 1a671d80c5..ab14c5f08f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/.settings/org.eclipse.jdt.core.prefs
@@ -371,7 +371,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelFactory.java
index 61324ccbca..b874863cae 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelFactory.java
@@ -27,8 +27,7 @@ public interface DawnGmfGenmodelFactory extends EFactory
    *
    * @generated
    */
-  DawnGmfGenmodelFactory eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl.DawnGmfGenmodelFactoryImpl
-      .init();
+  DawnGmfGenmodelFactory eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl.DawnGmfGenmodelFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Dawn GMF Generator</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
index 14624a2b63..8a518cc2b9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
@@ -60,8 +60,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    *
    * @generated
    */
-  DawnGmfGenmodelPackage eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl.DawnGmfGenmodelPackageImpl
-      .init();
+  DawnGmfGenmodelPackage eINSTANCE = org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl.DawnGmfGenmodelPackageImpl.init();
 
   /**
    * The meta object id for the '
@@ -106,8 +105,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 0;
+  int DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 0;
 
   /**
    * The feature id for the '<em><b>Dawn Editor Util Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -125,8 +123,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 2;
+  int DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 2;
 
   /**
    * The feature id for the '<em><b>Dawn Canonical Editing Policy Class Name</b></em>' attribute. <!-- begin-user-doc
@@ -135,8 +132,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 3;
+  int DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 3;
 
   /**
    * The feature id for the '<em><b>Dawn Diagram Edit Part Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -145,8 +141,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 4;
+  int DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 4;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Part Factory Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -155,8 +150,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 5;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 5;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Part Provider Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -165,8 +159,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 6;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 6;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Policy Provider Class Name</b></em>' attribute. <!-- begin-user-doc -->
@@ -175,8 +168,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
-      + 7;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 7;
 
   /**
    * The feature id for the '<em><b>GMF Gen Editor Generator</b></em>' reference. <!-- begin-user-doc --> <!--
@@ -354,8 +346,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnDocumentProviderClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnDocumentProviderClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Editor Util Class Name</b></em>' attribute feature. <!--
@@ -363,8 +354,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnEditorUtilClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnEditorUtilClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Creation Wizard Class Name</b></em>' attribute feature. <!--
@@ -372,8 +362,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnCreationWizardClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnCreationWizardClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Canonical Editing Policy Class Name</b></em>' attribute feature.
@@ -381,8 +370,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnCanonicalEditingPolicyClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnCanonicalEditingPolicyClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Diagram Edit Part Class Name</b></em>' attribute feature. <!--
@@ -390,8 +378,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnDiagramEditPartClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnDiagramEditPartClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Edit Part Factory Class Name</b></em>' attribute feature. <!--
@@ -399,8 +386,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnEditPartFactoryClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnEditPartFactoryClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Edit Part Provider Class Name</b></em>' attribute feature. <!--
@@ -408,8 +394,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnEditPartProviderClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnEditPartProviderClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Edit Policy Provider Class Name</b></em>' attribute feature. <!--
@@ -417,8 +402,7 @@ public interface DawnGmfGenmodelPackage extends EPackage
      *
      * @generated
      */
-    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = eINSTANCE
-        .getDawnGMFGenerator_DawnEditPolicyProviderClassName();
+    EAttribute DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = eINSTANCE.getDawnGMFGenerator_DawnEditPolicyProviderClassName();
 
     /**
      * The meta object literal for the '<em><b>GMF Gen Editor Generator</b></em>' reference feature. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
index 6eedf73ee9..280454211d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
@@ -274,8 +274,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnDocumentProviderClassName = newDawnDocumentProviderClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME,
           oldDawnDocumentProviderClassName, dawnDocumentProviderClassName));
     }
   }
@@ -301,8 +300,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnEditorUtilClassName = newDawnEditorUtilClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, oldDawnEditorUtilClassName,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, oldDawnEditorUtilClassName,
           dawnEditorUtilClassName));
     }
   }
@@ -328,9 +326,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnCreationWizardClassName = newDawnCreationWizardClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME, oldDawnCreationWizardClassName,
-          dawnCreationWizardClassName));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME,
+          oldDawnCreationWizardClassName, dawnCreationWizardClassName));
     }
   }
 
@@ -355,8 +352,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnCanonicalEditingPolicyClassName = newDawnCanonicalEditingPolicyClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME,
           oldDawnCanonicalEditingPolicyClassName, dawnCanonicalEditingPolicyClassName));
     }
   }
@@ -382,9 +378,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnDiagramEditPartClassName = newDawnDiagramEditPartClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, oldDawnDiagramEditPartClassName,
-          dawnDiagramEditPartClassName));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME,
+          oldDawnDiagramEditPartClassName, dawnDiagramEditPartClassName));
     }
   }
 
@@ -409,9 +404,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnEditPartFactoryClassName = newDawnEditPartFactoryClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, oldDawnEditPartFactoryClassName,
-          dawnEditPartFactoryClassName));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME,
+          oldDawnEditPartFactoryClassName, dawnEditPartFactoryClassName));
     }
   }
 
@@ -436,8 +430,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnEditPartProviderClassName = newDawnEditPartProviderClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME,
           oldDawnEditPartProviderClassName, dawnEditPartProviderClassName));
     }
   }
@@ -463,8 +456,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     dawnEditPolicyProviderClassName = newDawnEditPolicyProviderClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME,
           oldDawnEditPolicyProviderClassName, dawnEditPolicyProviderClassName));
     }
   }
@@ -484,9 +476,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, oldGMFGenEditorGenerator,
-              gmfGenEditorGenerator));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR,
+              oldGMFGenEditorGenerator, gmfGenEditorGenerator));
         }
       }
     }
@@ -514,8 +505,7 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     gmfGenEditorGenerator = newGMFGenEditorGenerator;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, oldGMFGenEditorGenerator,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, oldGMFGenEditorGenerator,
           gmfGenEditorGenerator));
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
index 300c0565fb..88f09c0030 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
@@ -85,8 +85,7 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
 
     // Obtain or create and register package
     DawnGmfGenmodelPackageImpl theDawnGmfGenmodelPackage = (DawnGmfGenmodelPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof DawnGmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new DawnGmfGenmodelPackageImpl());
+        .get(eNS_URI) instanceof DawnGmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DawnGmfGenmodelPackageImpl());
 
     isInited = true;
 
@@ -279,8 +278,7 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    DawngenmodelPackage theDawngenmodelPackage = (DawngenmodelPackage)EPackage.Registry.INSTANCE
-        .getEPackage(DawngenmodelPackage.eNS_URI);
+    DawngenmodelPackage theDawngenmodelPackage = (DawngenmodelPackage)EPackage.Registry.INSTANCE.getEPackage(DawngenmodelPackage.eNS_URI);
     EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
     GMFGenPackage theGMFGenPackage = (GMFGenPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI);
 
@@ -292,35 +290,26 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
     dawnGMFGeneratorEClass.getESuperTypes().add(theDawngenmodelPackage.getDawnFragmentGenerator());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(dawnGMFGeneratorEClass, DawnGMFGenerator.class, "DawnGMFGenerator", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDawnGMFGenerator_DawnDocumentProviderClassName(), theEcorePackage.getEString(),
-        "dawnDocumentProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnEditorUtilClassName(), theEcorePackage.getEString(),
-        "dawnEditorUtilClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnCreationWizardClassName(), theEcorePackage.getEString(),
-        "dawnCreationWizardClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnCanonicalEditingPolicyClassName(), theEcorePackage.getEString(),
-        "dawnCanonicalEditingPolicyClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnDiagramEditPartClassName(), theEcorePackage.getEString(),
-        "dawnDiagramEditPartClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnEditPartFactoryClassName(), theEcorePackage.getEString(),
-        "dawnEditPartFactoryClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnEditPartProviderClassName(), theEcorePackage.getEString(),
-        "dawnEditPartProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnGMFGenerator_DawnEditPolicyProviderClassName(), theEcorePackage.getEString(),
-        "dawnEditPolicyProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDawnGMFGenerator_GMFGenEditorGenerator(), theGMFGenPackage.getGenEditorGenerator(), null,
-        "GMFGenEditorGenerator", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(dawnGMFGeneratorEClass, DawnGMFGenerator.class, "DawnGMFGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getDawnGMFGenerator_DawnDocumentProviderClassName(), theEcorePackage.getEString(), "dawnDocumentProviderClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnEditorUtilClassName(), theEcorePackage.getEString(), "dawnEditorUtilClassName", null, 0, 1, DawnGMFGenerator.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnCreationWizardClassName(), theEcorePackage.getEString(), "dawnCreationWizardClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnCanonicalEditingPolicyClassName(), theEcorePackage.getEString(), "dawnCanonicalEditingPolicyClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnDiagramEditPartClassName(), theEcorePackage.getEString(), "dawnDiagramEditPartClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnEditPartFactoryClassName(), theEcorePackage.getEString(), "dawnEditPartFactoryClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnEditPartProviderClassName(), theEcorePackage.getEString(), "dawnEditPartProviderClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGMFGenerator_DawnEditPolicyProviderClassName(), theEcorePackage.getEString(), "dawnEditPolicyProviderClassName", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDawnGMFGenerator_GMFGenEditorGenerator(), theGMFGenPackage.getGenEditorGenerator(), null, "GMFGenEditorGenerator", null, 0, 1,
+        DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
index b5252da4a5..99c61d8b4d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;singleton:=true
-Bundle-Version: 2.0.300.qualifier
+Bundle-Version: 2.0.400.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.genmodel.DawnGenModelPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;version="2.0.300",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.impl;version="2.0.300",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.util;version="2.0.300",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.impl;version="2.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.util;version="2.0.400",
  org.eclipse.emf.cdo.dawn.codegen.genmodel;version="2.0.0"
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/DawngenmodelPackage.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/DawngenmodelPackage.java
index bbbb1f1419..d66a0a5929 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/DawngenmodelPackage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/DawngenmodelPackage.java
@@ -344,8 +344,7 @@ public interface DawngenmodelPackage extends EPackage
      * @generated
      * @since 1.0
      */
-    EAttribute DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME = eINSTANCE
-        .getDawnFragmentGenerator_DawnEditorClassName();
+    EAttribute DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME = eINSTANCE.getDawnFragmentGenerator_DawnEditorClassName();
 
     /**
      * The meta object literal for the '<em><b>Dawn Generator</b></em>' reference feature. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
index 425bbdbdff..4f842a9aeb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
@@ -132,8 +132,7 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     fragmentName = newFragmentName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME,
-          oldFragmentName, fragmentName));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME, oldFragmentName, fragmentName));
     }
   }
 
@@ -158,8 +157,7 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     dawnEditorClassName = newDawnEditorClassName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, oldDawnEditorClassName,
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, oldDawnEditorClassName,
           dawnEditorClassName));
     }
   }
@@ -179,8 +177,8 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, oldDawnGenerator, dawnGenerator));
+          eNotify(
+              new ENotificationImpl(this, Notification.RESOLVE, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, oldDawnGenerator, dawnGenerator));
         }
       }
     }
@@ -208,8 +206,7 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     dawnGenerator = newDawnGenerator;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR,
-          oldDawnGenerator, dawnGenerator));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, oldDawnGenerator, dawnGenerator));
     }
   }
 
@@ -296,8 +293,7 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME:
       return FRAGMENT_NAME_EDEFAULT == null ? fragmentName != null : !FRAGMENT_NAME_EDEFAULT.equals(fragmentName);
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME:
-      return DAWN_EDITOR_CLASS_NAME_EDEFAULT == null ? dawnEditorClassName != null
-          : !DAWN_EDITOR_CLASS_NAME_EDEFAULT.equals(dawnEditorClassName);
+      return DAWN_EDITOR_CLASS_NAME_EDEFAULT == null ? dawnEditorClassName != null : !DAWN_EDITOR_CLASS_NAME_EDEFAULT.equals(dawnEditorClassName);
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR:
       return dawnGenerator != null;
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
index e226d53a2f..31dee57e36 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
@@ -139,8 +139,7 @@ public class DawnGeneratorImpl extends EObjectImpl implements DawnGenerator
     conflictColor = newConflictColor;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__CONFLICT_COLOR,
-          oldConflictColor, conflictColor));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__CONFLICT_COLOR, oldConflictColor, conflictColor));
     }
   }
 
@@ -165,8 +164,7 @@ public class DawnGeneratorImpl extends EObjectImpl implements DawnGenerator
     localLockColor = newLocalLockColor;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__LOCAL_LOCK_COLOR,
-          oldLocalLockColor, localLockColor));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__LOCAL_LOCK_COLOR, oldLocalLockColor, localLockColor));
     }
   }
 
@@ -191,8 +189,7 @@ public class DawnGeneratorImpl extends EObjectImpl implements DawnGenerator
     remoteLockColor = newRemoteLockColor;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__REMOTE_LOCK_COLOR,
-          oldRemoteLockColor, remoteLockColor));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_GENERATOR__REMOTE_LOCK_COLOR, oldRemoteLockColor, remoteLockColor));
     }
   }
 
@@ -275,11 +272,9 @@ public class DawnGeneratorImpl extends EObjectImpl implements DawnGenerator
     case DawngenmodelPackage.DAWN_GENERATOR__CONFLICT_COLOR:
       return CONFLICT_COLOR_EDEFAULT == null ? conflictColor != null : !CONFLICT_COLOR_EDEFAULT.equals(conflictColor);
     case DawngenmodelPackage.DAWN_GENERATOR__LOCAL_LOCK_COLOR:
-      return LOCAL_LOCK_COLOR_EDEFAULT == null ? localLockColor != null
-          : !LOCAL_LOCK_COLOR_EDEFAULT.equals(localLockColor);
+      return LOCAL_LOCK_COLOR_EDEFAULT == null ? localLockColor != null : !LOCAL_LOCK_COLOR_EDEFAULT.equals(localLockColor);
     case DawngenmodelPackage.DAWN_GENERATOR__REMOTE_LOCK_COLOR:
-      return REMOTE_LOCK_COLOR_EDEFAULT == null ? remoteLockColor != null
-          : !REMOTE_LOCK_COLOR_EDEFAULT.equals(remoteLockColor);
+      return REMOTE_LOCK_COLOR_EDEFAULT == null ? remoteLockColor != null : !REMOTE_LOCK_COLOR_EDEFAULT.equals(remoteLockColor);
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
index 0fe1c43407..335fc041ea 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
@@ -88,9 +88,8 @@ public class DawngenmodelPackageImpl extends EPackageImpl implements Dawngenmode
     }
 
     // Obtain or create and register package
-    DawngenmodelPackageImpl theDawngenmodelPackage = (DawngenmodelPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof DawngenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new DawngenmodelPackageImpl());
+    DawngenmodelPackageImpl theDawngenmodelPackage = (DawngenmodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DawngenmodelPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DawngenmodelPackageImpl());
 
     isInited = true;
 
@@ -278,29 +277,21 @@ public class DawngenmodelPackageImpl extends EPackageImpl implements Dawngenmode
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(dawnGeneratorEClass, DawnGenerator.class, "DawnGenerator", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDawnGenerator_ConflictColor(), theEcorePackage.getEString(), "conflictColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getDawnGenerator_LocalLockColor(), theEcorePackage.getEString(), "localLockColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getDawnGenerator_RemoteLockColor(), theEcorePackage.getEString(), "remoteLockColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(dawnFragmentGeneratorEClass, DawnFragmentGenerator.class, "DawnFragmentGenerator", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDawnFragmentGenerator_FragmentName(), theEcorePackage.getEString(), "fragmentName", null, 0, 1,
-        DawnFragmentGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDawnFragmentGenerator_DawnEditorClassName(), theEcorePackage.getEString(), "dawnEditorClassName",
-        null, 0, 1, DawnFragmentGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDawnFragmentGenerator_DawnGenerator(), getDawnGenerator(), null, "dawnGenerator", null, 0, 1,
-        DawnFragmentGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(dawnGeneratorEClass, DawnGenerator.class, "DawnGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getDawnGenerator_ConflictColor(), theEcorePackage.getEString(), "conflictColor", null, 0, 1, DawnGenerator.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGenerator_LocalLockColor(), theEcorePackage.getEString(), "localLockColor", null, 0, 1, DawnGenerator.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnGenerator_RemoteLockColor(), theEcorePackage.getEString(), "remoteLockColor", null, 0, 1, DawnGenerator.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(dawnFragmentGeneratorEClass, DawnFragmentGenerator.class, "DawnFragmentGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getDawnFragmentGenerator_FragmentName(), theEcorePackage.getEString(), "fragmentName", null, 0, 1, DawnFragmentGenerator.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDawnFragmentGenerator_DawnEditorClassName(), theEcorePackage.getEString(), "dawnEditorClassName", null, 0, 1, DawnFragmentGenerator.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDawnFragmentGenerator_DawnGenerator(), getDawnGenerator(), null, "dawnGenerator", null, 0, 1, DawnFragmentGenerator.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.codegen/.settings/org.eclipse.jdt.core.prefs
index 355502f2b1..2c5bb44754 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
index cc2c1992b6..6d34af6fdc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
@@ -174,8 +174,7 @@ public abstract class GenerateDawnGenModelAction implements IObjectActionDelegat
   protected ResourceSet createResourceSet()
   {
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(dawngenmodelFileExtension,
-        new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(dawngenmodelFileExtension, new XMIResourceFactoryImpl());
     return resourceSet;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
index 3be69e6d00..d63b3d95c2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
@@ -61,11 +61,9 @@ public abstract class AbstractFragmentCreator implements Creator
     IFile dawnGenModelFile = (IFile)selectedElement;
 
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
 
-    Resource dawnGenModelResource = resourceSet
-        .getResource(URI.createURI(dawnGenModelFile.getRawLocationURI().toString()), true);
+    Resource dawnGenModelResource = resourceSet.getResource(URI.createURI(dawnGenModelFile.getRawLocationURI().toString()), true);
 
     DawnFragmentGenerator dawnFragmentGenerator = (DawnFragmentGenerator)dawnGenModelResource.getContents().get(0);
     // DawnGenerator dawnGenerator = dawnFragmentGenerator.getDawnGenerator();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
index 2239e3300b..5c1eb972cf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
@@ -303,8 +303,7 @@ public class ProjectCreationHelper
    * @throws CoreException
    * @throws JavaModelException
    */
-  private void createOutputFolder(String path, IProject project, IJavaProject javaProject)
-      throws CoreException, JavaModelException
+  private void createOutputFolder(String path, IProject project, IJavaProject javaProject) throws CoreException, JavaModelException
   {
     try
     {
@@ -398,8 +397,7 @@ public class ProjectCreationHelper
   {
   }
 
-  public static void refreshProject(IResource resource, IProgressMonitor monitor)
-      throws InvocationTargetException, InterruptedException
+  public static void refreshProject(IResource resource, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
   {
     IRunnableWithProgress op = new WorkspaceModifyOperation(null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
index 53cf1b27ad..9a3b3b348b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
index 516288b8fd..2e1356640a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
@@ -93,10 +93,8 @@ public class DawnEcoreEditor extends EcoreEditor implements IDawnEditor
       return;
     }
 
-    selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
-        ((DawnEditorInput)getEditorInput()).getResource()));
-    selectionViewer
-        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+    selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory, ((DawnEditorInput)getEditorInput()).getResource()));
+    selectionViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     // parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
     // dawnEditorSupport.getView(), selectionViewer));
     // listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
@@ -126,8 +124,7 @@ public class DawnEcoreEditor extends EcoreEditor implements IDawnEditor
     {
       if (view.hasConflict())
       {
-        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict",
-            "Your Resource is in conflict and cannot be committed");
+        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict", "Your Resource is in conflict and cannot be committed");
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
index 403aa4cd19..31186c052b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
@@ -46,8 +46,7 @@ public class DawnEcoreModelWizard extends EcoreModelWizard
   public DawnEcoreModelWizard()
   {
     super();
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOSession session = CDOConnectionUtil.instance.openSession();
     view = CDOConnectionUtil.instance.openView(session);
   }
@@ -60,8 +59,7 @@ public class DawnEcoreModelWizard extends EcoreModelWizard
 
     initialObjectCreationPage = new EcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(EcoreEditorPlugin.INSTANCE.getString("_UI_EcoreModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(EcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setDescription(EcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
@@ -84,8 +82,7 @@ public class DawnEcoreModelWizard extends EcoreModelWizard
 
             URI resourceURI = newResourceCreationPage.getURI();
 
-            CDOTransaction transaction = CDOConnectionUtil.instance.openCurrentTransaction(resourceSet,
-                resourceURI.toString());
+            CDOTransaction transaction = CDOConnectionUtil.instance.openCurrentTransaction(resourceSet, resourceURI.toString());
 
             resource = transaction.getOrCreateResource(resourceURI.path());
 
@@ -134,8 +131,7 @@ public class DawnEcoreModelWizard extends EcoreModelWizard
     }
     catch (PartInitException exception)
     {
-      MessageDialog.openError(workbenchWindow.getShell(),
-          EcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+      MessageDialog.openError(workbenchWindow.getShell(), EcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
       throw new RuntimeException(exception);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
index 53cf1b27ad..9a3b3b348b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
index afb7b41cf5..0f13120ccc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
@@ -50,8 +50,7 @@ public class DawnEcoreCreationWizard extends EcoreCreationWizard
   public DawnEcoreCreationWizard()
   {
     super();
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOSession session = CDOConnectionUtil.instance.openSession();
     view = session.openTransaction();
   }
@@ -66,13 +65,12 @@ public class DawnEcoreCreationWizard extends EcoreCreationWizard
       {
         if (diagPage.isNewModel())
         {
-          diagram = EcoreDiagramEditorUtil.createDiagram(diagPage.getDiagramModelURI(), diagPage.getDomainModelURI(),
-              monitor);
+          diagram = EcoreDiagramEditorUtil.createDiagram(diagPage.getDiagramModelURI(), diagPage.getDomainModelURI(), monitor);
         }
         else
         {
-          diagram = DawnEcoreDiagramEditorUtil.createDiagramOnly(diagPage.getDiagramModelURI(),
-              diagPage.getDomainModelURI(), diagPage.getDiagramEObject(), diagPage.isInitialized(), monitor);
+          diagram = DawnEcoreDiagramEditorUtil.createDiagramOnly(diagPage.getDiagramModelURI(), diagPage.getDomainModelURI(), diagPage.getDiagramEObject(),
+              diagPage.isInitialized(), monitor);
         }
         if (diagram != null)
         {
@@ -82,8 +80,7 @@ public class DawnEcoreCreationWizard extends EcoreCreationWizard
           }
           catch (PartInitException e)
           {
-            ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardOpenEditorError, null,
-                e.getStatus());
+            ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardOpenEditorError, null, e.getStatus());
           }
         }
       }
@@ -100,8 +97,7 @@ public class DawnEcoreCreationWizard extends EcoreCreationWizard
     {
       if (e.getTargetException() instanceof CoreException)
       {
-        ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardCreationError, null,
-            ((CoreException)e.getTargetException()).getStatus());
+        ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus());
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java
index 62fe178752..0a1851433e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditor.java
@@ -92,8 +92,7 @@ public class DawnEcoreDiagramEditor extends EcoreDiagramEditor implements IDawnE
     {
       if (e.getMessage().contains("conflict"))
       {
-        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict",
-            "Your Resource is in conflict and cannot be committed");
+        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict", "Your Resource is in conflict and cannot be committed");
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
index 6b1d7dffda..c3991faee0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
@@ -94,8 +94,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
     progressMonitor.beginTask(Messages.EcoreDiagramEditorUtil_CreateDiagramProgressTask, 3);
 
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOConnectionUtil.instance.openSession();
     ResourceSet resourceSet = editingDomain.getResourceSet();
 
@@ -109,8 +108,8 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
     EcoreDiagramEditorPlugin.getInstance().logInfo("Diagram URI: " + diagramURI);
     EcoreDiagramEditorPlugin.getInstance().logInfo("Diagram Resource: " + diagramResource);
 
-    CreateSemanticResourceRecordingCommand createSemanticResourceCommand = new CreateSemanticResourceRecordingCommand(
-        editingDomain, transaction, modelURI.path());
+    CreateSemanticResourceRecordingCommand createSemanticResourceCommand = new CreateSemanticResourceRecordingCommand(editingDomain, transaction,
+        modelURI.path());
 
     editingDomain.getCommandStack().execute(createSemanticResourceCommand);
     final Resource modelResource = createSemanticResourceCommand.getResource();
@@ -118,8 +117,8 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
     EcoreDiagramEditorPlugin.getInstance().logInfo("Model Resource: " + modelResource);
 
     final String diagramName = diagramURI.lastSegment();
-    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain,
-        Messages.EcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST)
+    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.EcoreDiagramEditorUtil_CreateDiagramCommandLabel,
+        Collections.EMPTY_LIST)
     {
       @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
@@ -135,8 +134,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
           attachModelToResource(model, modelResource);
         }
 
-        Diagram diagram = ViewService.createDiagram(model, DawnECoreRootEditPart.MODEL_ID,
-            EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+        Diagram diagram = ViewService.createDiagram(model, DawnECoreRootEditPart.MODEL_ID, EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         if (diagram != null)
         {
           diagramResource.getContents().add(diagram);
@@ -160,8 +158,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
     try
     {
-      OperationHistoryFactory.getOperationHistory().execute(command,
-          new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
+      OperationHistoryFactory.getOperationHistory().execute(command, new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
     }
     catch (ExecutionException e)
     {
@@ -194,8 +191,8 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
   }
 
   @SuppressWarnings("deprecation")
-  public static Resource createDiagramOnly(URI diagramURI, URI modelURI, EObject domainElement,
-      final boolean initializeDiagram, IProgressMonitor progressMonitor)
+  public static Resource createDiagramOnly(URI diagramURI, URI modelURI, EObject domainElement, final boolean initializeDiagram,
+      IProgressMonitor progressMonitor)
   {
     final TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();
     progressMonitor.beginTask("", 3); //$NON-NLS-1$
@@ -208,8 +205,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
       @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
       {
-        Diagram diagram = ViewService.createDiagram(model, EPackageEditPart.MODEL_ID,
-            EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+        Diagram diagram = ViewService.createDiagram(model, EPackageEditPart.MODEL_ID, EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         if (diagram != null)
         {
           diagramResource.getContents().add(diagram);
@@ -224,10 +220,9 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
           // Initialize and Layout Diagram
           if (initializeDiagram && diagramResource.getContents().get(0) instanceof Diagram)
           {
-            InitializeAndLayoutDiagramCommand initializeAndLayoutDiagram = new InitializeAndLayoutDiagramCommand(
-                editingDomain, (Diagram)diagramResource.getContents().get(0), false);
-            OperationHistoryFactory.getOperationHistory().execute(initializeAndLayoutDiagram, new NullProgressMonitor(),
-                null);
+            InitializeAndLayoutDiagramCommand initializeAndLayoutDiagram = new InitializeAndLayoutDiagramCommand(editingDomain,
+                (Diagram)diagramResource.getContents().get(0), false);
+            OperationHistoryFactory.getOperationHistory().execute(initializeAndLayoutDiagram, new NullProgressMonitor(), null);
             diagramResource.save(EcoreDiagramEditorUtil.getSaveOptions());
           }
 
@@ -243,8 +238,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
     try
     {
-      OperationHistoryFactory.getOperationHistory().execute(command,
-          new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
+      OperationHistoryFactory.getOperationHistory().execute(command, new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
     }
     catch (ExecutionException e)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
index 7f09d07a53..80cf380553 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
@@ -79,8 +79,7 @@ public class DawnEcoreDocumentProvider extends EcoreDocumentProvider
   {
     TransactionalEditingDomain editingDomain = DawnDiagramEditingDomainFactory.getInstance().createEditingDomain();
     editingDomain.setID("org.eclipse.emf.cdo.dawn.ecoretools.diagram.EditingDomain"); //$NON-NLS-1$
-    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter
-        .createNotifierFilter(editingDomain.getResourceSet())
+    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet())
         .and(NotificationFilter.createEventTypeFilter(Notification.ADD))
         .and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
     editingDomain.getResourceSet().eAdapters().add(new Adapter()
@@ -203,8 +202,8 @@ public class DawnEcoreDocumentProvider extends EcoreDocumentProvider
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0,
-              msg != null ? msg : Messages.EcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(
+              new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.EcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
index b08ac34e07..091bb5c01a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
@@ -44,8 +44,7 @@ public class DawnAcoreCreationWizard extends AcoreCreationWizard
   {
     super();
     // CDOConnectionUtil.instance.init("repo1", "tcp", "localhost");
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOSession session = CDOConnectionUtil.instance.openSession();
     view = CDOConnectionUtil.instance.openView(session);
   }
@@ -71,8 +70,7 @@ public class DawnAcoreCreationWizard extends AcoreCreationWizard
           }
           catch (PartInitException e)
           {
-            ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardOpenEditorError, null,
-                e.getStatus());
+            ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardOpenEditorError, null, e.getStatus());
           }
         }
       }
@@ -89,8 +87,7 @@ public class DawnAcoreCreationWizard extends AcoreCreationWizard
     {
       if (e.getTargetException() instanceof CoreException)
       {
-        ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardCreationError, null,
-            ((CoreException)e.getTargetException()).getStatus());
+        ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus());
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
index 57500374c6..6452035025 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditor.java
@@ -90,8 +90,7 @@ public class DawnAcoreDiagramEditor extends AcoreDiagramEditor implements IDawnE
     {
       if (e.getMessage().contains("conflict"))
       {
-        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict",
-            "Your Resource is in conflict and cannot be committed");
+        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict", "Your Resource is in conflict and cannot be committed");
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
index 73dc21fdff..85423620b2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
@@ -89,8 +89,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
 
     progressMonitor.beginTask(Messages.AcoreDiagramEditorUtil_CreateDiagramProgressTask, 3);
 
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOConnectionUtil.instance.openSession();
     ResourceSet resourceSet = editingDomain.getResourceSet();
 
@@ -104,8 +103,8 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
     AcoreDiagramEditorPlugin.getInstance().logInfo("Diagram URI: " + diagramURI);
     AcoreDiagramEditorPlugin.getInstance().logInfo("Diagram Resource: " + diagramResource);
 
-    CreateSemanticResourceRecordingCommand createSemanticResourceCommand = new CreateSemanticResourceRecordingCommand(
-        editingDomain, transaction, modelURI.path());
+    CreateSemanticResourceRecordingCommand createSemanticResourceCommand = new CreateSemanticResourceRecordingCommand(editingDomain, transaction,
+        modelURI.path());
 
     editingDomain.getCommandStack().execute(createSemanticResourceCommand);
     final Resource modelResource = createSemanticResourceCommand.getResource();
@@ -113,8 +112,8 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
     AcoreDiagramEditorPlugin.getInstance().logInfo("Model Resource: " + modelResource);
 
     final String diagramName = diagramURI.lastSegment();
-    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain,
-        Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST)
+    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel,
+        Collections.EMPTY_LIST)
     {
       @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
@@ -130,8 +129,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
           attachModelToResource(model, modelResource);
         }
 
-        Diagram diagram = ViewService.createDiagram(model, DawnACoreRootEditPart.MODEL_ID,
-            AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+        Diagram diagram = ViewService.createDiagram(model, DawnACoreRootEditPart.MODEL_ID, AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         if (diagram != null)
         {
           diagramResource.getContents().add(diagram);
@@ -155,8 +153,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
 
     try
     {
-      OperationHistoryFactory.getOperationHistory().execute(command,
-          new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
+      OperationHistoryFactory.getOperationHistory().execute(command, new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
     }
     catch (ExecutionException e)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
index 24fa0acb65..a7404c2a7d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
@@ -75,8 +75,7 @@ public class DawnAcoreDocumentProvider extends AcoreDocumentProvider
   {
     TransactionalEditingDomain editingDomain = DawnDiagramEditingDomainFactory.getInstance().createEditingDomain();
     editingDomain.setID("org.eclipse.emf.cdo.dawn.examples.acore.diagram.EditingDomain"); //$NON-NLS-1$
-    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter
-        .createNotifierFilter(editingDomain.getResourceSet())
+    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet())
         .and(NotificationFilter.createEventTypeFilter(Notification.ADD))
         .and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
     editingDomain.getResourceSet().eAdapters().add(new Adapter()
@@ -201,8 +200,8 @@ public class DawnAcoreDocumentProvider extends AcoreDocumentProvider
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
-              msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(
+              new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs
index 20a850b5e5..ee1ca03dfd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
index b51963e658..81178576ff 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
@@ -92,8 +92,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAggregations_4004(getNewSource(),
-        getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAggregations_4004(getNewSource(), getOldTarget());
   }
 
   /**
@@ -105,8 +104,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAggregations_4004(getOldSource(),
-        getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAggregations_4004(getOldSource(), getNewTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
index 5e1f421b43..0bc4798fef 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
@@ -92,8 +92,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAssociations_4003(getNewSource(),
-        getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAssociations_4003(getNewSource(), getOldTarget());
   }
 
   /**
@@ -105,8 +104,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAssociations_4003(getOldSource(),
-        getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassAssociations_4003(getOldSource(), getNewTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
index a42410d9d9..09f8f061a3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
@@ -92,8 +92,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassCompositions_4005(getNewSource(),
-        getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassCompositions_4005(getNewSource(), getOldTarget());
   }
 
   /**
@@ -105,8 +104,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassCompositions_4005(getOldSource(),
-        getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassCompositions_4005(getOldSource(), getNewTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
index ffe8729239..d1200f2190 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
@@ -73,8 +73,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand
       return true; // link creation is in progress; source is not defined yet
     }
     // target may be null here but it's possible to check constraint
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canCreateAClassImplementedInterfaces_4002(getSource(),
-        getTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canCreateAClassImplementedInterfaces_4002(getSource(), getTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
index 571a8a3fdc..15c67b103c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
@@ -93,8 +93,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassImplementedInterfaces_4002(getNewSource(),
-        getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassImplementedInterfaces_4002(getNewSource(), getOldTarget());
   }
 
   /**
@@ -106,8 +105,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassImplementedInterfaces_4002(getOldSource(),
-        getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassImplementedInterfaces_4002(getOldSource(), getNewTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
index 49c4c0a4cf..9c1992de58 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
@@ -92,8 +92,7 @@ public class AClassSubClassesReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getNewSource(),
-        getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getNewSource(), getOldTarget());
   }
 
   /**
@@ -105,8 +104,7 @@ public class AClassSubClassesReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getOldSource(),
-        getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getOldSource(), getNewTarget());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
index 3993cfc569..e232d12d9c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
@@ -47,8 +47,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   {
     if (req.getParameter(CONTEXT_ELEMENT_TYPE) instanceof IElementType)
     {
-      return ElementTypeRegistry.getInstance()
-          .getEditHelperAdvice((IElementType)req.getParameter(CONTEXT_ELEMENT_TYPE));
+      return ElementTypeRegistry.getInstance().getEditHelperAdvice((IElementType)req.getParameter(CONTEXT_ELEMENT_TYPE));
     }
     return super.getEditHelperAdvice(req);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
index b5d48f5642..9c6699820d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
@@ -356,8 +356,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
     if (parser == null)
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, getParserElement(),
-          AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -369,8 +368,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -433,11 +431,9 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -649,10 +645,8 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
index b8e5aed86e..1ffbb72a7d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
@@ -356,8 +356,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
     if (parser == null)
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, getParserElement(),
-          AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -369,8 +368,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -433,11 +431,9 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -649,10 +645,8 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
index d2fb47ea1f..260970778b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
@@ -459,8 +459,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   {
     if (request instanceof CreateViewAndElementRequest)
     {
-      CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor()
-          .getCreateElementRequestAdapter();
+      CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
       IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
       if (type == AcoreElementTypes.AAttribute_3003)
       {
@@ -468,8 +467,7 @@ public class AClassEditPart extends ShapeNodeEditPart
       }
       if (type == AcoreElementTypes.AOperation_3004)
       {
-        return getChildBySemanticHint(
-            AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
       }
     }
     return super.getTargetEditPart(request);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
index c76cf5c569..cf74d29c8b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
@@ -368,8 +368,8 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   {
     if (parser == null)
     {
-      parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002, getParserElement(), AcoreVisualIDRegistry
-          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassNameEditPart.VISUAL_ID));
+      parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002, getParserElement(),
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AClassNameEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -381,8 +381,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -445,11 +444,9 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -661,10 +658,8 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
index 81c44cc62a..7a9f515102 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
@@ -80,12 +80,10 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
-    installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-        new AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy());
+    installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy());
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
     installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-        new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy());
+    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
index d005ce1a73..fdab26bcd4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
@@ -80,12 +80,10 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
-    installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-        new AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy());
+    installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy());
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
     installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-        new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy());
+    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy());
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
index 6f020277b1..71e33b0ef5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
@@ -374,18 +374,15 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   {
     if (request instanceof CreateViewAndElementRequest)
     {
-      CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor()
-          .getCreateElementRequestAdapter();
+      CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
       IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
       if (type == AcoreElementTypes.AAttribute_3001)
       {
-        return getChildBySemanticHint(
-            AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID));
       }
       if (type == AcoreElementTypes.AOperation_3002)
       {
-        return getChildBySemanticHint(
-            AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID));
       }
     }
     return super.getTargetEditPart(request);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
index ca3d813ca7..d6d953cf11 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
@@ -369,8 +369,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
     if (parser == null)
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, getParserElement(),
-          AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -382,8 +381,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -446,11 +444,9 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -662,10 +658,8 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
index 4227838028..911605f3e8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
@@ -356,8 +356,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
     if (parser == null)
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, getParserElement(),
-          AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -369,8 +368,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -433,11 +431,9 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -649,10 +645,8 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
index ac343f4e94..532447a3d7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
@@ -356,8 +356,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
     if (parser == null)
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, getParserElement(),
-          AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
+          AcoreVisualIDRegistry.getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -369,8 +368,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   {
     if (manager == null)
     {
-      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this),
-          AcoreEditPartFactory.getTextCellEditorLocator(this)));
+      setManager(new TextDirectEditManager(this, TextDirectEditManager.getTextCellEditorClass(this), AcoreEditPartFactory.getTextCellEditorLocator(this)));
     }
     return manager;
   }
@@ -433,11 +431,9 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData()
-                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData()
-                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
             else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
@@ -649,10 +645,8 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
     {
       refreshStrikeThrough();
     }
-    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-        || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
+    else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature)
+        || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature))
     {
       refreshFont();
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
index 580d315126..5cc132f26f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
@@ -42,8 +42,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi
   {
     View viewObject = (View)getHost().getModel();
     LinkedList<EObject> result = new LinkedList<EObject>();
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
-        .getAClassAAttributeCompartment_7003SemanticChildren(viewObject);
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getAClassAAttributeCompartment_7003SemanticChildren(viewObject);
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
       AcoreNodeDescriptor d = it.next();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
index 29a8e19103..b3bc9cd631 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
@@ -42,8 +42,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic
   {
     View viewObject = (View)getHost().getModel();
     LinkedList<EObject> result = new LinkedList<EObject>();
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
-        .getAClassAOperationClassCompartment_7004SemanticChildren(viewObject);
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getAClassAOperationClassCompartment_7004SemanticChildren(viewObject);
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
       AcoreNodeDescriptor d = it.next();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
index 0d3a37c29d..994f2a52a9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
@@ -79,32 +79,28 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
       Edge incomingLink = (Edge)it.next();
       if (AcoreVisualIDRegistry.getVisualID(incomingLink) == AClassSubClassesEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
-            incomingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(incomingLink) == AClassAssociationsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
-            incomingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(incomingLink) == AClassAggregationsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
-            incomingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(incomingLink) == AClassCompositionsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
-            incomingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
         continue;
@@ -115,40 +111,35 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
       Edge outgoingLink = (Edge)it.next();
       if (AcoreVisualIDRegistry.getVisualID(outgoingLink) == AClassSubClassesEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
-            outgoingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(outgoingLink) == AClassImplementedInterfacesEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
-            outgoingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(outgoingLink) == AClassAssociationsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
-            outgoingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(outgoingLink) == AClassAggregationsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
-            outgoingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
         continue;
       }
       if (AcoreVisualIDRegistry.getVisualID(outgoingLink) == AClassCompositionsEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null,
-            outgoingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));
         continue;
@@ -188,9 +179,8 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AAttribute2EditPart.VISUAL_ID:
-            cmd.add(
-                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                      // true
+            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                          // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -204,9 +194,8 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AOperation2EditPart.VISUAL_ID:
-            cmd.add(
-                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                      // true
+            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                          // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -223,8 +212,7 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
   @Override
   protected Command getCreateRelationshipCommand(CreateRelationshipRequest req)
   {
-    Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)
-        : getCompleteCreateRelationshipCommand(req);
+    Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
     return command != null ? command : super.getCreateRelationshipCommand(req);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
index c01fed7b09..c7d73ea83f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
@@ -135,8 +135,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
     }
     LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();
     // refreshSemanticChildren() alternative
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
-        .getACoreRoot_1000SemanticChildren((View)getHost().getModel());
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getACoreRoot_1000SemanticChildren((View)getHost().getModel());
     ArrayList<EObject> semanticChildren = new ArrayList<EObject>(childDescriptors.size());
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
@@ -156,15 +155,13 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
         it.remove();
       }
     }
-    ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(
-        childDescriptors.size());
+    ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
       AcoreNodeDescriptor next = it.next();
       String hint = AcoreVisualIDRegistry.getType(next.getVisualID());
       IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);
-      viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false,
-          host().getDiagramPreferencesHint()));
+      viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint()));
     }
     //
     CreateViewRequest request = getCreateViewRequest(viewDescriptors);
@@ -223,13 +220,11 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       EObject diagramLinkObject = nextDiagramLink.getElement();
       EObject diagramLinkSrc = nextDiagramLink.getSource().getElement();
       EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();
-      for (Iterator<AcoreLinkDescriptor> linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator
-          .hasNext();)
+      for (Iterator<AcoreLinkDescriptor> linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator.hasNext();)
       {
         AcoreLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator.next();
-        if (diagramLinkObject == nextLinkDescriptor.getModelElement()
-            && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination()
-            && diagramLinkVisualID == nextLinkDescriptor.getVisualID())
+        if (diagramLinkObject == nextLinkDescriptor.getModelElement() && diagramLinkSrc == nextLinkDescriptor.getSource()
+            && diagramLinkDst == nextLinkDescriptor.getDestination() && diagramLinkVisualID == nextLinkDescriptor.getVisualID())
         {
           linksIterator.remove();
           linkDescriptorsIterator.remove();
@@ -304,8 +299,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
-  private Collection<IAdaptable> createConnections(Collection<AcoreLinkDescriptor> linkDescriptors,
-      Map<EObject, View> domain2NotationMap)
+  private Collection<IAdaptable> createConnections(Collection<AcoreLinkDescriptor> linkDescriptors, Map<EObject, View> domain2NotationMap)
   {
     LinkedList<IAdaptable> adapters = new LinkedList<IAdaptable>();
     for (Iterator<AcoreLinkDescriptor> it = linkDescriptors.iterator(); it.hasNext();)
@@ -318,8 +312,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
         continue;
       }
       CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(
-          nextLinkDescriptor.getSemanticAdapter(), String.valueOf(nextLinkDescriptor.getVisualID()), ViewUtil.APPEND,
-          false, ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint());
+          nextLinkDescriptor.getSemanticAdapter(), String.valueOf(nextLinkDescriptor.getVisualID()), ViewUtil.APPEND, false,
+          ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint());
       CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(descriptor);
       ccr.setType(RequestConstants.REQ_CONNECTION_START);
       ccr.setSourceEditPart(sourceEditPart);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
index 4496309228..21a9ddb9e1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
@@ -42,8 +42,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends
   {
     View viewObject = (View)getHost().getModel();
     LinkedList<EObject> result = new LinkedList<EObject>();
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
-        .getAInterfaceAAttributeInterfaceCompartment_7001SemanticChildren(viewObject);
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getAInterfaceAAttributeInterfaceCompartment_7001SemanticChildren(viewObject);
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
       AcoreNodeDescriptor d = it.next();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
index c31e7694ac..436bb6591a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
@@ -42,8 +42,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends
   {
     View viewObject = (View)getHost().getModel();
     LinkedList<EObject> result = new LinkedList<EObject>();
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
-        .getAInterfaceAOperationInterfaceCompartment_7002SemanticChildren(viewObject);
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getAInterfaceAOperationInterfaceCompartment_7002SemanticChildren(viewObject);
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
       AcoreNodeDescriptor d = it.next();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
index 345ea89230..64e9fe6578 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
@@ -67,8 +67,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
       Edge incomingLink = (Edge)it.next();
       if (AcoreVisualIDRegistry.getVisualID(incomingLink) == AClassImplementedInterfacesEditPart.VISUAL_ID)
       {
-        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null,
-            incomingLink.getTarget().getElement(), false);
+        DestroyReferenceRequest r = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
         cmd.add(new DestroyReferenceCommand(r));
         cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));
         continue;
@@ -108,9 +107,8 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AAttributeEditPart.VISUAL_ID:
-            cmd.add(
-                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                      // true
+            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                          // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -124,9 +122,8 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AOperationEditPart.VISUAL_ID:
-            cmd.add(
-                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                      // true
+            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                          // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -143,8 +140,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   @Override
   protected Command getCreateRelationshipCommand(CreateRelationshipRequest req)
   {
-    Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)
-        : getCompleteCreateRelationshipCommand(req);
+    Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
     return command != null ? command : super.getCreateRelationshipCommand(req);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
index b62856d95d..bfb29f7962 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
@@ -141,8 +141,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
   {
     if (editPolicyCommand != null)
     {
-      ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy)editPolicyCommand).getICommand()
-          : new CommandProxy(editPolicyCommand);
+      ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy)editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);
       request.setParameter(AcoreBaseEditHelper.EDIT_POLICY_COMMAND, command);
     }
     IElementType requestContextElementType = getContextElementType(request);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
index a3f3a3fdc5..1018f7396a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
@@ -74,8 +74,7 @@ public class AcoreDomainNavigatorContentProvider implements ICommonContentProvid
    */
   public AcoreDomainNavigatorContentProvider()
   {
-    myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(
-        AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
+    myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
     TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
     myEditingDomain = (AdapterFactoryEditingDomain)editingDomain;
     myEditingDomain.setResourceToReadOnlyMap(new HashMap()
@@ -221,9 +220,7 @@ public class AcoreDomainNavigatorContentProvider implements ICommonContentProvid
 
     if (parentElement instanceof AcoreDomainNavigatorItem)
     {
-      return wrapEObjects(
-          myAdapterFctoryContentProvier.getChildren(((AcoreDomainNavigatorItem)parentElement).getEObject()),
-          parentElement);
+      return wrapEObjects(myAdapterFctoryContentProvier.getChildren(((AcoreDomainNavigatorItem)parentElement).getEObject()), parentElement);
     }
     return EMPTY_ARRAY;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
index 821616130a..52b4fcb124 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
@@ -118,8 +118,8 @@ public class AcoreDomainNavigatorItem extends PlatformObject
   {
     if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)
     {
-      return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(
-          ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj).getEObject()));
+      return EcoreUtil.getURI(getEObject())
+          .equals(EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj).getEObject()));
     }
     return super.equals(obj);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
index 6e8453e1d9..59e96287ba 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
@@ -274,16 +274,14 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassSubClassesEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassSubClasses_4001_target,
-          "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
-      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassSubClasses_4001_source,
-          "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassSubClasses_4001_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
+      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassSubClasses_4001_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
-      connectedViews = getLinksTargetByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       target.addChildren(createNavigatorItems(connectedViews, target, true));
-      connectedViews = getLinksSourceByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksSourceByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       source.addChildren(createNavigatorItems(connectedViews, source, true));
       if (!target.isEmpty())
       {
@@ -299,16 +297,14 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassCompositionsEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassCompositions_4005_target,
-          "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
-      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassCompositions_4005_source,
-          "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassCompositions_4005_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
+      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassCompositions_4005_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
-      connectedViews = getLinksTargetByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       target.addChildren(createNavigatorItems(connectedViews, target, true));
-      connectedViews = getLinksSourceByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksSourceByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       source.addChildren(createNavigatorItems(connectedViews, source, true));
       if (!target.isEmpty())
       {
@@ -324,8 +320,8 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AInterfaceEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AInterface_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", //$NON-NLS-1$
+      AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AInterface_2001_incominglinks,
+          "icons/incomingLinksNavigatorGroup.gif", //$NON-NLS-1$
           parentElement);
       Collection<View> connectedViews;
       connectedViews = getChildrenByType(Collections.singleton(view),
@@ -336,8 +332,7 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
           AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID));
       connectedViews = getChildrenByType(connectedViews, AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
       result.addAll(createNavigatorItems(connectedViews, parentElement, false));
-      connectedViews = getIncomingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
+      connectedViews = getIncomingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
       incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
       if (!incominglinks.isEmpty())
       {
@@ -349,16 +344,14 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassAggregationsEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAggregations_4004_target,
-          "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
-      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAggregations_4004_source,
-          "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAggregations_4004_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
+      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAggregations_4004_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
-      connectedViews = getLinksTargetByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       target.addChildren(createNavigatorItems(connectedViews, target, true));
-      connectedViews = getLinksSourceByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksSourceByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       source.addChildren(createNavigatorItems(connectedViews, source, true));
       if (!target.isEmpty())
       {
@@ -374,18 +367,16 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassImplementedInterfacesEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup target = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target,
+          "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
           parentElement);
-      AcoreNavigatorGroup source = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source,
+          "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
           parentElement);
       Collection<View> connectedViews;
-      connectedViews = getLinksTargetByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID));
+      connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID));
       target.addChildren(createNavigatorItems(connectedViews, target, true));
-      connectedViews = getLinksSourceByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksSourceByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       source.addChildren(createNavigatorItems(connectedViews, source, true));
       if (!target.isEmpty())
       {
@@ -406,40 +397,29 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
       AcoreNavigatorGroup outgoinglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClass_2002_outgoinglinks,
           "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
       Collection<View> connectedViews;
-      connectedViews = getChildrenByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID));
+      connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID));
       connectedViews = getChildrenByType(connectedViews, AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
       result.addAll(createNavigatorItems(connectedViews, parentElement, false));
-      connectedViews = getChildrenByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
+      connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
       connectedViews = getChildrenByType(connectedViews, AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
       result.addAll(createNavigatorItems(connectedViews, parentElement, false));
-      connectedViews = getIncomingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
+      connectedViews = getIncomingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
       incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
-      connectedViews = getOutgoingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
+      connectedViews = getOutgoingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
       outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
-      connectedViews = getOutgoingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
+      connectedViews = getOutgoingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
       outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
-      connectedViews = getIncomingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
+      connectedViews = getIncomingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
       incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
-      connectedViews = getOutgoingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
+      connectedViews = getOutgoingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
       outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
-      connectedViews = getIncomingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
+      connectedViews = getIncomingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
       incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
-      connectedViews = getOutgoingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
+      connectedViews = getOutgoingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
       outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
-      connectedViews = getIncomingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
+      connectedViews = getIncomingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
       incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
-      connectedViews = getOutgoingLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
+      connectedViews = getOutgoingLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
       outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
       if (!incominglinks.isEmpty())
       {
@@ -455,29 +435,21 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case ACoreRootEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup links = new AcoreNavigatorGroup(Messages.NavigatorGroupName_ACoreRoot_1000_links,
-          "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup links = new AcoreNavigatorGroup(Messages.NavigatorGroupName_ACoreRoot_1000_links, "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
       Collection<View> connectedViews;
-      connectedViews = getChildrenByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID));
+      connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID));
       result.addAll(createNavigatorItems(connectedViews, parentElement, false));
-      connectedViews = getChildrenByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       result.addAll(createNavigatorItems(connectedViews, parentElement, false));
-      connectedViews = getDiagramLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
+      connectedViews = getDiagramLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID));
       links.addChildren(createNavigatorItems(connectedViews, links, false));
-      connectedViews = getDiagramLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
+      connectedViews = getDiagramLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID));
       links.addChildren(createNavigatorItems(connectedViews, links, false));
-      connectedViews = getDiagramLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
+      connectedViews = getDiagramLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID));
       links.addChildren(createNavigatorItems(connectedViews, links, false));
-      connectedViews = getDiagramLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
+      connectedViews = getDiagramLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID));
       links.addChildren(createNavigatorItems(connectedViews, links, false));
-      connectedViews = getDiagramLinksByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
+      connectedViews = getDiagramLinksByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID));
       links.addChildren(createNavigatorItems(connectedViews, links, false));
       if (!links.isEmpty())
       {
@@ -489,16 +461,14 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassAssociationsEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAssociations_4003_target,
-          "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
-      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAssociations_4003_source,
-          "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup target = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAssociations_4003_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
+      AcoreNavigatorGroup source = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClassAssociations_4003_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
-      connectedViews = getLinksTargetByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       target.addChildren(createNavigatorItems(connectedViews, target, true));
-      connectedViews = getLinksSourceByType(Collections.singleton(view),
-          AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
+      connectedViews = getLinksSourceByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassEditPart.VISUAL_ID));
       source.addChildren(createNavigatorItems(connectedViews, source, true));
       if (!target.isEmpty())
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
index e9a849cb8b..0168131e8b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
@@ -38,8 +38,7 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem
         if (adaptableObject instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem
             && (adapterType == View.class || adapterType == EObject.class))
         {
-          return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject)
-              .getView();
+          return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject).getView();
         }
         return null;
       }
@@ -95,8 +94,8 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem
   {
     if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)
     {
-      return EcoreUtil.getURI(getView()).equals(EcoreUtil
-          .getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj).getView()));
+      return EcoreUtil.getURI(getView())
+          .equals(EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj).getView()));
     }
     return super.equals(obj);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
index d5c1a11fde..47a5d097ff 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
@@ -129,8 +129,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
       return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?aggregations", //$NON-NLS-1$
           AcoreElementTypes.AClassAggregations_4004);
     case AClassImplementedInterfacesEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", //$NON-NLS-1$
+      return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", //$NON-NLS-1$
           AcoreElementTypes.AClassImplementedInterfaces_4002);
     case AAttribute2EditPart.VISUAL_ID:
       return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", //$NON-NLS-1$
@@ -241,13 +240,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAAttribute_3001Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
@@ -261,13 +258,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAOperation_3004Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
@@ -297,13 +292,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAInterface_2001Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
@@ -333,13 +326,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAAttribute_3003Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
@@ -353,13 +344,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAClass_2002Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
@@ -398,13 +387,11 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getAOperation_3002Text(View view)
   {
-    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002,
-        view.getElement() != null ? view.getElement() : view,
+    IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, view.getElement() != null ? view.getElement() : view,
         AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
     if (parser != null)
     {
-      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
-          ParserOptions.NONE.intValue());
+      return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), ParserOptions.NONE.intValue());
     }
     else
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
index 833d38d7c0..df340d460a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
@@ -73,8 +73,7 @@ public class AcoreNavigatorLinkHelper implements ILinkHelper
    */
   public IStructuredSelection findSelection(IEditorInput anInput)
   {
-    IDiagramDocument document = AcoreDiagramEditorPlugin.getInstance().getDocumentProvider()
-        .getDiagramDocument(anInput);
+    IDiagramDocument document = AcoreDiagramEditorPlugin.getInstance().getDocumentProvider().getDiagramDocument(anInput);
     if (document == null)
     {
       return StructuredSelection.EMPTY;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
index 51f476bc8a..5e4c8d7c19 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
@@ -136,8 +136,7 @@ public class MessageFormatParser extends AbstractParser
   {
     if (editorProcessor == null)
     {
-      editorProcessor = new MessageFormat(
-          getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
+      editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
     }
     return editorProcessor;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
index 603988fb22..2dc9b22346 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
@@ -110,8 +110,7 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(Messages.AcoreCreationWizardTitle);
-    setDefaultPageImageDescriptor(
-        AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$
+    setDefaultPageImageDescriptor(AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$
     setNeedsProgressMonitor(true);
   }
 
@@ -158,8 +157,7 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
       @Override
       protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException
       {
-        diagram = AcoreDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(),
-            monitor);
+        diagram = AcoreDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor);
         if (isOpenNewlyCreatedDiagramEditor() && diagram != null)
         {
           try
@@ -168,8 +166,7 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
           }
           catch (PartInitException e)
           {
-            ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardOpenEditorError, null,
-                e.getStatus());
+            ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardOpenEditorError, null, e.getStatus());
           }
         }
       }
@@ -186,8 +183,7 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
     {
       if (e.getTargetException() instanceof CoreException)
       {
-        ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardCreationError, null,
-            ((CoreException)e.getTargetException()).getStatus());
+        ErrorDialog.openError(getContainer().getShell(), Messages.AcoreCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus());
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
index 936af4014d..2c6d20fa8d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
@@ -254,14 +254,12 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
     final IEditorInput newInput = new FileEditorInput(file);
     // Check if the editor is already open
     IEditorMatchingStrategy matchingStrategy = getEditorDescriptor().getEditorMatchingStrategy();
-    IEditorReference[] editorRefs = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-        .getEditorReferences();
+    IEditorReference[] editorRefs = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences();
     for (int i = 0; i < editorRefs.length; i++)
     {
       if (matchingStrategy.matches(editorRefs[i], newInput))
       {
-        MessageDialog.openWarning(shell, Messages.AcoreDiagramEditor_SaveAsErrorTitle,
-            Messages.AcoreDiagramEditor_SaveAsErrorMessage);
+        MessageDialog.openWarning(shell, Messages.AcoreDiagramEditor_SaveAsErrorTitle, Messages.AcoreDiagramEditor_SaveAsErrorMessage);
         return;
       }
     }
@@ -269,8 +267,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
     try
     {
       provider.aboutToChange(newInput);
-      getDocumentProvider(newInput).saveDocument(progressMonitor, newInput,
-          getDocumentProvider().getDocument(getEditorInput()), true);
+      getDocumentProvider(newInput).saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
       success = true;
     }
     catch (CoreException x)
@@ -278,8 +275,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
       IStatus status = x.getStatus();
       if (status == null || status.getSeverity() != IStatus.CANCEL)
       {
-        ErrorDialog.openError(shell, Messages.AcoreDiagramEditor_SaveErrorTitle,
-            Messages.AcoreDiagramEditor_SaveErrorMessage, x.getStatus());
+        ErrorDialog.openError(shell, Messages.AcoreDiagramEditor_SaveErrorTitle, Messages.AcoreDiagramEditor_SaveErrorMessage, x.getStatus());
       }
     }
     finally
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
index 7b296dc35a..629b6faf97 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
@@ -173,8 +173,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
     final IPath p = new Path(path);
     if (p.isAbsolute() && p.segmentCount() > 1)
     {
-      return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0),
-          p.removeFirstSegments(1).makeAbsolute().toString());
+      return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());
     }
     else
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
index 6bda66b55e..f29fb59080 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
@@ -181,8 +181,8 @@ public class AcoreDiagramEditorUtil
     final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
     final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);
     final String diagramName = diagramURI.lastSegment();
-    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain,
-        Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST)
+    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel,
+        Collections.EMPTY_LIST)
     {
       @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
@@ -190,8 +190,7 @@ public class AcoreDiagramEditorUtil
         ACoreRoot model = createInitialModel();
         attachModelToResource(model, modelResource);
 
-        Diagram diagram = ViewService.createDiagram(model, ACoreRootEditPart.MODEL_ID,
-            AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+        Diagram diagram = ViewService.createDiagram(model, ACoreRootEditPart.MODEL_ID, AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         if (diagram != null)
         {
           diagramResource.getContents().add(diagram);
@@ -201,10 +200,8 @@ public class AcoreDiagramEditorUtil
 
         try
         {
-          modelResource
-              .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
-          diagramResource
-              .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
+          modelResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
+          diagramResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
         }
         catch (IOException e)
         {
@@ -326,8 +323,7 @@ public class AcoreDiagramEditorUtil
   /**
    * @generated
    */
-  public static View findView(DiagramEditPart diagramEditPart, EObject targetElement,
-      LazyElement2ViewMap lazyElement2ViewMap)
+  public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap)
   {
     boolean hasStructuralURI = false;
     if (targetElement.eResource() instanceof XMLResource)
@@ -421,8 +417,7 @@ public class AcoreDiagramEditorUtil
         return element2ViewMap;
       }
 
-      if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement())
-          && elements.contains(parentView.getElement()))
+      if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement()))
       {
         element2ViewMap.put(parentView.getElement(), parentView);
         if (elements.size() == element2ViewMap.size())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
index 4a87da88ea..d7d73a0df6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
@@ -60,8 +60,7 @@ public class AcoreDiagramUpdateCommand implements IHandler
       {
         return null;
       }
-      if (structuredSelection.getFirstElement() instanceof EditPart
-          && ((EditPart)structuredSelection.getFirstElement()).getModel() instanceof View)
+      if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart)structuredSelection.getFirstElement()).getModel() instanceof View)
       {
         EObject modelElement = ((View)((EditPart)structuredSelection.getFirstElement()).getModel()).getElement();
         List editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
index 51de9686a8..2bb2d32a0c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
@@ -475,8 +475,7 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001(AClass target,
-      Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001(AClass target, Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
@@ -485,8 +484,7 @@ public class AcoreDiagramUpdater
       EStructuralFeature.Setting setting = (EStructuralFeature.Setting)it.next();
       if (setting.getEStructuralFeature() == AcorePackage.eINSTANCE.getAClass_SubClasses())
       {
-        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassSubClasses_4001,
-            AClassSubClassesEditPart.VISUAL_ID));
+        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassSubClasses_4001, AClassSubClassesEditPart.VISUAL_ID));
       }
     }
     return result;
@@ -495,8 +493,7 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_ImplementedInterfaces_4002(
-      AInterface target, Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_ImplementedInterfaces_4002(AInterface target, Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
@@ -505,8 +502,8 @@ public class AcoreDiagramUpdater
       EStructuralFeature.Setting setting = (EStructuralFeature.Setting)it.next();
       if (setting.getEStructuralFeature() == AcorePackage.eINSTANCE.getAClass_ImplementedInterfaces())
       {
-        result.add(new AcoreLinkDescriptor(setting.getEObject(), target,
-            AcoreElementTypes.AClassImplementedInterfaces_4002, AClassImplementedInterfacesEditPart.VISUAL_ID));
+        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassImplementedInterfaces_4002,
+            AClassImplementedInterfacesEditPart.VISUAL_ID));
       }
     }
     return result;
@@ -515,8 +512,7 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Associations_4003(
-      AClass target, Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Associations_4003(AClass target, Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
@@ -525,8 +521,7 @@ public class AcoreDiagramUpdater
       EStructuralFeature.Setting setting = (EStructuralFeature.Setting)it.next();
       if (setting.getEStructuralFeature() == AcorePackage.eINSTANCE.getAClass_Associations())
       {
-        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassAssociations_4003,
-            AClassAssociationsEditPart.VISUAL_ID));
+        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassAssociations_4003, AClassAssociationsEditPart.VISUAL_ID));
       }
     }
     return result;
@@ -535,8 +530,7 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Aggregations_4004(
-      AClass target, Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Aggregations_4004(AClass target, Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
@@ -545,8 +539,7 @@ public class AcoreDiagramUpdater
       EStructuralFeature.Setting setting = (EStructuralFeature.Setting)it.next();
       if (setting.getEStructuralFeature() == AcorePackage.eINSTANCE.getAClass_Aggregations())
       {
-        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassAggregations_4004,
-            AClassAggregationsEditPart.VISUAL_ID));
+        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassAggregations_4004, AClassAggregationsEditPart.VISUAL_ID));
       }
     }
     return result;
@@ -555,8 +548,7 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Compositions_4005(
-      AClass target, Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_Compositions_4005(AClass target, Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
@@ -565,8 +557,7 @@ public class AcoreDiagramUpdater
       EStructuralFeature.Setting setting = (EStructuralFeature.Setting)it.next();
       if (setting.getEStructuralFeature() == AcorePackage.eINSTANCE.getAClass_Compositions())
       {
-        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassCompositions_4005,
-            AClassCompositionsEditPart.VISUAL_ID));
+        result.add(new AcoreLinkDescriptor(setting.getEObject(), target, AcoreElementTypes.AClassCompositions_4005, AClassCompositionsEditPart.VISUAL_ID));
       }
     }
     return result;
@@ -581,8 +572,7 @@ public class AcoreDiagramUpdater
     for (Iterator destinations = source.getSubClasses().iterator(); destinations.hasNext();)
     {
       AClass destination = (AClass)destinations.next();
-      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassSubClasses_4001,
-          AClassSubClassesEditPart.VISUAL_ID));
+      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassSubClasses_4001, AClassSubClassesEditPart.VISUAL_ID));
     }
     return result;
   }
@@ -590,15 +580,14 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_ImplementedInterfaces_4002(
-      AClass source)
+  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_ImplementedInterfaces_4002(AClass source)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     for (Iterator destinations = source.getImplementedInterfaces().iterator(); destinations.hasNext();)
     {
       AInterface destination = (AInterface)destinations.next();
-      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassImplementedInterfaces_4002,
-          AClassImplementedInterfacesEditPart.VISUAL_ID));
+      result
+          .add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassImplementedInterfaces_4002, AClassImplementedInterfacesEditPart.VISUAL_ID));
     }
     return result;
   }
@@ -606,15 +595,13 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Associations_4003(
-      AClass source)
+  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Associations_4003(AClass source)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     for (Iterator destinations = source.getAssociations().iterator(); destinations.hasNext();)
     {
       AClass destination = (AClass)destinations.next();
-      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassAssociations_4003,
-          AClassAssociationsEditPart.VISUAL_ID));
+      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassAssociations_4003, AClassAssociationsEditPart.VISUAL_ID));
     }
     return result;
   }
@@ -622,15 +609,13 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Aggregations_4004(
-      AClass source)
+  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Aggregations_4004(AClass source)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     for (Iterator destinations = source.getAggregations().iterator(); destinations.hasNext();)
     {
       AClass destination = (AClass)destinations.next();
-      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassAggregations_4004,
-          AClassAggregationsEditPart.VISUAL_ID));
+      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassAggregations_4004, AClassAggregationsEditPart.VISUAL_ID));
     }
     return result;
   }
@@ -638,15 +623,13 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Compositions_4005(
-      AClass source)
+  private static Collection<AcoreLinkDescriptor> getOutgoingFeatureModelFacetLinks_AClass_Compositions_4005(AClass source)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     for (Iterator destinations = source.getCompositions().iterator(); destinations.hasNext();)
     {
       AClass destination = (AClass)destinations.next();
-      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassCompositions_4005,
-          AClassCompositionsEditPart.VISUAL_ID));
+      result.add(new AcoreLinkDescriptor(source, destination, AcoreElementTypes.AClassCompositions_4005, AClassCompositionsEditPart.VISUAL_ID));
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
index ddfb75e9fb..126ae2a3a5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
@@ -173,8 +173,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   {
     TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
     editingDomain.setID("org.eclipse.emf.cdo.dawn.examples.acore.diagram.EditingDomain"); //$NON-NLS-1$
-    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter
-        .createNotifierFilter(editingDomain.getResourceSet())
+    final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet())
         .and(NotificationFilter.createEventTypeFilter(Notification.ADD))
         .and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
     editingDomain.getResourceSet().eAdapters().add(new Adapter()
@@ -286,8 +285,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
-              msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(
+              new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
@@ -376,8 +375,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           files2Validate.add(file);
         }
       }
-      ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]),
-          computationContext);
+      ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);
     }
 
     super.doValidateState(element, computationContext);
@@ -640,23 +638,22 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
    * @generated
    */
   @Override
-  protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
-      throws CoreException
+  protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException
   {
     ResourceSetInfo info = getResourceSetInfo(element);
     if (info != null)
     {
       if (!overwrite && !info.isSynchronized())
       {
-        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID,
-            IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.AcoreDocumentProvider_UnsynchronizedFileSaveError, null));
+        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL,
+            Messages.AcoreDocumentProvider_UnsynchronizedFileSaveError, null));
       }
       info.stopResourceListening();
       fireElementStateChanging(element);
       try
       {
-        monitor.beginTask(Messages.AcoreDocumentProvider_SaveDiagramTask,
-            info.getResourceSet().getResources().size() + 1); // "Saving diagram"
+        monitor.beginTask(Messages.AcoreDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); // "Saving
+                                                                                                                            // diagram"
         for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();)
         {
           Resource nextResource = it.next();
@@ -670,8 +667,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
             catch (IOException e)
             {
               fireElementStateChangeFailed(element);
-              throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID,
-                  EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));
+              throw new CoreException(
+                  new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));
             }
           }
           monitor.worked(1);
@@ -725,12 +722,11 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
       final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());
       try
       {
-        new AbstractTransactionalCommand(diagramDocument.getEditingDomain(),
-            NLS.bind(Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles)
+        new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()),
+            affectedFiles)
         {
           @Override
-          protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-              throws ExecutionException
+          protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
           {
             newResource.getContents().add(diagramCopy);
             return CommandResult.newOKCommandResult();
@@ -741,14 +737,12 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
       catch (ExecutionException e)
       {
         fireElementStateChangeFailed(element);
-        throw new CoreException(
-            new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
+        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
       }
       catch (IOException e)
       {
         fireElementStateChangeFailed(element);
-        throw new CoreException(
-            new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
+        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
       }
       newResource.unload();
     }
@@ -801,8 +795,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   {
     if (input instanceof FileEditorInput)
     {
-      IFile newFile = ResourcesPlugin.getWorkspace().getRoot()
-          .getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));
+      IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));
       fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));
       return;
     }
@@ -1171,8 +1164,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
     public ResourceSetModificationListener(ResourceSetInfo info)
     {
       myInfo = info;
-      myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET)
-          .or(NotificationFilter.createEventTypeFilter(Notification.UNSET))
+      myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET))
           .and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));
     }
 
@@ -1194,8 +1186,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           if (resource.isLoaded())
           {
             boolean modified = false;
-            for (Iterator /* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it
-                .hasNext() && !modified;)
+            for (Iterator /* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;)
             {
               Resource nextResource = (Resource)it.next();
               if (nextResource.isLoaded())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
index 5c093b4db1..bf3a2d1fbf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
@@ -99,8 +99,7 @@ public class AcoreInitDiagramFileAction implements IObjectActionDelegate
     }
     if (diagramRoot == null)
     {
-      MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle,
-          Messages.InitDiagramFile_ResourceErrorDialogMessage);
+      MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage);
       return;
     }
     Wizard wizard = new AcoreNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
index 7b21d650fd..5c733842ec 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
@@ -71,8 +71,7 @@ public class AcoreLinkDescriptor extends AcoreNodeDescriptor
   /**
    * @generated
    */
-  public AcoreLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType,
-      int linkVID)
+  public AcoreLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, int linkVID)
   {
     this(source, destination, linkElement, linkVID);
     final IElementType elementTypeCopy = elementType;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
index 4227568e9d..14772e6aca 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
@@ -73,11 +73,9 @@ public class AcoreNewDiagramFileWizard extends Wizard
     assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$
     assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$
 
-    myFileCreationPage = new WizardNewFileCreationPage(Messages.AcoreNewDiagramFileWizard_CreationPageName,
-        StructuredSelection.EMPTY);
+    myFileCreationPage = new WizardNewFileCreationPage(Messages.AcoreNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);
     myFileCreationPage.setTitle(Messages.AcoreNewDiagramFileWizard_CreationPageTitle);
-    myFileCreationPage.setDescription(
-        NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription, ACoreRootEditPart.MODEL_ID));
+    myFileCreationPage.setDescription(NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription, ACoreRootEditPart.MODEL_ID));
     IPath filePath;
     String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());
     if (domainModelURI.isPlatformResource())
@@ -96,8 +94,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
     myFileCreationPage.setContainerFullPath(filePath);
     myFileCreationPage.setFileName(AcoreDiagramEditorUtil.getUniqueFileName(filePath, fileName, "acore_diagram")); //$NON-NLS-1$
 
-    diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(
-        Messages.AcoreNewDiagramFileWizard_RootSelectionPageName);
+    diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.AcoreNewDiagramFileWizard_RootSelectionPageName);
     diagramRootElementSelectionPage.setTitle(Messages.AcoreNewDiagramFileWizard_RootSelectionPageTitle);
     diagramRootElementSelectionPage.setDescription(Messages.AcoreNewDiagramFileWizard_RootSelectionPageDescription);
     diagramRootElementSelectionPage.setModelElement(diagramRoot);
@@ -128,8 +125,8 @@ public class AcoreNewDiagramFileWizard extends Wizard
     URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
     ResourceSet resourceSet = myEditingDomain.getResourceSet();
     final Resource diagramResource = resourceSet.createResource(diagramModelURI);
-    AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain,
-        Messages.AcoreNewDiagramFileWizard_InitDiagramCommand, affectedFiles)
+    AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, Messages.AcoreNewDiagramFileWizard_InitDiagramCommand,
+        affectedFiles)
     {
 
       @Override
@@ -140,8 +137,8 @@ public class AcoreNewDiagramFileWizard extends Wizard
         {
           return CommandResult.newErrorCommandResult(Messages.AcoreNewDiagramFileWizard_IncorrectRootError);
         }
-        Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(),
-            ACoreRootEditPart.MODEL_ID, AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+        Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), ACoreRootEditPart.MODEL_ID,
+            AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         diagramResource.getContents().add(diagram);
         return CommandResult.newOKCommandResult();
       }
@@ -201,9 +198,8 @@ public class AcoreNewDiagramFileWizard extends Wizard
         setErrorMessage(Messages.AcoreNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);
         return false;
       }
-      boolean result = ViewService.getInstance()
-          .provides(new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID,
-              AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
+      boolean result = ViewService.getInstance().provides(new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID,
+          AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
       setErrorMessage(result ? null : Messages.AcoreNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);
       return result;
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
index 0637f0c444..d9a15a5de3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
@@ -92,8 +92,8 @@ public class AcorePaletteFactory
    */
   private ToolEntry createAInterface2CreationTool()
   {
-    NodeToolEntry entry = new NodeToolEntry(Messages.AInterface2CreationTool_title,
-        Messages.AInterface2CreationTool_desc, Collections.singletonList(AcoreElementTypes.AInterface_2001));
+    NodeToolEntry entry = new NodeToolEntry(Messages.AInterface2CreationTool_title, Messages.AInterface2CreationTool_desc,
+        Collections.singletonList(AcoreElementTypes.AInterface_2001));
     entry.setId("createAInterface2CreationTool"); //$NON-NLS-1$
     entry.setSmallIcon(AcoreElementTypes.getImageDescriptor(AcoreElementTypes.AInterface_2001));
     entry.setLargeIcon(entry.getSmallIcon());
@@ -108,8 +108,7 @@ public class AcorePaletteFactory
     ArrayList<IElementType> types = new ArrayList<IElementType>(2);
     types.add(AcoreElementTypes.AAttribute_3001);
     types.add(AcoreElementTypes.AAttribute_3003);
-    NodeToolEntry entry = new NodeToolEntry(Messages.AAttribute3CreationTool_title,
-        Messages.AAttribute3CreationTool_desc, types);
+    NodeToolEntry entry = new NodeToolEntry(Messages.AAttribute3CreationTool_title, Messages.AAttribute3CreationTool_desc, types);
     entry.setId("createAAttribute3CreationTool"); //$NON-NLS-1$
     entry.setSmallIcon(AcoreElementTypes.getImageDescriptor(AcoreElementTypes.AAttribute_3001));
     entry.setLargeIcon(entry.getSmallIcon());
@@ -124,8 +123,7 @@ public class AcorePaletteFactory
     ArrayList<IElementType> types = new ArrayList<IElementType>(2);
     types.add(AcoreElementTypes.AOperation_3002);
     types.add(AcoreElementTypes.AOperation_3004);
-    NodeToolEntry entry = new NodeToolEntry(Messages.AOperation4CreationTool_title,
-        Messages.AOperation4CreationTool_desc, types);
+    NodeToolEntry entry = new NodeToolEntry(Messages.AOperation4CreationTool_title, Messages.AOperation4CreationTool_desc, types);
     entry.setId("createAOperation4CreationTool"); //$NON-NLS-1$
     entry.setSmallIcon(AcoreElementTypes.getImageDescriptor(AcoreElementTypes.AOperation_3002));
     entry.setLargeIcon(entry.getSmallIcon());
@@ -140,10 +138,8 @@ public class AcorePaletteFactory
     LinkToolEntry entry = new LinkToolEntry(Messages.Inherits1CreationTool_title, Messages.Inherits1CreationTool_desc,
         Collections.singletonList(AcoreElementTypes.AClassSubClasses_4001));
     entry.setId("createInherits1CreationTool"); //$NON-NLS-1$
-    entry.setSmallIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/inherits.png")); //$NON-NLS-1$
-    entry.setLargeIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/inherits.png")); //$NON-NLS-1$
+    entry.setSmallIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/inherits.png")); //$NON-NLS-1$
+    entry.setLargeIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/inherits.png")); //$NON-NLS-1$
     return entry;
   }
 
@@ -152,14 +148,11 @@ public class AcorePaletteFactory
    */
   private ToolEntry createImplements2CreationTool()
   {
-    LinkToolEntry entry = new LinkToolEntry(Messages.Implements2CreationTool_title,
-        Messages.Implements2CreationTool_desc,
+    LinkToolEntry entry = new LinkToolEntry(Messages.Implements2CreationTool_title, Messages.Implements2CreationTool_desc,
         Collections.singletonList(AcoreElementTypes.AClassImplementedInterfaces_4002));
     entry.setId("createImplements2CreationTool"); //$NON-NLS-1$
-    entry.setSmallIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/implements.png")); //$NON-NLS-1$
-    entry.setLargeIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/implements.png")); //$NON-NLS-1$
+    entry.setSmallIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/implements.png")); //$NON-NLS-1$
+    entry.setLargeIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/implements.png")); //$NON-NLS-1$
     return entry;
   }
 
@@ -168,13 +161,11 @@ public class AcorePaletteFactory
    */
   private ToolEntry createAssociation3CreationTool()
   {
-    LinkToolEntry entry = new LinkToolEntry(Messages.Association3CreationTool_title,
-        Messages.Association3CreationTool_desc, Collections.singletonList(AcoreElementTypes.AClassAssociations_4003));
+    LinkToolEntry entry = new LinkToolEntry(Messages.Association3CreationTool_title, Messages.Association3CreationTool_desc,
+        Collections.singletonList(AcoreElementTypes.AClassAssociations_4003));
     entry.setId("createAssociation3CreationTool"); //$NON-NLS-1$
-    entry.setSmallIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/association.png")); //$NON-NLS-1$
-    entry.setLargeIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/association.png")); //$NON-NLS-1$
+    entry.setSmallIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/association.png")); //$NON-NLS-1$
+    entry.setLargeIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/association.png")); //$NON-NLS-1$
     return entry;
   }
 
@@ -183,13 +174,11 @@ public class AcorePaletteFactory
    */
   private ToolEntry createAggregation4CreationTool()
   {
-    LinkToolEntry entry = new LinkToolEntry(Messages.Aggregation4CreationTool_title,
-        Messages.Aggregation4CreationTool_desc, Collections.singletonList(AcoreElementTypes.AClassAggregations_4004));
+    LinkToolEntry entry = new LinkToolEntry(Messages.Aggregation4CreationTool_title, Messages.Aggregation4CreationTool_desc,
+        Collections.singletonList(AcoreElementTypes.AClassAggregations_4004));
     entry.setId("createAggregation4CreationTool"); //$NON-NLS-1$
-    entry.setSmallIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/aggregation.png")); //$NON-NLS-1$
-    entry.setLargeIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/aggregation.png")); //$NON-NLS-1$
+    entry.setSmallIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/aggregation.png")); //$NON-NLS-1$
+    entry.setLargeIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/aggregation.png")); //$NON-NLS-1$
     return entry;
   }
 
@@ -198,13 +187,11 @@ public class AcorePaletteFactory
    */
   private ToolEntry createComposition5CreationTool()
   {
-    LinkToolEntry entry = new LinkToolEntry(Messages.Composition5CreationTool_title,
-        Messages.Composition5CreationTool_desc, Collections.singletonList(AcoreElementTypes.AClassCompositions_4005));
+    LinkToolEntry entry = new LinkToolEntry(Messages.Composition5CreationTool_title, Messages.Composition5CreationTool_desc,
+        Collections.singletonList(AcoreElementTypes.AClassCompositions_4005));
     entry.setId("createComposition5CreationTool"); //$NON-NLS-1$
-    entry.setSmallIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/composition.png")); //$NON-NLS-1$
-    entry.setLargeIcon(AcoreDiagramEditorPlugin
-        .findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/composition.png")); //$NON-NLS-1$
+    entry.setSmallIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/composition.png")); //$NON-NLS-1$
+    entry.setLargeIcon(AcoreDiagramEditorPlugin.findImageDescriptor("/org.eclipse.emf.cdo.dawn.examples.acore.edit/icons/full/obj16/composition.png")); //$NON-NLS-1$
     return entry;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
index 17943b8773..680ecc1bc6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
@@ -121,8 +121,7 @@ public class AcoreVisualIDRegistry
     {
       return -1;
     }
-    if (AcorePackage.eINSTANCE.getACoreRoot().isSuperTypeOf(domainElement.eClass())
-        && isDiagram((ACoreRoot)domainElement))
+    if (AcorePackage.eINSTANCE.getACoreRoot().isSuperTypeOf(domainElement.eClass()) && isDiagram((ACoreRoot)domainElement))
     {
       return ACoreRootEditPart.VISUAL_ID;
     }
@@ -138,8 +137,7 @@ public class AcoreVisualIDRegistry
     {
       return -1;
     }
-    String containerModelID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry
-        .getModelID(containerView);
+    String containerModelID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry.getModelID(containerView);
     if (!ACoreRootEditPart.MODEL_ID.equals(containerModelID))
     {
       return -1;
@@ -147,8 +145,7 @@ public class AcoreVisualIDRegistry
     int containerVisualID;
     if (ACoreRootEditPart.MODEL_ID.equals(containerModelID))
     {
-      containerVisualID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry
-          .getVisualID(containerView);
+      containerVisualID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry.getVisualID(containerView);
     }
     else
     {
@@ -206,8 +203,7 @@ public class AcoreVisualIDRegistry
    */
   public static boolean canCreateNode(View containerView, int nodeVisualID)
   {
-    String containerModelID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry
-        .getModelID(containerView);
+    String containerModelID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry.getModelID(containerView);
     if (!ACoreRootEditPart.MODEL_ID.equals(containerModelID))
     {
       return false;
@@ -215,8 +211,7 @@ public class AcoreVisualIDRegistry
     int containerVisualID;
     if (ACoreRootEditPart.MODEL_ID.equals(containerModelID))
     {
-      containerVisualID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry
-          .getVisualID(containerView);
+      containerVisualID = org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreVisualIDRegistry.getVisualID(containerView);
     }
     else
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
index a81c2a89db..fe2a7f5fff 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
@@ -106,10 +106,8 @@ public class ModelElementSelectionPage extends WizardPage
     layoutData.heightHint = 300;
     layoutData.widthHint = 300;
     modelViewer.getTree().setLayoutData(layoutData);
-    modelViewer.setContentProvider(
-        new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
-    modelViewer.setLabelProvider(
-        new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
+    modelViewer.setContentProvider(new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
+    modelViewer.setLabelProvider(new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
     if (selectedModelElement != null)
     {
       modelViewer.setInput(selectedModelElement.eResource());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
index bf860f68ec..bdce80d956 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
@@ -74,50 +74,42 @@ public class AcoreElementTypes extends ElementInitializers
   /**
    * @generated
    */
-  public static final IElementType ACoreRoot_1000 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$
+  public static final IElementType ACoreRoot_1000 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AInterface_2001 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$
+  public static final IElementType AInterface_2001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClass_2002 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$
+  public static final IElementType AClass_2002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AAttribute_3001 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$
+  public static final IElementType AAttribute_3001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AOperation_3002 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$
+  public static final IElementType AOperation_3002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AAttribute_3003 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$
+  public static final IElementType AAttribute_3003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AOperation_3004 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$
+  public static final IElementType AOperation_3004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassSubClasses_4001 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$
+  public static final IElementType AClassSubClasses_4001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$
 
   /**
    * @generated
@@ -128,20 +120,17 @@ public class AcoreElementTypes extends ElementInitializers
   /**
    * @generated
    */
-  public static final IElementType AClassAssociations_4003 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$
+  public static final IElementType AClassAssociations_4003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassAggregations_4004 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$
+  public static final IElementType AClassAggregations_4004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassCompositions_4005 = getElementType(
-      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$
+  public static final IElementType AClassCompositions_4005 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$
 
   /**
    * @generated
@@ -187,8 +176,7 @@ public class AcoreElementTypes extends ElementInitializers
       EClass eClass = (EClass)element;
       if (!eClass.isAbstract())
       {
-        return AcoreDiagramEditorPlugin.getInstance()
-            .getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));
+        return AcoreDiagramEditorPlugin.getInstance().getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));
       }
     }
     // TODO : support structural features
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
index ff5ff6b752..7246fff222 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
@@ -219,8 +219,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   protected EObject selectElement(EObject[] elements)
   {
     Shell shell = Display.getCurrent().getActiveShell();
-    ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
-        AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
+    ILabelProvider labelProvider = new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
     ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, labelProvider);
     dialog.setMessage(Messages.AcoreModelingAssistantProviderMessage);
     dialog.setTitle(Messages.AcoreModelingAssistantProviderTitle);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
index 98a4ce97f6..11300fd9fa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
@@ -91,8 +91,8 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
   {
     if (aAttribute_3001Parser == null)
     {
-      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(),
-          AcorePackage.eINSTANCE.getAClassChild_DataType(), AcorePackage.eINSTANCE.getAClassChild_Name() };
+      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(), AcorePackage.eINSTANCE.getAClassChild_DataType(),
+          AcorePackage.eINSTANCE.getAClassChild_Name() };
       MessageFormatParser parser = new MessageFormatParser(features);
       parser.setViewPattern("{0} {2}:{1}"); //$NON-NLS-1$
       parser.setEditorPattern("{0} {2}:{1}"); //$NON-NLS-1$
@@ -114,8 +114,8 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
   {
     if (aOperation_3002Parser == null)
     {
-      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(),
-          AcorePackage.eINSTANCE.getAClassChild_DataType(), AcorePackage.eINSTANCE.getAClassChild_Name() };
+      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(), AcorePackage.eINSTANCE.getAClassChild_DataType(),
+          AcorePackage.eINSTANCE.getAClassChild_Name() };
       MessageFormatParser parser = new MessageFormatParser(features);
       parser.setViewPattern("{0} {2}():{1}"); //$NON-NLS-1$
       parser.setEditorPattern("{0} {2}():{1}"); //$NON-NLS-1$
@@ -137,8 +137,8 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
   {
     if (aAttribute_3003Parser == null)
     {
-      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(),
-          AcorePackage.eINSTANCE.getAClassChild_DataType(), AcorePackage.eINSTANCE.getAClassChild_Name() };
+      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(), AcorePackage.eINSTANCE.getAClassChild_DataType(),
+          AcorePackage.eINSTANCE.getAClassChild_Name() };
       MessageFormatParser parser = new MessageFormatParser(features);
       parser.setViewPattern("{0} {2}:{1}"); //$NON-NLS-1$
       parser.setEditorPattern("{0} {2}:{1}"); //$NON-NLS-1$
@@ -160,8 +160,8 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
   {
     if (aOperation_3004Parser == null)
     {
-      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(),
-          AcorePackage.eINSTANCE.getAClassChild_DataType(), AcorePackage.eINSTANCE.getAClassChild_Name() };
+      EAttribute[] features = new EAttribute[] { AcorePackage.eINSTANCE.getAClassChild_Accessright(), AcorePackage.eINSTANCE.getAClassChild_DataType(),
+          AcorePackage.eINSTANCE.getAClassChild_Name() };
       MessageFormatParser parser = new MessageFormatParser(features);
       parser.setViewPattern("{0} {2}():{1}"); //$NON-NLS-1$
       parser.setEditorPattern("{0} {2}():{1}"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
index 867a3e0148..864cd6af86 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
@@ -163,8 +163,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
         {
           return false; // if semantic hint is specified it should be the same as in element type
         }
-        if (domainElement != null
-            && visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
+        if (domainElement != null && visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
         {
           return false; // visual id for node EClass should match visual id from element type
         }
@@ -183,8 +182,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
         case AOperationEditPart.VISUAL_ID:
         case AAttribute2EditPart.VISUAL_ID:
         case AOperation2EditPart.VISUAL_ID:
-          if (domainElement == null
-              || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
+          if (domainElement == null || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
           {
             return false; // visual id in semantic hint should match visual id for domain element
           }
@@ -194,9 +192,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
         }
       }
     }
-    return AInterfaceEditPart.VISUAL_ID == visualID || AClassEditPart.VISUAL_ID == visualID
-        || AAttributeEditPart.VISUAL_ID == visualID || AOperationEditPart.VISUAL_ID == visualID
-        || AAttribute2EditPart.VISUAL_ID == visualID || AOperation2EditPart.VISUAL_ID == visualID;
+    return AInterfaceEditPart.VISUAL_ID == visualID || AClassEditPart.VISUAL_ID == visualID || AAttributeEditPart.VISUAL_ID == visualID
+        || AOperationEditPart.VISUAL_ID == visualID || AAttribute2EditPart.VISUAL_ID == visualID || AOperation2EditPart.VISUAL_ID == visualID;
   }
 
   /**
@@ -239,8 +236,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index,
-      boolean persisted, PreferencesHint preferencesHint)
+  public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     final EObject domainElement = getSemanticElement(semanticAdapter);
     final int visualID;
@@ -274,8 +270,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index,
-      boolean persisted, PreferencesHint preferencesHint)
+  public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     IElementType elementType = getSemanticElementType(semanticAdapter);
     String elementTypeHint = ((IHintedType)elementType).getSemanticHint();
@@ -299,8 +294,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Node createAInterface_2001(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAInterface_2001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
@@ -314,10 +308,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializeFromPreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (nodeFontStyle != null)
     {
@@ -326,23 +318,19 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       nodeFontStyle.setFontHeight(fontData.getHeight());
       nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Node label5001 = createLabel(node, AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
-    createCompartment(node, AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID),
-        false, false, true, true);
-    createCompartment(node, AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID),
-        false, false, true, true);
+    createCompartment(node, AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID), false, false, true, true);
+    createCompartment(node, AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID), false, false, true, true);
     return node;
   }
 
   /**
    * @generated
    */
-  public Node createAClass_2002(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAClass_2002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
@@ -356,10 +344,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializeFromPreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (nodeFontStyle != null)
     {
@@ -368,23 +354,19 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       nodeFontStyle.setFontHeight(fontData.getHeight());
       nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Node label5002 = createLabel(node, AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
-    createCompartment(node, AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID), false, false,
-        true, true);
-    createCompartment(node, AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID), false,
-        false, true, true);
+    createCompartment(node, AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID), false, false, true, true);
+    createCompartment(node, AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID), false, false, true, true);
     return node;
   }
 
   /**
    * @generated
    */
-  public Node createAAttribute_3001(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAAttribute_3001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
@@ -397,8 +379,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Node createAOperation_3002(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAOperation_3002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
@@ -411,8 +392,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Node createAAttribute_3003(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAAttribute_3003(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
@@ -425,8 +405,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Node createAOperation_3004(EObject domainElement, View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Node createAOperation_3004(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Node node = NotationFactory.eINSTANCE.createNode();
     node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
@@ -439,8 +418,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createAClassSubClasses_4001(View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Edge createAClassSubClasses_4001(View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Connector edge = NotationFactory.eINSTANCE.createConnector();
     edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
@@ -456,10 +434,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (edgeFontStyle != null)
     {
@@ -468,8 +444,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       edgeFontStyle.setFontHeight(fontData.getHeight());
       edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
@@ -483,8 +458,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createAClassImplementedInterfaces_4002(View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Edge createAClassImplementedInterfaces_4002(View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Connector edge = NotationFactory.eINSTANCE.createConnector();
     edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
@@ -500,10 +474,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (edgeFontStyle != null)
     {
@@ -512,8 +484,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       edgeFontStyle.setFontHeight(fontData.getHeight());
       edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
@@ -527,8 +498,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createAClassAssociations_4003(View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Edge createAClassAssociations_4003(View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Connector edge = NotationFactory.eINSTANCE.createConnector();
     edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
@@ -544,10 +514,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (edgeFontStyle != null)
     {
@@ -556,8 +524,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       edgeFontStyle.setFontHeight(fontData.getHeight());
       edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
@@ -571,8 +538,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createAClassAggregations_4004(View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Edge createAClassAggregations_4004(View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Connector edge = NotationFactory.eINSTANCE.createConnector();
     edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
@@ -588,10 +554,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (edgeFontStyle != null)
     {
@@ -600,8 +564,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       edgeFontStyle.setFontHeight(fontData.getHeight());
       edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
@@ -615,8 +578,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  public Edge createAClassCompositions_4005(View containerView, int index, boolean persisted,
-      PreferencesHint preferencesHint)
+  public Edge createAClassCompositions_4005(View containerView, int index, boolean persisted, PreferencesHint preferencesHint)
   {
     Connector edge = NotationFactory.eINSTANCE.createConnector();
     edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
@@ -632,10 +594,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
-        IPreferenceConstants.PREF_LINE_COLOR);
-    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-        FigureUtilities.RGBToInteger(lineRGB));
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
     if (edgeFontStyle != null)
     {
@@ -644,8 +604,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       edgeFontStyle.setFontHeight(fontData.getHeight());
       edgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
       edgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore,
-          IPreferenceConstants.PREF_FONT_COLOR);
+      org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);
       edgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
     }
     Routing routing = Routing.get(prefStore.getInt(IPreferenceConstants.PREF_LINE_STYLE));
@@ -684,8 +643,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   /**
    * @generated
    */
-  private Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort,
-      boolean canFilter)
+  private Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter)
   {
     // SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();
     // rv.setShowTitle(showTitle);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/.settings/org.eclipse.jdt.core.prefs
index b6090d0979..f74fbe3967 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
index 8d1c852dea..1b7adfb914 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
@@ -31,8 +31,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AAttributeItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AAttributeItemProvider extends AClassChildItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -80,8 +80,7 @@ public class AAttributeItemProvider extends AClassChildItemProvider implements I
   public String getText(Object object)
   {
     String label = ((AAttribute)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AAttribute_type")
-        : getString("_UI_AAttribute_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AAttribute_type") : getString("_UI_AAttribute_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
index 5364def1dc..65ed7f99fc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ABasicClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class ABasicClassItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ABasicClass_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ABasicClass_name_feature", "_UI_ABasicClass_type"),
-            AcorePackage.Literals.ABASIC_CLASS__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ABasicClass_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABasicClass_name_feature", "_UI_ABasicClass_type"),
+        AcorePackage.Literals.ABASIC_CLASS__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -138,8 +135,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     String label = ((ABasicClass)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_ABasicClass_type")
-        : getString("_UI_ABasicClass_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_ABasicClass_type") : getString("_UI_ABasicClass_type") + " " + label;
   }
 
   /**
@@ -177,11 +173,9 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ABASIC_CLASS__OPERATIONS,
-        AcoreFactory.eINSTANCE.createAOperation()));
+    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ABASIC_CLASS__OPERATIONS, AcoreFactory.eINSTANCE.createAOperation()));
 
-    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ABASIC_CLASS__ATTRIBUTES,
-        AcoreFactory.eINSTANCE.createAAttribute()));
+    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ABASIC_CLASS__ATTRIBUTES, AcoreFactory.eINSTANCE.createAAttribute()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
index 52e7f2262f..3345ae6b20 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AClassChildItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AClassChildItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClassChild_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_name_feature", "_UI_AClassChild_type"),
-            AcorePackage.Literals.ACLASS_CHILD__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClassChild_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_name_feature", "_UI_AClassChild_type"),
+        AcorePackage.Literals.ACLASS_CHILD__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -91,13 +88,10 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addAccessrightPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClassChild_accessright_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_accessright_feature",
-                "_UI_AClassChild_type"),
-            AcorePackage.Literals.ACLASS_CHILD__ACCESSRIGHT, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClassChild_accessright_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_accessright_feature", "_UI_AClassChild_type"),
+        AcorePackage.Literals.ACLASS_CHILD__ACCESSRIGHT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -107,14 +101,10 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addDataTypePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_AClassChild_dataType_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_dataType_feature",
-                    "_UI_AClassChild_type"),
-                AcorePackage.Literals.ACLASS_CHILD__DATA_TYPE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClassChild_dataType_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_dataType_feature", "_UI_AClassChild_type"),
+        AcorePackage.Literals.ACLASS_CHILD__DATA_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -137,8 +127,7 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     String label = ((AClassChild)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AClassChild_type")
-        : getString("_UI_AClassChild_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AClassChild_type") : getString("_UI_AClassChild_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
index f6d68c69b0..a0c00719e3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
@@ -33,8 +33,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AClassItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AClassItemProvider extends ABasicClassItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,11 +74,9 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
    */
   protected void addSubClassesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClass_subClasses_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClass_subClasses_feature", "_UI_AClass_type"),
-            AcorePackage.Literals.ACLASS__SUB_CLASSES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClass_subClasses_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AClass_subClasses_feature", "_UI_AClass_type"),
+        AcorePackage.Literals.ACLASS__SUB_CLASSES, true, false, true, null, null, null));
   }
 
   /**
@@ -89,12 +87,10 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
    */
   protected void addImplementedInterfacesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClass_implementedInterfaces_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClass_implementedInterfaces_feature",
-                "_UI_AClass_type"),
-            AcorePackage.Literals.ACLASS__IMPLEMENTED_INTERFACES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClass_implementedInterfaces_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_AClass_implementedInterfaces_feature", "_UI_AClass_type"),
+        AcorePackage.Literals.ACLASS__IMPLEMENTED_INTERFACES, true, false, true, null, null, null));
   }
 
   /**
@@ -104,11 +100,9 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
    */
   protected void addAssociationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClass_associations_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClass_associations_feature", "_UI_AClass_type"),
-            AcorePackage.Literals.ACLASS__ASSOCIATIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClass_associations_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AClass_associations_feature", "_UI_AClass_type"),
+        AcorePackage.Literals.ACLASS__ASSOCIATIONS, true, false, true, null, null, null));
   }
 
   /**
@@ -118,11 +112,9 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
    */
   protected void addCompositionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClass_compositions_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClass_compositions_feature", "_UI_AClass_type"),
-            AcorePackage.Literals.ACLASS__COMPOSITIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClass_compositions_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AClass_compositions_feature", "_UI_AClass_type"),
+        AcorePackage.Literals.ACLASS__COMPOSITIONS, true, false, true, null, null, null));
   }
 
   /**
@@ -132,11 +124,9 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
    */
   protected void addAggregationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AClass_aggregations_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AClass_aggregations_feature", "_UI_AClass_type"),
-            AcorePackage.Literals.ACLASS__AGGREGATIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AClass_aggregations_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AClass_aggregations_feature", "_UI_AClass_type"),
+        AcorePackage.Literals.ACLASS__AGGREGATIONS, true, false, true, null, null, null));
   }
 
   /**
@@ -159,8 +149,7 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
   public String getText(Object object)
   {
     String label = ((AClass)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AClass_type")
-        : getString("_UI_AClass_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AClass_type") : getString("_UI_AClass_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
index af0a98128f..ff5d30672d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class ACoreRootItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ACoreRoot_title_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ACoreRoot_title_feature", "_UI_ACoreRoot_type"),
-            AcorePackage.Literals.ACORE_ROOT__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ACoreRoot_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ACoreRoot_title_feature", "_UI_ACoreRoot_type"),
+        AcorePackage.Literals.ACORE_ROOT__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -138,8 +135,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
   public String getText(Object object)
   {
     String label = ((ACoreRoot)object).getTitle();
-    return label == null || label.length() == 0 ? getString("_UI_ACoreRoot_type")
-        : getString("_UI_ACoreRoot_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_ACoreRoot_type") : getString("_UI_ACoreRoot_type") + " " + label;
   }
 
   /**
@@ -177,11 +173,9 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors
-        .add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__CLASSES, AcoreFactory.eINSTANCE.createAClass()));
+    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__CLASSES, AcoreFactory.eINSTANCE.createAClass()));
 
-    newChildDescriptors.add(
-        createChildParameter(AcorePackage.Literals.ACORE_ROOT__INTERFACES, AcoreFactory.eINSTANCE.createAInterface()));
+    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__INTERFACES, AcoreFactory.eINSTANCE.createAInterface()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
index f6a54a60e3..1edf760782 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
@@ -31,8 +31,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AInterfaceItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AInterfaceItemProvider extends ABasicClassItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -80,8 +80,7 @@ public class AInterfaceItemProvider extends ABasicClassItemProvider implements I
   public String getText(Object object)
   {
     String label = ((AInterface)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AInterface_type")
-        : getString("_UI_AInterface_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AInterface_type") : getString("_UI_AInterface_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
index cda4c93da7..f1bbbfaa15 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
@@ -35,8 +35,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AOperationItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AOperationItemProvider extends AClassChildItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -117,8 +117,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
   public String getText(Object object)
   {
     String label = ((AOperation)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AOperation_type")
-        : getString("_UI_AOperation_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AOperation_type") : getString("_UI_AOperation_type") + " " + label;
   }
 
   /**
@@ -152,8 +151,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(AcorePackage.Literals.AOPERATION__PARAMETERS, AcoreFactory.eINSTANCE.createAParameter()));
+    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.AOPERATION__PARAMETERS, AcoreFactory.eINSTANCE.createAParameter()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
index 350725c9ff..296c18d40b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class AParameterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class AParameterItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -75,12 +75,9 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AParameter_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AParameter_name_feature", "_UI_AParameter_type"),
-            AcorePackage.Literals.APARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AParameter_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AParameter_name_feature", "_UI_AParameter_type"),
+        AcorePackage.Literals.APARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -90,12 +87,9 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addTypePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_AParameter_type_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AParameter_type_feature", "_UI_AParameter_type"),
-            AcorePackage.Literals.APARAMETER__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_AParameter_type_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AParameter_type_feature", "_UI_AParameter_type"),
+        AcorePackage.Literals.APARAMETER__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -118,8 +112,7 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
   public String getText(Object object)
   {
     String label = ((AParameter)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AParameter_type")
-        : getString("_UI_AParameter_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AParameter_type") : getString("_UI_AParameter_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
index 69afc32bd6..a532e039b5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
@@ -39,8 +39,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
index b6090d0979..f74fbe3967 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
index 7844bad1e5..221275edd3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
@@ -98,16 +98,13 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
       return;
     }
 
-    selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
-        ((DawnEditorInput)getEditorInput()).getResource()));
-    selectionViewer
-        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+    selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory, ((DawnEditorInput)getEditorInput()).getResource()));
+    selectionViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     treeViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     tableViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
-    treeViewerWithColumns
-        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+    treeViewerWithColumns.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
 
     CDOResource resource = ((DawnEditorInput)getEditorInput()).getResource();
 
@@ -126,8 +123,7 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
     {
       if (view.hasConflict())
       {
-        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict",
-            "Your Resource is in conflict and cannot be committed");
+        MessageDialog.openError(Display.getDefault().getActiveShell(), "conflict", "Your Resource is in conflict and cannot be committed");
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
index f382c94132..6a37a8c568 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
@@ -49,8 +49,7 @@ public class DawnAcoreModelWizard extends AcoreModelWizard implements INewWizard
   public DawnAcoreModelWizard()
   {
     super();
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOSession session = CDOConnectionUtil.instance.openSession();
     view = CDOConnectionUtil.instance.openView(session);
   }
@@ -63,8 +62,7 @@ public class DawnAcoreModelWizard extends AcoreModelWizard implements INewWizard
 
     initialObjectCreationPage = new AcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
@@ -87,8 +85,7 @@ public class DawnAcoreModelWizard extends AcoreModelWizard implements INewWizard
 
             URI resourceURI = newResourceCreationPage.getURI();
 
-            CDOTransaction transaction = CDOConnectionUtil.instance.openCurrentTransaction(resourceSet,
-                resourceURI.toString());
+            CDOTransaction transaction = CDOConnectionUtil.instance.openCurrentTransaction(resourceSet, resourceURI.toString());
 
             resource = transaction.getOrCreateResource(resourceURI.path());
 
@@ -142,8 +139,7 @@ public class DawnAcoreModelWizard extends AcoreModelWizard implements INewWizard
     }
     catch (PartInitException exception)
     {
-      MessageDialog.openError(workbenchWindow.getShell(),
-          AcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+      MessageDialog.openError(workbenchWindow.getShell(), AcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
       throw new RuntimeException(exception);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/.settings/org.eclipse.jdt.core.prefs
index b6090d0979..f74fbe3967 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
index 3100bf986e..d07f312086 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
@@ -70,8 +70,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    *
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      AcoreEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(AcoreEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -93,8 +92,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    *
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      AcoreEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(AcoreEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -352,8 +350,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    *
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
index 76d1d6090d..1c8be8cbfb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
@@ -134,8 +134,7 @@ import java.util.Map;
  *
  * @generated
  */
-public class AcoreEditor extends MultiPageEditorPart
-    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
+public class AcoreEditor extends MultiPageEditorPart 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 --> <!--
@@ -447,11 +446,9 @@ public class AcoreEditor extends MultiPageEditorPart
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -615,8 +612,8 @@ public class AcoreEditor extends MultiPageEditorPart
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.dawn.examples.acore.editor",
-          0, null, new Object[] { editingDomain.getResourceSet() });
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0, null,
+          new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
         if (childDiagnostic.getSeverity() != Diagnostic.OK)
@@ -677,8 +674,7 @@ public class AcoreEditor extends MultiPageEditorPart
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -1003,10 +999,8 @@ public class AcoreEditor extends MultiPageEditorPart
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1065,8 +1059,7 @@ public class AcoreEditor extends MultiPageEditorPart
 
         selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
         selectionViewer.setInput(editingDomain.getResourceSet());
-        selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)),
-            true);
+        selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
         viewerPane.setTitle(editingDomain.getResourceSet());
 
         new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
@@ -1412,14 +1405,12 @@ public class AcoreEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1568,8 +1559,7 @@ public class AcoreEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1680,8 +1670,8 @@ public class AcoreEditor extends MultiPageEditorPart
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1803,8 +1793,8 @@ public class AcoreEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
index 3a3d9c2911..7aaf8e90ea 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
@@ -81,16 +81,16 @@ public class AcoreModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(
-      Arrays.asList(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = AcoreEditorPlugin.INSTANCE
-      .getString("_UI_AcoreEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameExtensions").replaceAll("\\s*,\\s*",
+      ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -152,8 +152,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(
-        ExtendedImageRegistry.INSTANCE.getImageDescriptor(AcoreEditorPlugin.INSTANCE.getImage("full/wizban/NewAcore")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(AcoreEditorPlugin.INSTANCE.getImage("full/wizban/NewAcore")));
   }
 
   /**
@@ -278,13 +277,11 @@ public class AcoreModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            AcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(), AcoreEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -571,8 +568,8 @@ public class AcoreModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            AcoreEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(AcoreEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -594,8 +591,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     newFileCreationPage = new AcoreModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
     newFileCreationPage.setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_description"));
-    newFileCreationPage.setFileName(
-        AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setFileName(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -638,8 +634,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new AcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/.settings/org.eclipse.jdt.core.prefs
index b6090d0979..f74fbe3967 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
index e6be8572b8..1666bd92b8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.300"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.400"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
index f9477cfc96..8e26b50018 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
@@ -51,7 +51,6 @@ public class AcoreDiagramTypeProvider extends AbstractDiagramTypeProvider
   public void init(Diagram diagram, IDiagramBehavior diagramEditor)
   {
     super.init(diagram, diagramEditor);
-    DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(),
-        getDiagramBehavior().getEditingDomain());
+    DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(), getDiagramBehavior().getEditingDomain());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
index 706a44a14e..45cced87c5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
@@ -79,9 +79,8 @@ public class AcoreFeatureProvider extends DefaultFeatureProvider
   @Override
   public ICreateConnectionFeature[] getCreateConnectionFeatures()
   {
-    return new ICreateConnectionFeature[] { new AcoreCreateSubclassFeature(this),
-        new AcoreCreateImplementationFeature(this), new AcoreCreateAssociationFeature(this),
-        new AcoreCreateAggregationFeature(this), new AcoreCreateCompositionsFeature(this) };
+    return new ICreateConnectionFeature[] { new AcoreCreateSubclassFeature(this), new AcoreCreateImplementationFeature(this),
+        new AcoreCreateAssociationFeature(this), new AcoreCreateAggregationFeature(this), new AcoreCreateCompositionsFeature(this) };
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
index 56797090ad..7c9093c7b8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
@@ -63,14 +63,13 @@ public abstract class AcoreBasicAddElementFeature extends AbstractAddShapeFeatur
 
     addToResourceIfNeeded(addedClass);
 
-    ContainerShape containerShape = createContainerShape(context, addedClass, targetDiagram, peCreateService, width,
-        height, gaService);
+    ContainerShape containerShape = createContainerShape(context, addedClass, targetDiagram, peCreateService, width, height, gaService);
 
     return containerShape;
   }
 
-  private ContainerShape createContainerShape(IAddContext context, ABasicClass addedClass, Diagram targetDiagram,
-      IPeCreateService peCreateService, int width, int height, IGaService gaService)
+  private ContainerShape createContainerShape(IAddContext context, ABasicClass addedClass, Diagram targetDiagram, IPeCreateService peCreateService, int width,
+      int height, IGaService gaService)
   {
     ContainerShape containerShape = peCreateService.createContainerShape(targetDiagram, true);
     // create and set graphics algorithm
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
index 9d156dbf23..ff21dc1251 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
@@ -69,8 +69,7 @@ public class AcoreUpdateAClassFeature extends AbstractUpdateFeature
     }
 
     // update needed, if names are different
-    boolean updateNameNeeded = pictogramName == null && businessName != null
-        || pictogramName != null && !pictogramName.equals(businessName);
+    boolean updateNameNeeded = pictogramName == null && businessName != null || pictogramName != null && !pictogramName.equals(businessName);
     if (updateNameNeeded)
     {
       return Reason.createTrueReason("Name is out of date");
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/.settings/org.eclipse.jdt.core.prefs
index b6090d0979..f74fbe3967 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
index 89855b6d6c..6493385f97 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.400",
- org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.400"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.500",
+ org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
index aeaa53ad90..a35c00b538 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
@@ -46,8 +46,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
   {
     try
     {
-      AcoreFactory theAcoreFactory = (AcoreFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore");
+      AcoreFactory theAcoreFactory = (AcoreFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore");
       if (theAcoreFactory != null)
       {
         return theAcoreFactory;
@@ -237,8 +236,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
     AccessType result = AccessType.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
index 4b7afc6a92..3b6245e539 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
@@ -153,8 +153,8 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
     }
 
     // Obtain or create and register package
-    AcorePackageImpl theAcorePackage = (AcorePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof AcorePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AcorePackageImpl());
+    AcorePackageImpl theAcorePackage = (AcorePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AcorePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AcorePackageImpl());
 
     isInited = true;
 
@@ -552,70 +552,54 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
     // Initialize classes and features; add operations and parameters
     initEClass(aClassEClass, AClass.class, "AClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAClass_SubClasses(), getAClass(), null, "subClasses", null, 0, -1, AClass.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getAClass_ImplementedInterfaces(), getAInterface(), null, "implementedInterfaces", null, 0, -1,
-        AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Associations(), getAClass(), null, "associations", null, 0, -1, AClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Compositions(), getAClass(), null, "compositions", null, 0, -1, AClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Aggregations(), getAClass(), null, "aggregations", null, 0, -1, AClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aInterfaceEClass, AInterface.class, "AInterface", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getAClass_SubClasses(), getAClass(), null, "subClasses", null, 0, -1, AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAClass_ImplementedInterfaces(), getAInterface(), null, "implementedInterfaces", null, 0, -1, AClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAClass_Associations(), getAClass(), null, "associations", null, 0, -1, AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAClass_Compositions(), getAClass(), null, "compositions", null, 0, -1, AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAClass_Aggregations(), getAClass(), null, "aggregations", null, 0, -1, AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(aInterfaceEClass, AInterface.class, "AInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(aCoreRootEClass, ACoreRoot.class, "ACoreRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getACoreRoot_Title(), ecorePackage.getEString(), "title", null, 0, 1, ACoreRoot.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getACoreRoot_Classes(), getAClass(), null, "classes", null, 0, -1, ACoreRoot.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getACoreRoot_Interfaces(), getAInterface(), null, "interfaces", null, 0, -1, ACoreRoot.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aAttributeEClass, AAttribute.class, "AAttribute", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(aOperationEClass, AOperation.class, "AOperation", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAOperation_Parameters(), getAParameter(), null, "parameters", null, 0, -1, AOperation.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aBasicClassEClass, ABasicClass.class, "ABasicClass", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getABasicClass_Operations(), getAOperation(), null, "operations", null, 0, -1, ABasicClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getABasicClass_Attributes(), getAAttribute(), null, "attributes", null, 0, -1, ABasicClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getABasicClass_Name(), ecorePackage.getEString(), "name", null, 0, 1, ABasicClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aParameterEClass, AParameter.class, "AParameter", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, AParameter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1, AParameter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aClassChildEClass, AClassChild.class, "AClassChild", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAClassChild_Name(), ecorePackage.getEString(), "name", "", 0, 1, AClassChild.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAClassChild_Accessright(), getAccessType(), "accessright", "public", 0, 1, AClassChild.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAClassChild_DataType(), ecorePackage.getEString(), "dataType", null, 0, 1, AClassChild.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getACoreRoot_Title(), ecorePackage.getEString(), "title", null, 0, 1, ACoreRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getACoreRoot_Classes(), getAClass(), null, "classes", null, 0, -1, ACoreRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getACoreRoot_Interfaces(), getAInterface(), null, "interfaces", null, 0, -1, ACoreRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(aAttributeEClass, AAttribute.class, "AAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(aOperationEClass, AOperation.class, "AOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getAOperation_Parameters(), getAParameter(), null, "parameters", null, 0, -1, AOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(aBasicClassEClass, ABasicClass.class, "ABasicClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getABasicClass_Operations(), getAOperation(), null, "operations", null, 0, -1, ABasicClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getABasicClass_Attributes(), getAAttribute(), null, "attributes", null, 0, -1, ABasicClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getABasicClass_Name(), ecorePackage.getEString(), "name", null, 0, 1, ABasicClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(aParameterEClass, AParameter.class, "AParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, AParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1, AParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(aClassChildEClass, AClassChild.class, "AClassChild", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAClassChild_Name(), ecorePackage.getEString(), "name", "", 0, 1, AClassChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAClassChild_Accessright(), getAccessType(), "accessright", "public", 0, 1, AClassChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAClassChild_DataType(), ecorePackage.getEString(), "dataType", null, 0, 1, AClassChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(accessTypeEEnum, AccessType.class, "AccessType");
@@ -625,8 +609,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
     addEEnumLiteral(accessTypeEEnum, AccessType.PACKAGE);
 
     // Initialize data types
-    initEDataType(accessTypeObjectEDataType, AccessType.class, "AccessTypeObject", IS_SERIALIZABLE,
-        IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(accessTypeObjectEDataType, AccessType.class, "AccessTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS);
 
     // Create resource
     createResource(eNS_URI);
@@ -646,8 +629,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
   {
     String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
     addAnnotation(accessTypeEEnum, source, new String[] { "name", "AccessType" });
-    addAnnotation(accessTypeObjectEDataType, source,
-        new String[] { "name", "AccessType:Object", "baseType", "AccessType" });
+    addAnnotation(accessTypeObjectEDataType, source, new String[] { "name", "AccessType:Object", "baseType", "AccessType" });
   }
 
 } // AcorePackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
index 6c7f4f358a..ff1c353aaa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
@@ -368,7 +368,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
index 4d66567fd6..168994ce92 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
@@ -99,8 +99,7 @@ public class DawnEditPartStylizerRegistry
   {
     try
     {
-      IConfigurationElement[] config = Platform.getExtensionRegistry()
-          .getConfigurationElementsFor(DAWN_STYLIZER_EXTENSION_POINT_ID);
+      IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(DAWN_STYLIZER_EXTENSION_POINT_ID);
       for (IConfigurationElement e : config)
       {
         if (editPart.getClass().getCanonicalName().equals(e.getAttribute("editpart")))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java
index a0303b0b69..38306889f3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicConnectionEditPartStylizerImpl.java
@@ -69,8 +69,7 @@ public class DawnBasicConnectionEditPartStylizerImpl extends DawnEditPartStylize
         PackageUtil.getID(NotationPackage.eINSTANCE.getLineStyle_LineColor()), FigureUtilities.colorToInteger(color));
     final Command command = editPart.getCommand(request);
 
-    AbstractEMFOperation operation = new AbstractEMFOperation(((IGraphicalEditPart)editPart).getEditingDomain(),
-        StringStatics.BLANK, null)
+    AbstractEMFOperation operation = new AbstractEMFOperation(((IGraphicalEditPart)editPart).getEditingDomain(), StringStatics.BLANK, null)
     {
       @Override
       protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java
index 958a6b57b1..ca6a3ab7a6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicGraphicalEditPartStylizerImpl.java
@@ -52,8 +52,7 @@ public class DawnBasicGraphicalEditPartStylizerImpl extends DawnEditPartStylizer
   @Override
   public void setLocked(EditPart editPart, int type)
   {
-    setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_REMOTELY),
-        DawnAppearancer.DEFAULT_BORDER_THICKNESS);
+    setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_REMOTELY), DawnAppearancer.DEFAULT_BORDER_THICKNESS);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java
index 4fe9deb036..ae31a9e743 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/impl/DawnBasicNodeEditPartStylizerImpl.java
@@ -41,14 +41,12 @@ public class DawnBasicNodeEditPartStylizerImpl extends DawnBasicGraphicalEditPar
     {
     case DawnAppearancer.TYPE_LOCKED_GLOBALLY:
     {
-      setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_REMOTELY),
-          DawnAppearancer.DEFAULT_BORDER_THICKNESS);
+      setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_REMOTELY), DawnAppearancer.DEFAULT_BORDER_THICKNESS);
       break;
     }
     case DawnAppearancer.TYPE_LOCKED_LOCALLY:
     {
-      setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_LOCALLY),
-          DawnAppearancer.DEFAULT_BORDER_THICKNESS);
+      setBorder(editPart, getBackgroundColor(editPart, DawnState.LOCKED_LOCALLY), DawnAppearancer.DEFAULT_BORDER_THICKNESS);
       break;
     }
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
index c05859c71e..85873a194e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
@@ -170,8 +170,7 @@ public class DawnGMFHandler extends BasicDawnTransactionHandler
           final EObject view = CDOUtil.getEObject(obj);
           if (view instanceof Edge)
           {
-            EditingDomain editingDomain = ((IEditingDomainProvider)view.eResource().getResourceSet())
-                .getEditingDomain();
+            EditingDomain editingDomain = ((IEditingDomainProvider)view.eResource().getResourceSet()).getEditingDomain();
             editingDomain.getCommandStack().execute(new RecordingCommand((TransactionalEditingDomain)editingDomain)
             {
               @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
index 3b462bcdb2..6475617529 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
@@ -102,8 +102,7 @@ public class DawnChangeHelper
    */
   public static EditPart createNode(final Node node, IElementType elementType, DiagramEditPart diagramEP)
   {
-    CreateViewRequest createViewRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType,
-        diagramEP.getDiagramPreferencesHint());
+    CreateViewRequest createViewRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, diagramEP.getDiagramPreferencesHint());
 
     Bounds bounds = (Bounds)node.getLayoutConstraint();
 
@@ -131,8 +130,8 @@ public class DawnChangeHelper
     CreateElementRequest request = new CreateElementRequest(elementType);
     CreateElementRequestAdapter createElementRequestAdapter = new CreateElementRequestAdapter(request);
 
-    ViewAndElementDescriptor viewAndElementDescriptor = new ViewAndElementDescriptor(createElementRequestAdapter,
-        Node.class, ((IHintedType)elementType).getSemanticHint(),
+    ViewAndElementDescriptor viewAndElementDescriptor = new ViewAndElementDescriptor(createElementRequestAdapter, Node.class,
+        ((IHintedType)elementType).getSemanticHint(),
 
         parentEditpart.getDiagramPreferencesHint());
 
@@ -162,8 +161,7 @@ public class DawnChangeHelper
   {
     DiagramEditPart diagramEP = diagramEditor.getDiagramEditPart();
 
-    CreateViewRequest createViewRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType,
-        diagramEP.getDiagramPreferencesHint());
+    CreateViewRequest createViewRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, diagramEP.getDiagramPreferencesHint());
 
     createViewRequest.setLocation(p);
     diagramEP.performRequest(createViewRequest);
@@ -181,11 +179,9 @@ public class DawnChangeHelper
    * @param object
    * @param dawnDiagramEditor
    ********************************************************************************************************************/
-  public static void setProperty(EditPart editPart, String name, String packageUtilPropertyID, Object object,
-      DiagramDocumentEditor dawnDiagramEditor)
+  public static void setProperty(EditPart editPart, String name, String packageUtilPropertyID, Object object, DiagramDocumentEditor dawnDiagramEditor)
   {
-    SetPropertyCommand setPropertyCommand = new SetPropertyCommand(dawnDiagramEditor.getEditingDomain(), editPart,
-        packageUtilPropertyID, name, object);
+    SetPropertyCommand setPropertyCommand = new SetPropertyCommand(dawnDiagramEditor.getEditingDomain(), editPart, packageUtilPropertyID, name, object);
 
     DiagramEditPart diagramEP = dawnDiagramEditor.getDiagramEditPart();
 
@@ -202,8 +198,7 @@ public class DawnChangeHelper
    ********************************************************************************************************************/
   public static void resizeEditPart(EditPart editpart, Dimension d)
   {
-    boolean editModeEnabled = ((org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart)editpart)
-        .isEditModeEnabled();
+    boolean editModeEnabled = ((org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart)editpart).isEditModeEnabled();
     if (!editModeEnabled)
     {
       ((org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart)editpart).enableEditMode();
@@ -354,8 +349,7 @@ public class DawnChangeHelper
     EObject referenceObject = ViewUtil.resolveSemanticElement(edge.getTarget());
     EObject container = ViewUtil.resolveSemanticElement(edge.getSource());
     EditPart parentEditpart = DawnDiagramUpdater.findEditPart(edge, editor.getDiagramEditPart().getViewer());
-    DestroyReferenceRequest destroyReferenceRequest = new DestroyReferenceRequest(editor.getEditingDomain(), container,
-        null, referenceObject, false);
+    DestroyReferenceRequest destroyReferenceRequest = new DestroyReferenceRequest(editor.getEditingDomain(), container, null, referenceObject, false);
     Request req = new EditCommandRequestWrapper(destroyReferenceRequest);
 
     Command command = parentEditpart.getCommand(req);
@@ -372,27 +366,24 @@ public class DawnChangeHelper
    * @param root
    * @return the newly created EditPart
    ********************************************************************************************************************/
-  public static EditPart createEdge(Edge oldEdge, EditPart sourceEditPart, EditPart targetEditPart,
-      IElementType elementType, final DiagramEditPart root)
+  public static EditPart createEdge(Edge oldEdge, EditPart sourceEditPart, EditPart targetEditPart, IElementType elementType, final DiagramEditPart root)
   {
     if (TRACER.isEnabled())
     {
       TRACER.format("Creaeting Edge from old edge {0} ", oldEdge); //$NON-NLS-1$
     }
 
-    CreateConnectionViewAndElementRequest req = new CreateConnectionViewAndElementRequest(elementType,
-        ((IHintedType)elementType).getSemanticHint(), root.getDiagramPreferencesHint());
+    CreateConnectionViewAndElementRequest req = new CreateConnectionViewAndElementRequest(elementType, ((IHintedType)elementType).getSemanticHint(),
+        root.getDiagramPreferencesHint());
 
-    ICommand createConnectionCmd = new DeferredCreateConnectionViewAndElementCommand(req,
-        new EObjectAdapter((EObject)sourceEditPart.getModel()), new EObjectAdapter((EObject)targetEditPart.getModel()),
-        root.getViewer());
+    ICommand createConnectionCmd = new DeferredCreateConnectionViewAndElementCommand(req, new EObjectAdapter((EObject)sourceEditPart.getModel()),
+        new EObjectAdapter((EObject)targetEditPart.getModel()), root.getViewer());
 
     root.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(createConnectionCmd));
 
     final EditPartViewer viewer = root.getViewer();
 
-    final EditPart ret = (EditPart)viewer.getEditPartRegistry()
-        .get(((ConnectionViewAndElementDescriptor)req.getNewObject()).getAdapter(View.class));
+    final EditPart ret = (EditPart)viewer.getEditPartRegistry().get(((ConnectionViewAndElementDescriptor)req.getNewObject()).getAdapter(View.class));
 
     if (ret != null)
     {
@@ -408,8 +399,7 @@ public class DawnChangeHelper
    * @param oldEdge
    * @param root
    ********************************************************************************************************************/
-  public static void setAnchorsAndBendPoints(final EditPart edgeEditpart, final Edge oldEdge,
-      final DiagramEditPart root)
+  public static void setAnchorsAndBendPoints(final EditPart edgeEditpart, final Edge oldEdge, final DiagramEditPart root)
   {
     TransactionalEditingDomain domain = root.getEditingDomain();// getEditingDomain();
     domain.getCommandStack().execute(new RecordingCommand(domain)
@@ -575,11 +565,9 @@ public class DawnChangeHelper
    * @param object
    * @param dawnDiagramEditor
    ********************************************************************************************************************/
-  public static void setProperty(EditPart editPart, String name, EAttribute attribute, Object object,
-      DiagramDocumentEditor dawnDiagramEditor)
+  public static void setProperty(EditPart editPart, String name, EAttribute attribute, Object object, DiagramDocumentEditor dawnDiagramEditor)
   {
-    SetPropertyCommand setPropertyCommand = new SetPropertyCommand(dawnDiagramEditor.getEditingDomain(), editPart,
-        PackageUtil.getID(attribute), name, object);
+    SetPropertyCommand setPropertyCommand = new SetPropertyCommand(dawnDiagramEditor.getEditingDomain(), editPart, PackageUtil.getID(attribute), name, object);
     DiagramEditPart diagramEP = dawnDiagramEditor.getDiagramEditPart();
 
     diagramEP.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(setPropertyCommand));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
index 5fadbb52f1..7c4f1ab225 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
@@ -102,8 +102,7 @@ public class DawnDiagramUpdater
       protected void doExecute()
       {
         // ((ExamplediagramDocumentProvider)getDocumentProvider()).changed(getEditorInput());
-        ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService()
-            .getSelection();
+        ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
         if (selection instanceof IStructuredSelection)
         {
           IStructuredSelection structuredSelection = (IStructuredSelection)selection;
@@ -111,8 +110,7 @@ public class DawnDiagramUpdater
           {
             return;
           }
-          if (structuredSelection.getFirstElement() instanceof EditPart
-              && ((EditPart)structuredSelection.getFirstElement()).getModel() instanceof View)
+          if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart)structuredSelection.getFirstElement()).getModel() instanceof View)
           {
             EObject modelElement = ((View)((EditPart)structuredSelection.getFirstElement()).getModel()).getElement();
             List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
@@ -389,8 +387,7 @@ public class DawnDiagramUpdater
     ECrossReferenceAdapter crossreferenceAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(element);
     if (crossreferenceAdapter != null)
     {
-      Collection<EStructuralFeature.Setting> iinverseReferences = crossreferenceAdapter
-          .getNonNavigableInverseReferences(element);
+      Collection<EStructuralFeature.Setting> iinverseReferences = crossreferenceAdapter.getNonNavigableInverseReferences(element);
 
       for (EStructuralFeature.Setting f : iinverseReferences)
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
index e99ad9b8cf..5fd4d93aa7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
@@ -581,9 +581,8 @@ public class DawnResourceHelper
 
     if (!leftObject.eClass().equals(rightObject.eClass()))
     {
-      throw new EClassIncompatibleException(
-          leftObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")" + "/"
-              + rightObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")");
+      throw new EClassIncompatibleException(leftObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")" + "/"
+          + rightObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")");
     }
 
     updateEAttributes(leftObject, rightObject);
@@ -607,8 +606,7 @@ public class DawnResourceHelper
           View childViewCopy = (View)createCopyAndInsert(rightChild, leftObject);
           if (childViewElement != null)
           {
-            EObject childElementCopy = getSameEObjectFromOtherResource(childViewElement,
-                (XMLResource)leftObject.eResource());
+            EObject childElementCopy = getSameEObjectFromOtherResource(childViewElement, (XMLResource)leftObject.eResource());
 
             updateEObject(childElementCopy, childViewElement);// not shure whether this is needed here
             childViewCopy.setElement(childElementCopy);
@@ -684,8 +682,7 @@ public class DawnResourceHelper
   }
 
   @SuppressWarnings("unchecked")
-  public static void updateReference(EObject leftParent, EObject rightParent, EReference reference)
-      throws EClassIncompatibleException
+  public static void updateReference(EObject leftParent, EObject rightParent, EReference reference) throws EClassIncompatibleException
   {
 
     if (reference.getName().equals("element"))
@@ -705,8 +702,7 @@ public class DawnResourceHelper
         for (Object o : rightCollection)
         {
           EObject rightCollectionChild = (EObject)o;
-          EObject leftCollectionChild = getSameEObjectFromOtherResource(rightCollectionChild,
-              (XMLResource)leftParent.eResource());
+          EObject leftCollectionChild = getSameEObjectFromOtherResource(rightCollectionChild, (XMLResource)leftParent.eResource());
 
           if (leftCollectionChild == null) // create
           {
@@ -876,8 +872,7 @@ public class DawnResourceHelper
 
     for (EAttribute attribute : o.eClass().getEAllAttributes())
     {
-      print(tabs(level + 1) + "o.eClass.getEAllAttributes.attribute: '" + attribute.getName() + "': "
-          + o.eGet(attribute));
+      print(tabs(level + 1) + "o.eClass.getEAllAttributes.attribute: '" + attribute.getName() + "': " + o.eGet(attribute));
     }
     for (EAnnotation annotation : o.eClass().getEAnnotations())
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
index 45c719ba90..01f1e2b17a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
@@ -40,8 +40,7 @@ public class DawnDiagramEditingDomainFactory extends DiagramEditingDomainFactory
       super(adapterFactory, resourceSet);
     }
 
-    public DawnDiagramEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack,
-        ResourceSet resourceSet)
+    public DawnDiagramEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack, ResourceSet resourceSet)
     {
       super(adapterFactory, stack, resourceSet);
     }
@@ -75,8 +74,7 @@ public class DawnDiagramEditingDomainFactory extends DiagramEditingDomainFactory
     }
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
 
-    TransactionalEditingDomain result = new DawnDiagramEditingDomain(
-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
+    TransactionalEditingDomain result = new DawnDiagramEditingDomain(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
 
     mapResourceSet(result);
 
@@ -89,8 +87,8 @@ public class DawnDiagramEditingDomainFactory extends DiagramEditingDomainFactory
   {
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
 
-    TransactionalEditingDomain result = new DawnDiagramEditingDomain(
-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
+    TransactionalEditingDomain result = new DawnDiagramEditingDomain(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack,
+        rset);
 
     mapResourceSet(result);
     configure(result);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
index ef78445900..1285b9a805 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
@@ -55,8 +55,8 @@ public class DawnGMFEditingDomainFactory extends GMFEditingDomainFactory
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
     stack.setResourceUndoContextPolicy(getResourceUndoContextPolicy());
 
-    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(
-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
+    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
+        stack);
 
     mapResourceSet(result);
     // configures as the GMFEditingDomainFactory would do
@@ -78,8 +78,8 @@ public class DawnGMFEditingDomainFactory extends GMFEditingDomainFactory
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
     stack.setResourceUndoContextPolicy(getResourceUndoContextPolicy());
 
-    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(
-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
+    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
+        stack, rset);
 
     mapResourceSet(result);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
index d08e195284..e13cb7b51c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.graphiti;singleton:=true
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.1.300.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.graphiti.DawnGraphitiUIPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.1.200",
- org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.1.200",
- org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.1.200",
- org.eclipse.emf.cdo.dawn.graphiti.util;version="2.1.200",
- org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.1.200"
+Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.1.300",
+ org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.1.300",
+ org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.1.300",
+ org.eclipse.emf.cdo.dawn.graphiti.util;version="2.1.300",
+ org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.1.300"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
index 01d18c77bc..f4857d1277 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
@@ -198,8 +198,7 @@ public class DawnGraphitiEditorSupport extends DawnAbstractEditorSupport
 
     DiagramEditor editor = (DiagramEditor)getEditor();
 
-    List<PictogramElement> pictogramElements = DawnGraphitiUtil
-        .getPictgramElements(editor.getDiagramTypeProvider().getDiagram(), element);
+    List<PictogramElement> pictogramElements = DawnGraphitiUtil.getPictgramElements(editor.getDiagramTypeProvider().getDiagram(), element);
 
     for (PictogramElement pictogramElement : pictogramElements)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
index aab50c1709..64a4f7bdbd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
@@ -72,8 +72,7 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
 
     EObject element = CDOUtil.getEObject(cdoObject); // either semantic object or notational
 
-    List<PictogramElement> pictgramElements = DawnGraphitiUtil
-        .getPictgramElements(((DiagramEditor)editor).getDiagramTypeProvider().getDiagram(), element);
+    List<PictogramElement> pictgramElements = DawnGraphitiUtil.getPictgramElements(((DiagramEditor)editor).getDiagramTypeProvider().getDiagram(), element);
 
     GraphicalViewer graphicalViewer = ((DiagramEditor)editor).getGraphicalViewer();
 
@@ -130,8 +129,7 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
           final EObject view = CDOUtil.getEObject(obj);
           if (view instanceof Edge)
           {
-            EditingDomain editingDomain = ((IEditingDomainProvider)view.eResource().getResourceSet())
-                .getEditingDomain();
+            EditingDomain editingDomain = ((IEditingDomainProvider)view.eResource().getResourceSet()).getEditingDomain();
             editingDomain.getCommandStack().execute(new RecordingCommand((TransactionalEditingDomain)editingDomain)
             {
               @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
index db5cce12a1..583425e99b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
@@ -40,8 +40,7 @@ public class DawnGraphitiUtil
   public static TransactionalEditingDomain createResourceSetAndEditingDomain()
   {
     // TODO check if this is still needed here
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOConnectionUtil.instance.getCurrentSession();
 
     final ResourceSet resourceSet = new ResourceSetImpl();
@@ -51,8 +50,7 @@ public class DawnGraphitiUtil
         new DefaultOperationHistory());
 
     final TransactionalEditingDomainImpl editingDomain = new DawnTransactionalEditingDomainImpl(
-        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), workspaceCommandStack,
-        resourceSet);
+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), workspaceCommandStack, resourceSet);
     WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(editingDomain);
     return editingDomain;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
index 872d92da2f..e12b7e6fc5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
@@ -64,8 +64,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
   public DawnBasicGraphitiWizard()
   {
     super();
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOSession session = CDOConnectionUtil.instance.openSession();
     view = CDOConnectionUtil.instance.openView(session);
   }
@@ -123,8 +122,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     URI diagramResourceURI = dawnDiagramModelFilePage.getURI();
     URI domainModelResourceURI = dawnDomainModelFilePage.getURI();
 
-    Diagram diagram = Graphiti.getPeCreateService().createDiagram(diagramTypeId, diagramResourceURI.lastSegment(),
-        true);
+    Diagram diagram = Graphiti.getPeCreateService().createDiagram(diagramTypeId, diagramResourceURI.lastSegment(), true);
 
     String editorID = DawnGraphitiDiagramEditor.ID;
 
@@ -135,8 +133,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     Resource diagramResource = createDiagramResource(diagramResourceURI, diagram, editingDomain);
 
     String providerId = GraphitiUi.getExtensionManager().getDiagramTypeProviderId(diagram.getDiagramTypeId());
-    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), providerId,
-        diagramResource);
+    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), providerId, diagramResource);
 
     try
     {
@@ -186,8 +183,7 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     return editingDomain;
   }
 
-  private Resource createDiagramResource(URI diagramResourceURI, final Diagram diagram,
-      final TransactionalEditingDomain editingDomain)
+  private Resource createDiagramResource(URI diagramResourceURI, final Diagram diagram, final TransactionalEditingDomain editingDomain)
   {
     final ResourceSet resourceSet = editingDomain.getResourceSet();
     final Resource resource = createModelResource(diagramResourceURI, resourceSet);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.tests/.settings/org.eclipse.jdt.core.prefs
index aae803439b..a1791191aa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/.settings/org.eclipse.jdt.core.prefs
@@ -358,7 +358,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
index 57030e4627..286190a9b3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
@@ -49,24 +49,20 @@ public abstract class AbstractDawnTest extends AbstractCDOTest
     return dawnResourceSet;
   }
 
-  protected void createCDOResourcesFromXMI(String resourceName, EPackage ePackage, CDOSession session)
-      throws CommitException
+  protected void createCDOResourcesFromXMI(String resourceName, EPackage ePackage, CDOSession session) throws CommitException
   {
     NotationPackage.eINSTANCE.getClass();
     String packageName = ePackage.getName();
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName + "_diagram",
-        new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName + "_diagram", new XMIResourceFactoryImpl());
 
     resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName, new XMIResourceFactoryImpl());
 
     URL resourceURI = GMFTest.class.getResource("");
     String resourcePath = resourceURI.toString().substring(0, resourceURI.toString().lastIndexOf("/bin"));
 
-    Resource emfResource = resourceSet
-        .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true);
-    Resource gmfResource = resourceSet
-        .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true);
+    Resource emfResource = resourceSet.getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true);
+    Resource gmfResource = resourceSet.getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true);
 
     EcoreUtil.resolveAll(emfResource);
     EcoreUtil.resolveAll(gmfResource);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java
index 855057635e..1a68451e52 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java
@@ -110,15 +110,13 @@ public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends Abst
     editor.click(xPosition, yPosition);
   }
 
-  protected void createNodeWithLabel(String type, int xPosition, int yPosition, String labelText, SWTGefBot bot,
-      SWTBotGefEditor editor)
+  protected void createNodeWithLabel(String type, int xPosition, int yPosition, String labelText, SWTGefBot bot, SWTBotGefEditor editor)
   {
     createNode(type, xPosition, yPosition, bot, editor);
     typeTextToFocusedWidget(labelText, bot, true);
   }
 
-  protected void createEdge(String type, int fromXPosition, int fromYPosition, int toXPosition, int toYPosition,
-      SWTBotGefEditor editor)
+  protected void createEdge(String type, int fromXPosition, int fromYPosition, int toXPosition, int toYPosition, SWTBotGefEditor editor)
   {
     editor.activateTool(type);
     editor.drag(fromXPosition, fromYPosition, toXPosition, toYPosition);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
index 14d0cf01a1..346ceb7e7f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
@@ -82,11 +82,9 @@ public class Bugzilla_333291_Test extends AbstractDawnEMFTest
       session.close();
     }
 
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOConnectionUtil.instance.openSession();
-    DawnSWTBotEMFEditor editor = DawnEcoreTestUtil.openEcoreEMFEditor(URI.createURI("cdo://repo1/default.ecore"),
-        getBot());
+    DawnSWTBotEMFEditor editor = DawnEcoreTestUtil.openEcoreEMFEditor(URI.createURI("cdo://repo1/default.ecore"), getBot());
     assertNotNull(editor);
     SWTBotTree tree = editor.getSelectionPageTree();
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
index abb385df42..39835f8b73 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
@@ -71,8 +71,7 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
     assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPartProvider.java").exists());
     assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java").exists());
 
-    basicCompare(
-        new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class) + ".dawn/src/")),
+    basicCompare(new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class) + ".dawn/src/")),
         new File(outputFolder + "/src"));
   }
 
@@ -156,8 +155,7 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
     private static boolean isValid(String line)
     {
       if (line.contains("AcoreDiagramEditorPlugin.getInstance().logInfo") || line.equals("") || line.startsWith("*")
-          || line.equals("import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin;")
-              | line.startsWith("/*")
+          || line.equals("import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin;") | line.startsWith("/*")
           || line.startsWith("//") || line.contains("@"))
       {
         return false;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
index 918d68c071..f6b17c706b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
@@ -245,8 +245,7 @@ public class GMFTest extends AbstractCDOTest
     {
       ResourceSet resourceSet = new ResourceSetImpl();
       AcorePackage.eINSTANCE.eClass();
-      resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore_diagram",
-          new XMIResourceFactoryImpl());
+      resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore_diagram", new XMIResourceFactoryImpl());
 
       resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore", new XMIResourceFactoryImpl());
 
@@ -259,8 +258,7 @@ public class GMFTest extends AbstractCDOTest
       System.out.println(resourcePath);
 
       // Resource emfResource = resourceSet.getResource(URI.createURI(resourcePath + "/testdata/simple.acore"), true);
-      Resource gmfResource = resourceSet.getResource(URI.createURI(resourcePath + "/testdata/simple.acore_diagram"),
-          true);
+      Resource gmfResource = resourceSet.getResource(URI.createURI(resourcePath + "/testdata/simple.acore_diagram"), true);
 
       Diagram diagram = (Diagram)gmfResource.getContents().get(0);
       ACoreRoot classDiagram = (ACoreRoot)diagram.getElement();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
index 5976b55205..b35982b295 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
@@ -42,8 +42,7 @@ public class TestFrameworkTest extends AbstractDawnTest
     CDOResource semanticResource = transaction.getResource("/simple.acore");
 
     assertInstanceOf(CDOResource.class, semanticResource);
-    CDOResource notationalResource = (CDOResource)resourceSet
-        .getResource(URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource();
+    CDOResource notationalResource = (CDOResource)resourceSet.getResource(URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource();
     assertInstanceOf(CDOResource.class, notationalResource);
     ACoreRoot acoreRoot = (ACoreRoot)semanticResource.getContents().get(0);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
index 23f28d463b..47f0780aab 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
@@ -77,8 +77,7 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot>
 
     sleep(10000);
 
-    IProject fragment = ResourcesPlugin.getWorkspace().getRoot()
-        .getProject("org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn");
+    IProject fragment = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn");
 
     assertNotNull(fragment);
     String diagramFolder = "src/org/eclipse/emf/cdo/dawn/examples/acore/diagram";
@@ -86,26 +85,17 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot>
     assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/fragment.xml"));
     assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, "/build.properties"));
 
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java"));
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnACoreRootEditPart.java"));
-    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment,
-        diagramFolder + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java"));
-
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreCreationWizard.java"));
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java"));
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditorUtil.java"));
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDocumentProvider.java"));
-
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPartProvider.java"));
-    assertEquals(true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnACoreRootEditPart.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java"));
+
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreCreationWizard.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditorUtil.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDocumentProvider.java"));
+
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPartProvider.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java"));
     deleteProject("org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn");
     sleep(2000);
   }
@@ -121,8 +111,7 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot>
     SWTBotTreeItem gmfgen = modelFolder.expandNode("acore.genmodel");
     gmfgen.contextMenu("Generate Dawn GenModel").click();
 
-    IProject rootProject = ResourcesPlugin.getWorkspace().getRoot()
-        .getProject("org.eclipse.emf.cdo.dawn.examples.acore");
+    IProject rootProject = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.emf.cdo.dawn.examples.acore");
 
     waitUntilExists(rootProject, "model/acore.dawngenmodel", 10000);
 
@@ -140,8 +129,7 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot>
     assertNotNull(modelFolder.getNode("acore.dawngenmodel"));
     assertNotNull(modelFolder.getNode("acore.dawngenmodel_emf"));
 
-    IProject fragment = ResourcesPlugin.getWorkspace().getRoot()
-        .getProject("org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn");
+    IProject fragment = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn");
 
     assertNotNull(fragment);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnBasicEMFUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnBasicEMFUITest.java
index 9ec4f0820d..fde900cdda 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnBasicEMFUITest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnBasicEMFUITest.java
@@ -92,8 +92,8 @@ public class DawnBasicEMFUITest extends AbstractCDOTest
 
     // TODO Test case fails because the ConnectionUtil is not initialized. Fake it here or use the DawnExplorer to open
     // the editor.
-    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()
-        .getPage().openEditor(editorInput, editorID);
+    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage().openEditor(editorInput,
+        editorID);
 
     sleep(5000);
     assertInstanceOf(DawnAcoreEditor.class, editor);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
index 8f002834c9..67b9ca3837 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
@@ -73,11 +73,9 @@ public class DawnEMFHandleEditorTest extends AbstractDawnEMFTest
       transaction.close();
       session.close();
     }
-    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-        PreferenceConstants.getServerName());
+    CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
     CDOConnectionUtil.instance.openSession();
-    DawnSWTBotEMFEditor editor = DawnAcoreTestUtil.openAcoreEMFEditor(URI.createURI("cdo://repo1/default.acore"),
-        getBot());
+    DawnSWTBotEMFEditor editor = DawnAcoreTestUtil.openAcoreEMFEditor(URI.createURI("cdo://repo1/default.acore"), getBot());
     assertNotNull(editor);
     SWTBotTree tree = editor.getSelectionPageTree();
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
index 71e450d99f..19ce60681a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
@@ -70,8 +70,8 @@ public class DawnBasicGMFUITest extends AbstractCDOTest
   public void testOpenEditor() throws PartInitException
   {
     final CDOSession session = openSession();
-    DawnAcoreDiagramEditorUtil.createDiagram(URI.createURI("dawn://repo1//test.acore_diagram"),
-        URI.createURI("cdo://repo1/test.acore"), new NullProgressMonitor());
+    DawnAcoreDiagramEditorUtil.createDiagram(URI.createURI("dawn://repo1//test.acore_diagram"), URI.createURI("cdo://repo1/test.acore"),
+        new NullProgressMonitor());
 
     CDOTransaction transaction = session.openTransaction();
     CDOResource resource = transaction.createResource("/test.acore_diagram");
@@ -81,8 +81,8 @@ public class DawnBasicGMFUITest extends AbstractCDOTest
 
     DawnEditorInput editorInput = new DawnEditorInput(resource.getURI());
 
-    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite()
-        .getPage().openEditor(editorInput, editorID);
+    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage().openEditor(editorInput,
+        editorID);
 
     assertInstanceOf(DawnAcoreDiagramEditor.class, editor);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
index 1d1b59ab9b..c8fc6d1e5c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardTest.java
@@ -83,8 +83,7 @@ public class DawnCreationWizardTest extends AbstractCDOTest
     IWizardPage[] pages = creationWizard.getPages();
 
     DawnCreateNewDiagramResourceWizardPage dawnDiagramModelFilePage = (DawnCreateNewDiagramResourceWizardPage)pages[0];
-    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage
-        .getNextPage();
+    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage.getNextPage();
 
     dawnDomainModelFilePage.setVisible(true);
 
@@ -115,8 +114,7 @@ public class DawnCreationWizardTest extends AbstractCDOTest
     IWizardPage[] pages = creationWizard.getPages();
 
     DawnCreateNewDiagramResourceWizardPage dawnDiagramModelFilePage = (DawnCreateNewDiagramResourceWizardPage)pages[0];
-    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage
-        .getNextPage();
+    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage.getNextPage();
 
     dawnDomainModelFilePage.setVisible(true);
     dawnDomainModelFilePage.setResourceValidationType(ResourceChooserValidator.VALIDATION_ERROR);
@@ -281,8 +279,7 @@ public class DawnCreationWizardTest extends AbstractCDOTest
     callValidatePage(dawnDiagramModelFilePage);
     assertEquals(true, dawnDiagramModelFilePage.isPageComplete());
 
-    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage
-        .getNextPage();
+    DawnCreateNewResourceWizardPage dawnDomainModelFilePage = (DawnCreateNewResourceWizardPage)dawnDiagramModelFilePage.getNextPage();
     dawnDiagramModelFilePage.setVisible(false);
     dawnDomainModelFilePage.setVisible(true);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
index abe79d046d..523f454c01 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
@@ -89,8 +89,7 @@ public class DawnAcoreTestUtil
     return openNewAcoreGMFEditor(diagramResourceName, diagramResourceName.replace("_diagram", ""), bot);
   }
 
-  public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource,
-      SWTGefBot bot)
+  public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource, SWTGefBot bot)
   {
     bot.menu("File").menu("New").menu("Other...").click();
 
@@ -132,8 +131,7 @@ public class DawnAcoreTestUtil
       {
         try
         {
-          PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
-              .openEditor(editorInput, editorID);
+          PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage().openEditor(editorInput, editorID);
         }
         catch (PartInitException ex)
         {
@@ -227,36 +225,31 @@ public class DawnAcoreTestUtil
   public static Edge createNewAssociationRemote(Node source, Node target, List<RelativeBendpoint> bendpoints)
   {
     String type = AcoreVisualIDRegistry.getType(AClassAssociationsEditPart.VISUAL_ID);
-    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassAssociations_4003, bendpoints,
-        viewProvider);
+    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassAssociations_4003, bendpoints, viewProvider);
   }
 
   public static Edge createNewImplementsRelationRemote(Node source, Node target, List<RelativeBendpoint> bendpoints)
   {
     String type = AcoreVisualIDRegistry.getType(AClassImplementedInterfacesEditPart.VISUAL_ID);
-    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassImplementedInterfaces_4002,
-        bendpoints, viewProvider);
+    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassImplementedInterfaces_4002, bendpoints, viewProvider);
   }
 
   public static Edge createNewInheritanceRelationRemote(Node source, Node target, List<RelativeBendpoint> bendpoints)
   {
     String type = AcoreVisualIDRegistry.getType(AClassSubClassesEditPart.VISUAL_ID);
-    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassSubClasses_4001, bendpoints,
-        viewProvider);
+    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassSubClasses_4001, bendpoints, viewProvider);
   }
 
   public static Edge createNewCompositionRemote(Node source, Node target, List<RelativeBendpoint> bendpoints)
   {
     String type = AcoreVisualIDRegistry.getType(AClassCompositionsEditPart.VISUAL_ID);
-    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassCompositions_4005, bendpoints,
-        viewProvider);
+    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassCompositions_4005, bendpoints, viewProvider);
   }
 
   public static Edge createNewAggregationRemote(Node source, Node target, List<RelativeBendpoint> bendpoints)
   {
     String type = AcoreVisualIDRegistry.getType(AClassAggregationsEditPart.VISUAL_ID);
-    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassAggregations_4004, bendpoints,
-        viewProvider);
+    return DawnSWTBotUtil.createEdgeRemote(source, target, type, AcoreElementTypes.AClassAggregations_4004, bendpoints, viewProvider);
   }
 
   public static void sleep(int seconds)
@@ -303,8 +296,7 @@ public class DawnAcoreTestUtil
 
       IFigure figure = e.getFigure();
       Color color = ((LineBorder)figure.getBorder()).getColor();
-      return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY)
-          && color.equals(DawnColorConstants.COLOR_LOCKED_LOCALLY));
+      return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY) && color.equals(DawnColorConstants.COLOR_LOCKED_LOCALLY));
     }
     return false;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
index 1ed500bcb0..276d95b8e6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
@@ -99,8 +99,7 @@ public class DawnEcoreTestUtil
       {
         try
         {
-          PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
-              .openEditor(editorInput, editorID);
+          PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage().openEditor(editorInput, editorID);
         }
         catch (PartInitException ex)
         {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
index 0bdbd23286..fc0c915604 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
@@ -166,8 +166,8 @@ public class DawnSWTBotEMFEditor extends SWTBotEditor
     return (IEditorPart)runnable.getResult();
   }
 
-  protected void setActivePage(final MultiPageEditorPart editor, final int i) throws SecurityException,
-      NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
+  protected void setActivePage(final MultiPageEditorPart editor, final int i)
+      throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
   {
     editor.getSite().getShell().getDisplay().syncExec(new Runnable()
     {
@@ -225,8 +225,7 @@ public class DawnSWTBotEMFEditor extends SWTBotEditor
     }
   }
 
-  private Method getMethod(final MultiPageEditorPart editor, String methodName, Class<?>[] parameterTypes)
-      throws NoSuchMethodException
+  private Method getMethod(final MultiPageEditorPart editor, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException
   {
     Method method = null;
     Class<?> clazz = editor.getClass();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
index 03e915d252..2278cb984c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
@@ -94,8 +94,7 @@ public class DawnSWTBotUtil
     }
   }
 
-  public static void setConnectorType(SWTWorkbenchBot bot, String serverName, String serverPort, String repository,
-      String protocol)
+  public static void setConnectorType(SWTWorkbenchBot bot, String serverName, String serverPort, String repository, String protocol)
   {
     bot.menu(LABEL_WINDOW).menu("Preferences").click();
     SWTBotShell shell = bot.shell("Preferences");
@@ -138,8 +137,7 @@ public class DawnSWTBotUtil
     return getConnectionEditParts(editor, clazz, editParts);
   }
 
-  public static List<SWTBotGefEditPart> getConnectionEditParts(SWTBotGefEditor editor, Class<? extends EditPart> clazz,
-      List<SWTBotGefEditPart> editParts)
+  public static List<SWTBotGefEditPart> getConnectionEditParts(SWTBotGefEditor editor, Class<? extends EditPart> clazz, List<SWTBotGefEditPart> editParts)
   {
 
     List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
@@ -193,11 +191,10 @@ public class DawnSWTBotUtil
     return newNode;
   }
 
-  public static Edge createEdgeRemote(Node source, Node target, String type, IElementType elementType,
-      List<RelativeBendpoint> bendpoints, IViewProvider viewProvider)
+  public static Edge createEdgeRemote(Node source, Node target, String type, IElementType elementType, List<RelativeBendpoint> bendpoints,
+      IViewProvider viewProvider)
   {
-    Edge edge = viewProvider.createEdge(elementType, source.getDiagram(), type, ViewUtil.APPEND, true,
-        PreferencesHint.USE_DEFAULTS);
+    Edge edge = viewProvider.createEdge(elementType, source.getDiagram(), type, ViewUtil.APPEND, true, PreferencesHint.USE_DEFAULTS);
 
     edge.setTarget(target);
     edge.setSource(source);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
index fc65b55ac2..38a7aa1d60 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
@@ -41,8 +41,8 @@ public class SolveConflictHandler extends AbstractHandler
     if (activeEditor instanceof IDawnEditor)
     {
       MessageDialog dialog = new MessageDialog(DawnEditorHelper.getActiveShell(), "Conflict", null,
-          "There are conflicts in your diagram. Would you like to rollback your current transaction?",
-          MessageDialog.QUESTION, new String[] { "yes", "no", "Cancel" }, 1);
+          "There are conflicts in your diagram. Would you like to rollback your current transaction?", MessageDialog.QUESTION,
+          new String[] { "yes", "no", "Cancel" }, 1);
 
       switch (dialog.open())
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
index 120f24be62..86b67129b7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
@@ -103,15 +103,13 @@ public class DawnElementStylizerRegistry
   {
     try
     {
-      IConfigurationElement[] config = Platform.getExtensionRegistry()
-          .getConfigurationElementsFor(DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
+      IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
       for (IConfigurationElement e : config)
       {
         String factoryClassName = e.getAttribute(ATTRIIBUTE_FACTORY);
         if (!stylizerFactories.containsKey(factoryClassName))
         {
-          IDawnElementStylizerFactory stylizer = (IDawnElementStylizerFactory)e
-              .createExecutableExtension(ATTRIIBUTE_FACTORY);
+          IDawnElementStylizerFactory stylizer = (IDawnElementStylizerFactory)e.createExecutableExtension(ATTRIIBUTE_FACTORY);
 
           int priority = Integer.parseInt(e.getAttribute(ATTRIBUTE_PRIORITY).substring(0, 1));
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
index 6ea42b8c47..74011e36d6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
@@ -89,8 +89,7 @@ public class DawnExplorer extends CDOSessionsView
   {
     try
     {
-      CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
-          PreferenceConstants.getServerName());
+      CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
       CDOSession session = CDOConnectionUtil.instance.openSession();
       view = CDOConnectionUtil.instance.openView(session);
     }
@@ -154,8 +153,7 @@ public class DawnExplorer extends CDOSessionsView
           else
           {
             CDOTransaction transaction = view.getSession().openTransaction();
-            CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(transaction, ((CDOResource)obj).getPath(),
-                true);
+            CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(transaction, ((CDOResource)obj).getPath(), true);
             try
             {
               DawnExplorer.this.getSite().getPage().openEditor(editorInput, CDOEditorUtil.getEditorID());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
index 569f4af7be..abff4467dd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
@@ -34,7 +34,7 @@ public class DawnCreateNewDiagramResourceWizardPage extends DawnCreateNewResourc
   public URI getURI()
   {
     // TODO check why the dawn resource must be connected this way
-    return URI.createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath()
-        + "/" + chooserComposite.getResourceName());
+    return URI
+        .createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath() + "/" + chooserComposite.getResourceName());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
index aa0aac50dd..6246fb7a54 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true
-Bundle-Version: 2.0.400.qualifier
+Bundle-Version: 2.0.500.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,19 +14,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn;version="2.0.400",
- org.eclipse.emf.cdo.dawn.actions;version="2.0.400";x-internal:=true,
- org.eclipse.emf.cdo.dawn.appearance;version="2.0.400",
- org.eclipse.emf.cdo.dawn.commands;version="2.0.400",
- org.eclipse.emf.cdo.dawn.conflicts;version="2.0.400",
- org.eclipse.emf.cdo.dawn.editors;version="2.0.400",
- org.eclipse.emf.cdo.dawn.editors.impl;version="2.0.400",
- org.eclipse.emf.cdo.dawn.helper;version="2.0.400",
- org.eclipse.emf.cdo.dawn.notifications;version="2.0.400",
- org.eclipse.emf.cdo.dawn.preferences;version="2.0.400",
- org.eclipse.emf.cdo.dawn.resources;version="2.0.400",
- org.eclipse.emf.cdo.dawn.resources.impl;version="2.0.400",
- org.eclipse.emf.cdo.dawn.spi;version="2.0.400",
- org.eclipse.emf.cdo.dawn.transaction;version="2.0.400",
- org.eclipse.emf.cdo.internal.dawn.bundle;version="2.0.400"
+Export-Package: org.eclipse.emf.cdo.dawn;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.actions;version="2.0.500";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.appearance;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.commands;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.conflicts;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.editors;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.editors.impl;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.helper;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.notifications;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.preferences;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.resources;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.resources.impl;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.spi;version="2.0.500",
+ org.eclipse.emf.cdo.dawn.transaction;version="2.0.500",
+ org.eclipse.emf.cdo.internal.dawn.bundle;version="2.0.500"
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
index f1bddb4978..9843159ee6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
@@ -51,8 +51,8 @@ public class HandleConflictsAction implements IObjectActionDelegate
     if (activeEditor instanceof IDawnEditor)
     {
       MessageDialog dialog = new MessageDialog(DawnEditorHelper.getActiveShell(), "Conflict", null,
-          "There are conflicts in your diagram. Would you like to rollback your current transaction?",
-          MessageDialog.QUESTION, new String[] { "yes", "no", "Cancel" }, 1);
+          "There are conflicts in your diagram. Would you like to rollback your current transaction?", MessageDialog.QUESTION,
+          new String[] { "yes", "no", "Cancel" }, 1);
 
       switch (dialog.open())
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
index a43dbc8b5a..deef866c9b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
@@ -28,8 +28,7 @@ public class CreateSemanticResourceRecordingCommand extends RecordingCommand
 
   private final String resourcePath;
 
-  public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain, CDOTransaction cdoTransaction,
-      String resourcePath)
+  public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain, CDOTransaction cdoTransaction, String resourcePath)
   {
     super(editingDomain);
     this.cdoTransaction = cdoTransaction;
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
index bd8325d9be..76f763d20c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
@@ -36,8 +36,7 @@ public class DawnTransactionChangeRecorder extends TransactionChangeRecorder
   @Override
   public void notifyChanged(Notification notification)
   {
-    if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null
-        && notification.getEventType() == Notification.SET))
+    if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null && notification.getEventType() == Notification.SET))
     {
       if (!(notification instanceof CDODeltaNotification))
       {
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
index 464dcea177..8d6f914eb0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
@@ -31,8 +31,7 @@ public class DawnTransactionalEditingDomainImpl extends TransactionalEditingDoma
     super(adapterFactory);
   }
 
-  public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack,
-      ResourceSet resourceSet)
+  public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack, ResourceSet resourceSet)
   {
     super(adapterFactory, stack, resourceSet);
   }
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
index 636347cee7..2f5e1ed59b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
@@ -378,7 +378,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
index f2d0384f89..f3139cb6c3 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ecore.retrofit;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
 Fragment-Host: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java b/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
index 1de7bfd566..f607f663b2 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
@@ -24,304 +24,260 @@ import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 
-
 /**
- * A minimal abstract implementation of '<em><b>EObject</b></em>' that delegates to a {@link org.eclipse.emf.ecore.InternalEObject.EStore store}.
- * It's extends {@link MinimalEObjectImpl} and does <b>not</b> introduce any additional fields.
- * Clients extending this class must specialize {@link #eStore()}.
+ * A minimal abstract implementation of '<em><b>EObject</b></em>' that delegates
+ * to a {@link org.eclipse.emf.ecore.InternalEObject.EStore store}. It's extends
+ * {@link MinimalEObjectImpl} and does <b>not</b> introduce any additional
+ * fields. Clients extending this class must specialize {@link #eStore()}.
+ * 
  * @since 2.9
  */
 @SuppressWarnings("javadoc")
-public abstract class MinimalEStoreEObjectImpl extends MinimalEObjectImpl
-{
-  private static final EObservableAdapterList.Listener ADAPTERS_LISTENER = new EObservableAdapterList.Listener()
-  {
-    public void added(Notifier notifier, Adapter adapter)
-    {
-      MinimalEStoreEObjectImpl object = (MinimalEStoreEObjectImpl) notifier;
-      object.eAdapterAdded(adapter);
-    }
-
-    public void removed(Notifier notifier, Adapter adapter)
-    {
-      MinimalEStoreEObjectImpl object = (MinimalEStoreEObjectImpl) notifier;
-      object.eAdapterRemoved(adapter);
-    }
-  };
-
-  /**
-   * Creates a store-based EObject.
-   */
-  public MinimalEStoreEObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * Creates a store-based EObject.
-   */
-  public MinimalEStoreEObjectImpl(EClass eClass)
-  {
-    super();
-    eSetClass(eClass);
-  }
-
-  @Override
-  public abstract InternalEObject.EStore eStore();
-
-  protected boolean eIsCaching()
-  {
-    return true;
-  }
-
-  @Override
-Object[] eDynamicSettings()
-  {
-    Object[] settings = eBasicSettings();
-    if (settings == null)
-    {
-      eSettings();
-      settings = eBasicSettings();
-    }
-    return settings;
-  }
-
-  @Override
-  public Object dynamicGet(int dynamicFeatureID)
-  {
-    Object[] eSettings = eDynamicSettings();
-    Object result = eSettings[dynamicFeatureID];
-    if (result == null)
-    {
-      EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
-      if (!eStructuralFeature.isTransient())
-      {
-        if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
-        {
-          eSettings[dynamicFeatureID] = result = createFeatureMap(eStructuralFeature);
-        }
-        else if (eStructuralFeature.isMany())
-        {
-          eSettings[dynamicFeatureID] = result = createList(eStructuralFeature);
-        }
-        else
-        {
-          result = eStore().get(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX);
-          if (eIsCaching())
-          {
-            eSettings[dynamicFeatureID] = result;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  @Override
-  public void dynamicSet(int dynamicFeatureID, Object value)
-  {
-    Object[] eSettings = eDynamicSettings();
-    EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
-    if (eStructuralFeature.isTransient())
-    {
-      eSettings[dynamicFeatureID] = value;
-    }
-    else
-    {
-      eStore().set(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX, value);
-      if (eIsCaching())
-      {
-        eSettings[dynamicFeatureID] = value;
-      }
-    }
-  }
-
-  @Override
-  public void dynamicUnset(int dynamicFeatureID)
-  {
-    Object[] eSettings = eDynamicSettings();
-    EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
-    if (eStructuralFeature.isTransient())
-    {
-      eSettings[dynamicFeatureID] = null;
-    }
-    else
-    {
-      eStore().unset(this, eStructuralFeature);
-      eSettings[dynamicFeatureID] = null;
-    }
-  }
-
-  @Override
-  protected boolean eDynamicIsSet(int dynamicFeatureID, EStructuralFeature eFeature)
-  {
-    return dynamicFeatureID < 0 ? eOpenIsSet(eFeature) : eFeature.isTransient() ? eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), dynamicFeatureID)
-        : eStore().isSet(this, eFeature);
-  }
-
-  @SuppressWarnings("nls")
-  protected EList<?> createList(final EStructuralFeature eStructuralFeature)
-  {
-    final EClassifier eType = eStructuralFeature.getEType();
-    if (eType.getInstanceClassName() == "java.util.Map$Entry")
-    {
-      class EStoreEcoreEMap extends EcoreEMap<Object, Object>
-      {
-        private static final long serialVersionUID = 1L;
-
-        public EStoreEcoreEMap()
-        {
-          super((EClass) eType, BasicEMap.Entry.class, null);
-          delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(MinimalEStoreEObjectImpl.this, eStructuralFeature)
-          {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected void didAdd(int index, BasicEMap.Entry<Object, Object> newObject)
-            {
-              EStoreEcoreEMap.this.doPut(newObject);
-            }
-
-            @Override
-            protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject, BasicEMap.Entry<Object, Object> oldObject)
-            {
-              didRemove(index, oldObject);
-              didAdd(index, newObject);
-            }
-
-            @Override
-            protected void didRemove(int index, BasicEMap.Entry<Object, Object> oldObject)
-            {
-              EStoreEcoreEMap.this.doRemove(oldObject);
-            }
-
-            @Override
-            protected void didClear(int size, Object[] oldObjects)
-            {
-              EStoreEcoreEMap.this.doClear();
-            }
-
-            @Override
-            protected void didMove(int index, BasicEMap.Entry<Object, Object> movedObject, int oldIndex)
-            {
-              EStoreEcoreEMap.this.doMove(movedObject);
-            }
-          };
-          size = delegateEList.size();
-        }
-      }
-      return new EStoreEcoreEMap();
-    }
-    return new EStoreEObjectImpl.BasicEStoreEList<Object>(this, eStructuralFeature);
-  }
-
-  protected FeatureMap createFeatureMap(EStructuralFeature eStructuralFeature)
-  {
-    return new EStoreEObjectImpl.EStoreFeatureMap(this, eStructuralFeature, eStore());
-  }
-
-  /**
-   * Returns the container as cached by {@link MinimalEObjectImpl#eInternalContainer()}.
-   */
-  protected InternalEObject eBasicInternalContainer()
-  {
-    return super.eInternalContainer();
-  }
-
-  /**
-   * Returns the container as {@link InternalEObject.EStore#getContainer(InternalEObject) provided} by the store.
-   */
-  @Override
-  public InternalEObject eInternalContainer()
-  {
-    return eStore().getContainer(this);
-  }
-
-  /**
-   * Returns the container feature ID as cached by {@link MinimalEObjectImpl#eContainerFeatureID()}.
-   */
-  protected int eBasicContainerFeatureID()
-  {
-    return super.eContainerFeatureID();
-  }
-
-  /**
-   * Returns the container feature ID as computed from the container feature {@link InternalEObject.EStore#getContainingFeature(InternalEObject) provided} by the store.
-   */
-  @Override
-  public int eContainerFeatureID()
-  {
-    EObject eContainer = eInternalContainer();
-    if (eContainer != null)
-    {
-      EStructuralFeature eContainingFeature = eStore().getContainingFeature(this);
-      if (eContainingFeature instanceof EReference)
-      {
-        EReference eContainingReference = (EReference) eContainingFeature;
-        EReference eOpposite = eContainingReference.getEOpposite();
-        if (eOpposite != null)
-        {
-          return eClass().getFeatureID(eOpposite);
-        }
-      }
-
-      return EOPPOSITE_FEATURE_BASE - eContainer.eClass().getFeatureID(eContainingFeature);
-    }
-
-    return 0;
-  }
-
-  @Override
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  @Override
-  public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
-  {
-    return eClass().getFeatureID(eStructuralFeature);
-  }
-
-  @Override
-  protected void eBasicSetAdapterArray(Adapter[] adapters)
-  {
-    Adapter[] oldAdapters = eBasicAdapterArray();
-    if (adapters == null || adapters.length == 0)
-    {
-      adapters = null;// Optimize possibly empty array
-      if (oldAdapters != null) // Can't be empty array because of the optimization above
-      {
-        ((EObservableAdapterList) eAdapters()).removeListener(ADAPTERS_LISTENER);
-      }
-    }
-    else
-    {
-      if (oldAdapters == null) // Can't be empty array because of the optimization above
-      {
-        ((EObservableAdapterList) eAdapters()).addListener(ADAPTERS_LISTENER);
-      }
-    }
-    super.eBasicSetAdapterArray(adapters);
-  }
-
-  @Override
-protected EObservableAdapterList.Listener[] eBasicAdapterListeners()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-protected void eBasicSetAdapterListeners(EObservableAdapterList.Listener[] eAdapterListeners)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  protected void eAdapterAdded(Adapter adapter)
-  {
-  }
-
-  protected void eAdapterRemoved(Adapter adapter)
-  {
-  }
+public abstract class MinimalEStoreEObjectImpl extends MinimalEObjectImpl {
+	private static final EObservableAdapterList.Listener ADAPTERS_LISTENER = new EObservableAdapterList.Listener() {
+		public void added(Notifier notifier, Adapter adapter) {
+			MinimalEStoreEObjectImpl object = (MinimalEStoreEObjectImpl) notifier;
+			object.eAdapterAdded(adapter);
+		}
+
+		public void removed(Notifier notifier, Adapter adapter) {
+			MinimalEStoreEObjectImpl object = (MinimalEStoreEObjectImpl) notifier;
+			object.eAdapterRemoved(adapter);
+		}
+	};
+
+	/**
+	 * Creates a store-based EObject.
+	 */
+	public MinimalEStoreEObjectImpl() {
+		super();
+	}
+
+	/**
+	 * Creates a store-based EObject.
+	 */
+	public MinimalEStoreEObjectImpl(EClass eClass) {
+		super();
+		eSetClass(eClass);
+	}
+
+	@Override
+	public abstract InternalEObject.EStore eStore();
+
+	protected boolean eIsCaching() {
+		return true;
+	}
+
+	@Override
+	Object[] eDynamicSettings() {
+		Object[] settings = eBasicSettings();
+		if (settings == null) {
+			eSettings();
+			settings = eBasicSettings();
+		}
+		return settings;
+	}
+
+	@Override
+	public Object dynamicGet(int dynamicFeatureID) {
+		Object[] eSettings = eDynamicSettings();
+		Object result = eSettings[dynamicFeatureID];
+		if (result == null) {
+			EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
+			if (!eStructuralFeature.isTransient()) {
+				if (FeatureMapUtil.isFeatureMap(eStructuralFeature)) {
+					eSettings[dynamicFeatureID] = result = createFeatureMap(eStructuralFeature);
+				} else if (eStructuralFeature.isMany()) {
+					eSettings[dynamicFeatureID] = result = createList(eStructuralFeature);
+				} else {
+					result = eStore().get(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX);
+					if (eIsCaching()) {
+						eSettings[dynamicFeatureID] = result;
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void dynamicSet(int dynamicFeatureID, Object value) {
+		Object[] eSettings = eDynamicSettings();
+		EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
+		if (eStructuralFeature.isTransient()) {
+			eSettings[dynamicFeatureID] = value;
+		} else {
+			eStore().set(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX, value);
+			if (eIsCaching()) {
+				eSettings[dynamicFeatureID] = value;
+			}
+		}
+	}
+
+	@Override
+	public void dynamicUnset(int dynamicFeatureID) {
+		Object[] eSettings = eDynamicSettings();
+		EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
+		if (eStructuralFeature.isTransient()) {
+			eSettings[dynamicFeatureID] = null;
+		} else {
+			eStore().unset(this, eStructuralFeature);
+			eSettings[dynamicFeatureID] = null;
+		}
+	}
+
+	@Override
+	protected boolean eDynamicIsSet(int dynamicFeatureID, EStructuralFeature eFeature) {
+		return dynamicFeatureID < 0 ? eOpenIsSet(eFeature)
+				: eFeature.isTransient() ? eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), dynamicFeatureID)
+						: eStore().isSet(this, eFeature);
+	}
+
+	@SuppressWarnings("nls")
+	protected EList<?> createList(final EStructuralFeature eStructuralFeature) {
+		final EClassifier eType = eStructuralFeature.getEType();
+		if (eType.getInstanceClassName() == "java.util.Map$Entry") {
+			class EStoreEcoreEMap extends EcoreEMap<Object, Object> {
+				private static final long serialVersionUID = 1L;
+
+				public EStoreEcoreEMap() {
+					super((EClass) eType, BasicEMap.Entry.class, null);
+					delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(
+							MinimalEStoreEObjectImpl.this, eStructuralFeature) {
+						private static final long serialVersionUID = 1L;
+
+						@Override
+						protected void didAdd(int index, BasicEMap.Entry<Object, Object> newObject) {
+							EStoreEcoreEMap.this.doPut(newObject);
+						}
+
+						@Override
+						protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject,
+								BasicEMap.Entry<Object, Object> oldObject) {
+							didRemove(index, oldObject);
+							didAdd(index, newObject);
+						}
+
+						@Override
+						protected void didRemove(int index, BasicEMap.Entry<Object, Object> oldObject) {
+							EStoreEcoreEMap.this.doRemove(oldObject);
+						}
+
+						@Override
+						protected void didClear(int size, Object[] oldObjects) {
+							EStoreEcoreEMap.this.doClear();
+						}
+
+						@Override
+						protected void didMove(int index, BasicEMap.Entry<Object, Object> movedObject, int oldIndex) {
+							EStoreEcoreEMap.this.doMove(movedObject);
+						}
+					};
+					size = delegateEList.size();
+				}
+			}
+			return new EStoreEcoreEMap();
+		}
+		return new EStoreEObjectImpl.BasicEStoreEList<Object>(this, eStructuralFeature);
+	}
+
+	protected FeatureMap createFeatureMap(EStructuralFeature eStructuralFeature) {
+		return new EStoreEObjectImpl.EStoreFeatureMap(this, eStructuralFeature, eStore());
+	}
+
+	/**
+	 * Returns the container as cached by
+	 * {@link MinimalEObjectImpl#eInternalContainer()}.
+	 */
+	protected InternalEObject eBasicInternalContainer() {
+		return super.eInternalContainer();
+	}
+
+	/**
+	 * Returns the container as
+	 * {@link InternalEObject.EStore#getContainer(InternalEObject) provided} by
+	 * the store.
+	 */
+	@Override
+	public InternalEObject eInternalContainer() {
+		return eStore().getContainer(this);
+	}
+
+	/**
+	 * Returns the container feature ID as cached by
+	 * {@link MinimalEObjectImpl#eContainerFeatureID()}.
+	 */
+	protected int eBasicContainerFeatureID() {
+		return super.eContainerFeatureID();
+	}
+
+	/**
+	 * Returns the container feature ID as computed from the container feature
+	 * {@link InternalEObject.EStore#getContainingFeature(InternalEObject)
+	 * provided} by the store.
+	 */
+	@Override
+	public int eContainerFeatureID() {
+		EObject eContainer = eInternalContainer();
+		if (eContainer != null) {
+			EStructuralFeature eContainingFeature = eStore().getContainingFeature(this);
+			if (eContainingFeature instanceof EReference) {
+				EReference eContainingReference = (EReference) eContainingFeature;
+				EReference eOpposite = eContainingReference.getEOpposite();
+				if (eOpposite != null) {
+					return eClass().getFeatureID(eOpposite);
+				}
+			}
+
+			return EOPPOSITE_FEATURE_BASE - eContainer.eClass().getFeatureID(eContainingFeature);
+		}
+
+		return 0;
+	}
+
+	@Override
+	protected int eStaticFeatureCount() {
+		return 0;
+	}
+
+	@Override
+	public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature) {
+		return eClass().getFeatureID(eStructuralFeature);
+	}
+
+	@Override
+	protected void eBasicSetAdapterArray(Adapter[] adapters) {
+		Adapter[] oldAdapters = eBasicAdapterArray();
+		if (adapters == null || adapters.length == 0) {
+			adapters = null;// Optimize possibly empty array
+			if (oldAdapters != null) // Can't be empty array because of the
+										// optimization above
+			{
+				((EObservableAdapterList) eAdapters()).removeListener(ADAPTERS_LISTENER);
+			}
+		} else {
+			if (oldAdapters == null) // Can't be empty array because of the
+										// optimization above
+			{
+				((EObservableAdapterList) eAdapters()).addListener(ADAPTERS_LISTENER);
+			}
+		}
+		super.eBasicSetAdapterArray(adapters);
+	}
+
+	@Override
+	protected EObservableAdapterList.Listener[] eBasicAdapterListeners() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	protected void eBasicSetAdapterListeners(EObservableAdapterList.Listener[] eAdapterListeners) {
+		throw new UnsupportedOperationException();
+	}
+
+	protected void eAdapterAdded(Adapter adapter) {
+	}
+
+	protected void eAdapterRemoved(Adapter adapter) {
+	}
 }
diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs
index fd0464a1d8..f4735cb9f2 100644
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs
@@ -380,7 +380,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index 3778536ecd..c78f8800c3 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -364,8 +364,7 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
       return null;
     }
 
-    public boolean isCompatibleWith(Object object, Object anotherObject,
-        IItemPropertyDescriptor anotherPropertyDescriptor)
+    public boolean isCompatibleWith(Object object, Object anotherObject, IItemPropertyDescriptor anotherPropertyDescriptor)
     {
       return false;
     }
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
index 1a405b0312..7213812e34 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
@@ -67,13 +67,11 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider
    */
   protected void addContentsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOBinaryResource_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOBinaryResource_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
index ab7dd28b95..7503d6a427 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
@@ -156,17 +156,13 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
-        EresourceFactory.eINSTANCE.createCDOResourceFolder()));
+    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES, EresourceFactory.eINSTANCE.createCDOResourceFolder()));
 
-    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
-        EresourceFactory.eINSTANCE.createCDOResource()));
+    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES, EresourceFactory.eINSTANCE.createCDOResource()));
 
-    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
-        EresourceFactory.eINSTANCE.createCDOBinaryResource()));
+    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES, EresourceFactory.eINSTANCE.createCDOBinaryResource()));
 
-    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
-        EresourceFactory.eINSTANCE.createCDOTextResource()));
+    newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES, EresourceFactory.eINSTANCE.createCDOTextResource()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
index 2f3f7441b2..d0b408f682 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
@@ -75,12 +75,10 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
    */
   protected void addURIPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResource_uRI_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResource_uRI_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -90,12 +88,10 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
    */
   protected void addModifiedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResource_modified_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResource_modified_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -105,12 +101,10 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
    */
   protected void addLoadedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResource_loaded_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResource_loaded_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -121,13 +115,11 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
    */
   protected void addTrackingModificationPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOResource_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOResource_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -137,13 +129,11 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
    */
   protected void addTimeStampPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResource_timeStamp_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOResource_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResource_timeStamp_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOResource_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index c563caa979..3d42f1f2ab 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
@@ -44,8 +44,8 @@ import java.util.List;
  * @generated
  * @since 2.0
  */
-public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -83,13 +83,11 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implemen
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResourceNode_name_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOResourceNode_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_RESOURCE_NODE__NAME, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResourceNode_name_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOResourceNode_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_RESOURCE_NODE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -99,13 +97,11 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implemen
    */
   protected void addPathPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOResourceNode_path_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOResourceNode_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_RESOURCE_NODE__PATH, false, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOResourceNode_path_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOResourceNode_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_RESOURCE_NODE__PATH, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
index 6cbea2b063..8629050bce 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
@@ -68,13 +68,11 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider
    */
   protected void addContentsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOTextResource_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOTextResource_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -86,13 +84,11 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider
    */
   protected void addEncodingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CDOTextResource_encoding_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_CDOTextResource_type"), //$NON-NLS-1$
-            EresourcePackage.Literals.CDO_TEXT_RESOURCE__ENCODING, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CDOTextResource_encoding_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_CDOTextResource_type"), //$NON-NLS-1$
+        EresourcePackage.Literals.CDO_TEXT_RESOURCE__ENCODING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index 6193a0f49a..833548e51b 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -74,8 +74,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      CDOEditPlugin.INSTANCE, EresourcePackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(CDOEditPlugin.INSTANCE, EresourcePackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
index 2e7b271ecf..a7d17c49d1 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
@@ -69,12 +69,10 @@ public class AnnotationItemProvider extends ModelElementItemProvider
    */
   protected void addSourcePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Annotation_source_feature"), //$NON-NLS-1$
-            getString("_UI_Annotation_source_description"), //$NON-NLS-1$
-            EtypesPackage.Literals.ANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Annotation_source_feature"), //$NON-NLS-1$
+        getString("_UI_Annotation_source_description"), //$NON-NLS-1$
+        EtypesPackage.Literals.ANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -84,11 +82,10 @@ public class AnnotationItemProvider extends ModelElementItemProvider
    */
   protected void addReferencesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Annotation_references_feature"), //$NON-NLS-1$
-            getString("_UI_Annotation_references_description"), //$NON-NLS-1$
-            EtypesPackage.Literals.ANNOTATION__REFERENCES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Annotation_references_feature"), //$NON-NLS-1$
+        getString("_UI_Annotation_references_description"), //$NON-NLS-1$
+        EtypesPackage.Literals.ANNOTATION__REFERENCES, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index 0a6e099fc8..b6355b2767 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -75,8 +75,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      CDOEditPlugin.INSTANCE, EtypesPackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(CDOEditPlugin.INSTANCE, EtypesPackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
index f04dad6670..ce5924fa6a 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
@@ -44,8 +44,8 @@ import java.util.List;
  * @since 4.0 <!-- end-user-doc -->
  * @generated
  */
-public class ModelElementItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class ModelElementItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -169,8 +169,7 @@ public class ModelElementItemProvider extends CDOItemProviderAdapter implements
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(EtypesPackage.Literals.MODEL_ELEMENT__ANNOTATIONS,
-        EtypesFactory.eINSTANCE.createAnnotation()));
+    newChildDescriptors.add(createChildParameter(EtypesPackage.Literals.MODEL_ELEMENT__ANNOTATIONS, EtypesFactory.eINSTANCE.createAnnotation()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
index 1a0ee765cb..438d1dbff6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
@@ -21,8 +21,7 @@ public class ClientPerspective implements IPerspectiveFactory
   public void createInitialLayout(IPageLayout layout)
   {
     layout.setFixed(true);
-    layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f,
-        IPageLayout.ID_EDITOR_AREA);
+    layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f, IPageLayout.ID_EDITOR_AREA);
     layout.addView("org.eclipse.emf.cdo.examples.client.offline.CloneRepositoryView", IPageLayout.BOTTOM, 0.46f,
         "org.eclipse.emf.cdo.examples.client.offline.ClientView");
     layout.addView("org.eclipse.ui.views.PropertySheet", IPageLayout.BOTTOM, 0.67f, IPageLayout.ID_EDITOR_AREA);
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
index bee2a781be..3b770c51fd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
@@ -167,8 +167,8 @@ public class ClientView extends AbstractView<CDOSession>
   {
     CDOTransaction transaction = Application.NODE.getObject(CDOTransaction.class);
     commitAction.setEnabled(transaction != null && transaction.isDirty());
-    mergeAction.setEnabled(transaction != null && transaction.getBranch().isLocal()
-        && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
+    mergeAction
+        .setEnabled(transaction != null && transaction.getBranch().isLocal() && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
   }
 
   protected void hookContextMenu()
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index f46ef13914..d0d1299e3d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -109,20 +109,17 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
     private static final Random RANDOM = new Random();
 
-    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0,
-        255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67,
-        0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15,
-        17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36,
-        28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0, 2,
-        17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0,
-        34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209,
-        97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2,
-        2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17,
-        0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211,
-        133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197,
-        244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140, 255, 217 };
+    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0, 255, 254, 0, 19, 67, 114, 101, 97, 116,
+        101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67, 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9,
+        12, 17, 15, 18, 18, 17, 15, 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36, 28, 30, 31,
+        30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0,
+        20, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0, 34, 16, 0, 2, 2, 0, 5,
+        5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209, 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17,
+        3, 17, 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211, 133, 245, 141, 180, 155, 122, 106,
+        255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197, 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237,
+        20, 182, 137, 64, 6, 140, 255, 217 };
 
     private SortedMap<String, Channel> channels = new TreeMap<String, Channel>();
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index c2606a5f67..d6f29f0c90 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -81,8 +81,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
   protected void initializeToolBar(IToolBarManager toolbarManager)
   {
     super.initializeToolBar(toolbarManager);
-    toolbarManager.add(new Action("Browser",
-        ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
+    toolbarManager.add(new Action("Browser", ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
     {
       @Override
       public void run()
@@ -94,8 +93,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
 
           try
           {
-            PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
-                .openURL(new URL("http://localhost:" + port));
+            PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(new URL("http://localhost:" + port));
           }
           catch (Exception ex)
           {
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index b102b18d33..d5870dd987 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -228,8 +228,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     String browserPort = node.getSetting(BROWSER_PROPERTY);
     if (browserPort != null && browserPort.length() != 0)
     {
-      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE
-          .getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
+      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
       node.setObject(CDOServerBrowser.class, browser);
     }
   }
@@ -775,8 +774,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
         }
 
         @Override
-        protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription,
-            String repositoryName)
+        protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName)
         {
           IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", connectorDescription);
 
@@ -826,17 +824,15 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     {
       super.start(node);
 
-      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE
-          .getElement(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP,
-              org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
+      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE.getElement(
+          org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP, org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
       node.setObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class, monitor);
     }
 
     @Override
     public void stop(Node node)
     {
-      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node
-          .getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
+      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node.getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
       LifecycleUtil.deactivate(monitor);
 
       super.stop(node);
diff --git a/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 25b7a5b1e8..42b3475e22 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -180,8 +180,7 @@ public abstract class AbstractOfflineExampleServer
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -205,8 +204,7 @@ public abstract class AbstractOfflineExampleServer
 
   protected IAcceptor createAcceptor()
   {
-    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "0.0.0.0:" + port);
+    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE, "0.0.0.0:" + port);
   }
 
   protected void disconnect()
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4c20a676fd..f22befc593 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -48,8 +48,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
   @Override
   protected IRepository createRepository(IStore store, Map<String, String> props)
   {
-    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT,
-        OfflineExampleUtil.MASTER_NAME);
+    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT, OfflineExampleUtil.MASTER_NAME);
     return CDOServerUtil.createOfflineClone(name, store, props, synchronizer);
   }
 
@@ -71,8 +70,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
    * creates a CDOSessionConfigurationFactory for the offline clone. It instantiates a connection to the master
    * repository.
    */
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index 6c41751fe1..8651e0df4e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -40,9 +40,8 @@ import java.util.List;
  * @since 4.0<!-- end-user-doc -->
  * @generated
  */
-public class AddressableItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,12 +79,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Addressable_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
-            CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -95,14 +91,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addStreetPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Addressable_street_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature",
-                    "_UI_Addressable_type"),
-                CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_street_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -112,12 +103,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addCityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Addressable_city_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
-            CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_city_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -149,8 +137,7 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Addressable)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Addressable_type")
-        : getString("_UI_Addressable_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
index 137fcaa142..d2d2bbb458 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
@@ -41,9 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class CategoryItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class CategoryItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,12 +78,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Category_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-            CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Category_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+        CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -160,8 +156,7 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Category)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Category_type")
-        : getString("_UI_Category_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " " + label;
   }
 
   /**
@@ -199,11 +194,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 6e3e0933d6..b69dd22fc7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -123,8 +123,7 @@ public class CompanyItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Company)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Company_type")
-        : getString("_UI_Company_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Company_type") : getString("_UI_Company_type") + " " + label;
   }
 
   /**
@@ -162,20 +161,15 @@ public class CompanyItemProvider extends AddressableItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS,
-        CompanyFactory.eINSTANCE.createPurchaseOrder()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS, CompanyFactory.eINSTANCE.createPurchaseOrder()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS,
-        CompanyFactory.eINSTANCE.createSalesOrder()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS, CompanyFactory.eINSTANCE.createSalesOrder()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index ca5e9e7931..fdf9523198 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -70,8 +70,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index c8601ddb10..75a08f421e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -63,11 +63,9 @@ public class CustomerItemProvider extends AddressableItemProvider
    */
   protected void addSalesOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Customer_salesOrders_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
-            CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Customer_salesOrders_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
+        CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -100,8 +98,7 @@ public class CustomerItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Customer)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Customer_type")
-        : getString("_UI_Customer_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Customer_type") : getString("_UI_Customer_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
index ac5119c221..e90aa31f59 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OrderDetailItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderDetailItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -78,11 +77,10 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_OrderDetail_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
-            CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_product_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
+        CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -92,14 +90,9 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
-                    "_UI_OrderDetail_type"),
-                CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+        CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index d780aa6f6c..04688772b9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OrderItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -174,8 +173,7 @@ public class OrderItemProvider extends CDOItemProviderAdapter
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
-        CompanyFactory.eINSTANCE.createOrderDetail()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS, CompanyFactory.eINSTANCE.createOrderDetail()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index c6a00d6a50..d08f5378bb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ProductItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class ProductItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +80,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -96,11 +92,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addOrderDetailsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_orderDetails_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_orderDetails_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +104,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addVatPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_vat_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_vat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -125,12 +116,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_description_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -142,12 +130,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -190,8 +175,7 @@ public class ProductItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Product)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Product_type")
-        : getString("_UI_Product_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Product_type") : getString("_UI_Product_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 873e0e8e09..8f460dc610 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -67,14 +67,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_PurchaseOrder_date_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature",
-                    "_UI_PurchaseOrder_type"),
-                CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PurchaseOrder_date_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature", "_UI_PurchaseOrder_type"),
+        CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -84,12 +80,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addSupplierPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
-                "_UI_PurchaseOrder_type"),
-            CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PurchaseOrder_supplier_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature", "_UI_PurchaseOrder_type"),
+        CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
   }
 
   /**
@@ -123,8 +117,7 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
   {
     Date labelValue = ((PurchaseOrder)object).getDate();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type")
-        : getString("_UI_PurchaseOrder_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type") : getString("_UI_PurchaseOrder_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
index 49898e0000..3e50c7323c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
@@ -66,12 +66,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_SalesOrder_id_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
-            CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_SalesOrder_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
+        CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -81,11 +78,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addCustomerPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_SalesOrder_customer_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
-            CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_SalesOrder_customer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
+        CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index de7b9968e7..7c4c36721c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -66,11 +66,10 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPurchaseOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Supplier_purchaseOrders_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
-            CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Supplier_purchaseOrders_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
+        CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -80,12 +79,9 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPreferredPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Supplier_preferred_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
-            CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Supplier_preferred_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
+        CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -118,8 +114,7 @@ public class SupplierItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Supplier)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Supplier_type")
-        : getString("_UI_Supplier_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Supplier_type") : getString("_UI_Supplier_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
index 24b5c4e7fe..407d7077a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.impl;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.util;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.validation;version="4.0.400"
+Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.impl;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.util;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.validation;version="4.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
index f790ffadc4..3b2875b91c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
@@ -171,8 +171,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory
     VAT result = VAT.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
index ec355db211..1fdeca3655 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
@@ -146,9 +146,8 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     }
 
     // Obtain or create and register package
-    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new CompanyPackageImpl());
+    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CompanyPackageImpl());
 
     isInited = true;
 
@@ -636,98 +635,79 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     salesOrderEClass.getESuperTypes().add(getOrder());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
-        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
-        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
-        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
-        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
-        Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, Product.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(vatEEnum, org.eclipse.emf.cdo.examples.company.VAT.class, "VAT");
@@ -754,11 +734,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     addAnnotation(this, source, new String[] { "value",
         "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
-    addAnnotation(getCategory_Name(), source,
-        new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
+    addAnnotation(getCategory_Name(), source, new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
     addAnnotation(getProduct_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(getProduct_Vat(), source,
-        new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
+    addAnnotation(getProduct_Vat(), source, new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
   }
 
 } // CompanyPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
index 4180739913..44141561c5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.hibernate.client
-Bundle-Version: 4.1.300.qualifier
+Bundle-Version: 4.1.400.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -33,4 +33,4 @@ Import-Package: org.hibernate;version="[4.0.0,5.0.0)",
  org.hibernate.type;version="[4.0.0,5.0.0)",
  org.hibernate.usertype;version="[4.0.0,5.0.0)",
  org.apache.commons.logging;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.300"
+Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.400"
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
index e5fb72b588..78b7227b05 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
@@ -196,8 +196,7 @@ public class HibernateQueryTest extends BaseTest
           orderQuery.setParameter("customer", customer); //$NON-NLS-1$
           orderQuery.setParameter("product", product); //$NON-NLS-1$
 
-          final boolean hasOrders = productCounter <= productIndex
-              && productIndex < productCounter + NUM_OF_PRODUCTS_CUSTOMER;
+          final boolean hasOrders = productCounter <= productIndex && productIndex < productCounter + NUM_OF_PRODUCTS_CUSTOMER;
           if (hasOrders)
           {
             final List<SalesOrder> sos = orderQuery.getResult(SalesOrder.class);
@@ -391,8 +390,7 @@ public class HibernateQueryTest extends BaseTest
       customer.setStreet("Street " + i); //$NON-NLS-1$
       resource.getContents().add(customer);
 
-      final List<Product> customerProducts = products.subList(productCounter,
-          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product> customerProducts = products.subList(productCounter, productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
index 1a0ee765cb..438d1dbff6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
@@ -21,8 +21,7 @@ public class ClientPerspective implements IPerspectiveFactory
   public void createInitialLayout(IPageLayout layout)
   {
     layout.setFixed(true);
-    layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f,
-        IPageLayout.ID_EDITOR_AREA);
+    layout.addView("org.eclipse.emf.cdo.examples.client.offline.ClientView", IPageLayout.LEFT, 0.5f, IPageLayout.ID_EDITOR_AREA);
     layout.addView("org.eclipse.emf.cdo.examples.client.offline.CloneRepositoryView", IPageLayout.BOTTOM, 0.46f,
         "org.eclipse.emf.cdo.examples.client.offline.ClientView");
     layout.addView("org.eclipse.ui.views.PropertySheet", IPageLayout.BOTTOM, 0.67f, IPageLayout.ID_EDITOR_AREA);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
index bee2a781be..3b770c51fd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java
@@ -167,8 +167,8 @@ public class ClientView extends AbstractView<CDOSession>
   {
     CDOTransaction transaction = Application.NODE.getObject(CDOTransaction.class);
     commitAction.setEnabled(transaction != null && transaction.isDirty());
-    mergeAction.setEnabled(transaction != null && transaction.getBranch().isLocal()
-        && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
+    mergeAction
+        .setEnabled(transaction != null && transaction.getBranch().isLocal() && Application.NODE.getObject(IRepository.class).getState() == State.ONLINE);
   }
 
   protected void hookContextMenu()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index f46ef13914..d0d1299e3d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -109,20 +109,17 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
     private static final Random RANDOM = new Random();
 
-    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0,
-        255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67,
-        0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15,
-        17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36,
-        28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0, 2,
-        17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0,
-        34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209,
-        97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2,
-        2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17,
-        0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211,
-        133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197,
-        244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140, 255, 217 };
+    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0, 255, 254, 0, 19, 67, 114, 101, 97, 116,
+        101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67, 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9,
+        12, 17, 15, 18, 18, 17, 15, 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36, 28, 30, 31,
+        30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0,
+        20, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0, 34, 16, 0, 2, 2, 0, 5,
+        5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209, 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17,
+        3, 17, 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211, 133, 245, 141, 180, 155, 122, 106,
+        255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197, 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237,
+        20, 182, 137, 64, 6, 140, 255, 217 };
 
     private SortedMap<String, Channel> channels = new TreeMap<String, Channel>();
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index c2606a5f67..d6f29f0c90 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -81,8 +81,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
   protected void initializeToolBar(IToolBarManager toolbarManager)
   {
     super.initializeToolBar(toolbarManager);
-    toolbarManager.add(new Action("Browser",
-        ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
+    toolbarManager.add(new Action("Browser", ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
     {
       @Override
       public void run()
@@ -94,8 +93,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
 
           try
           {
-            PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
-                .openURL(new URL("http://localhost:" + port));
+            PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(new URL("http://localhost:" + port));
           }
           catch (Exception ex)
           {
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index b102b18d33..d5870dd987 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -228,8 +228,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     String browserPort = node.getSetting(BROWSER_PROPERTY);
     if (browserPort != null && browserPort.length() != 0)
     {
-      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE
-          .getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
+      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
       node.setObject(CDOServerBrowser.class, browser);
     }
   }
@@ -775,8 +774,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
         }
 
         @Override
-        protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription,
-            String repositoryName)
+        protected CDONet4jSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName)
         {
           IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", connectorDescription);
 
@@ -826,17 +824,15 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     {
       super.start(node);
 
-      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE
-          .getElement(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP,
-              org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
+      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = (org.eclipse.emf.cdo.server.net4j.FailoverMonitor)IPluginContainer.INSTANCE.getElement(
+          org.eclipse.emf.cdo.server.net4j.FailoverMonitor.PRODUCT_GROUP, org.eclipse.emf.cdo.server.net4j.FailoverMonitor.Factory.TYPE, node.getName());
       node.setObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class, monitor);
     }
 
     @Override
     public void stop(Node node)
     {
-      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node
-          .getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
+      org.eclipse.emf.cdo.server.net4j.FailoverMonitor monitor = node.getObject(org.eclipse.emf.cdo.server.net4j.FailoverMonitor.class);
       LifecycleUtil.deactivate(monitor);
 
       super.stop(node);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 25b7a5b1e8..42b3475e22 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -180,8 +180,7 @@ public abstract class AbstractOfflineExampleServer
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -205,8 +204,7 @@ public abstract class AbstractOfflineExampleServer
 
   protected IAcceptor createAcceptor()
   {
-    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "0.0.0.0:" + port);
+    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE, "0.0.0.0:" + port);
   }
 
   protected void disconnect()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4c20a676fd..f22befc593 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -48,8 +48,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
   @Override
   protected IRepository createRepository(IStore store, Map<String, String> props)
   {
-    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT,
-        OfflineExampleUtil.MASTER_NAME);
+    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT, OfflineExampleUtil.MASTER_NAME);
     return CDOServerUtil.createOfflineClone(name, store, props, synchronizer);
   }
 
@@ -71,8 +70,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
    * creates a CDOSessionConfigurationFactory for the offline clone. It instantiates a connection to the master
    * repository.
    */
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index 6c41751fe1..8651e0df4e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -40,9 +40,8 @@ import java.util.List;
  * @since 4.0<!-- end-user-doc -->
  * @generated
  */
-public class AddressableItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,12 +79,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Addressable_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
-            CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -95,14 +91,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addStreetPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Addressable_street_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature",
-                    "_UI_Addressable_type"),
-                CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_street_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -112,12 +103,9 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
    */
   protected void addCityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Addressable_city_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
-            CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Addressable_city_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
+        CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -149,8 +137,7 @@ public class AddressableItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Addressable)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Addressable_type")
-        : getString("_UI_Addressable_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
index 137fcaa142..d2d2bbb458 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
@@ -41,9 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class CategoryItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class CategoryItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,12 +78,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Category_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-            CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Category_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+        CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -160,8 +156,7 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Category)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Category_type")
-        : getString("_UI_Category_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " " + label;
   }
 
   /**
@@ -199,11 +194,9 @@ public class CategoryItemProvider extends CDOItemProviderAdapter
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 6e3e0933d6..b69dd22fc7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -123,8 +123,7 @@ public class CompanyItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Company)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Company_type")
-        : getString("_UI_Company_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Company_type") : getString("_UI_Company_type") + " " + label;
   }
 
   /**
@@ -162,20 +161,15 @@ public class CompanyItemProvider extends AddressableItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
 
-    newChildDescriptors.add(
-        createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS,
-        CompanyFactory.eINSTANCE.createPurchaseOrder()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS, CompanyFactory.eINSTANCE.createPurchaseOrder()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS,
-        CompanyFactory.eINSTANCE.createSalesOrder()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SALES_ORDERS, CompanyFactory.eINSTANCE.createSalesOrder()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index ca5e9e7931..fdf9523198 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -70,8 +70,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(CompanyEditPlugin.INSTANCE, CompanyPackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index c8601ddb10..75a08f421e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -63,11 +63,9 @@ public class CustomerItemProvider extends AddressableItemProvider
    */
   protected void addSalesOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Customer_salesOrders_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
-            CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Customer_salesOrders_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
+        CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -100,8 +98,7 @@ public class CustomerItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Customer)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Customer_type")
-        : getString("_UI_Customer_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Customer_type") : getString("_UI_Customer_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
index ac5119c221..e90aa31f59 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OrderDetailItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderDetailItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -78,11 +77,10 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_OrderDetail_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
-            CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_product_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
+        CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -92,14 +90,9 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
-                    "_UI_OrderDetail_type"),
-                CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+        CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index d780aa6f6c..04688772b9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OrderItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class OrderItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -174,8 +173,7 @@ public class OrderItemProvider extends CDOItemProviderAdapter
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
-        CompanyFactory.eINSTANCE.createOrderDetail()));
+    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS, CompanyFactory.eINSTANCE.createOrderDetail()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index c6a00d6a50..d08f5378bb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -39,9 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ProductItemProvider extends CDOItemProviderAdapter
-    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-    IItemPropertySource, IItemColorProvider, IItemFontProvider
+public class ProductItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +80,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -96,11 +92,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addOrderDetailsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_orderDetails_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_orderDetails_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +104,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addVatPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_vat_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_vat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -125,12 +116,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_description_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -142,12 +130,9 @@ public class ProductItemProvider extends CDOItemProviderAdapter
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -190,8 +175,7 @@ public class ProductItemProvider extends CDOItemProviderAdapter
   public String getText(Object object)
   {
     String label = ((Product)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Product_type")
-        : getString("_UI_Product_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Product_type") : getString("_UI_Product_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 873e0e8e09..8f460dc610 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -67,14 +67,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_PurchaseOrder_date_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature",
-                    "_UI_PurchaseOrder_type"),
-                CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PurchaseOrder_date_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature", "_UI_PurchaseOrder_type"),
+        CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -84,12 +80,10 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addSupplierPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
-                "_UI_PurchaseOrder_type"),
-            CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PurchaseOrder_supplier_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature", "_UI_PurchaseOrder_type"),
+        CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
   }
 
   /**
@@ -123,8 +117,7 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
   {
     Date labelValue = ((PurchaseOrder)object).getDate();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type")
-        : getString("_UI_PurchaseOrder_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_PurchaseOrder_type") : getString("_UI_PurchaseOrder_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
index 49898e0000..3e50c7323c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
@@ -66,12 +66,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_SalesOrder_id_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
-            CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_SalesOrder_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
+        CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -81,11 +78,9 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addCustomerPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_SalesOrder_customer_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
-            CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_SalesOrder_customer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
+        CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index de7b9968e7..7c4c36721c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -66,11 +66,10 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPurchaseOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Supplier_purchaseOrders_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
-            CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Supplier_purchaseOrders_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
+        CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -80,12 +79,9 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPreferredPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Supplier_preferred_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
-            CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Supplier_preferred_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
+        CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -118,8 +114,7 @@ public class SupplierItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Supplier)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Supplier_type")
-        : getString("_UI_Supplier_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Supplier_type") : getString("_UI_Supplier_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
index 24b5c4e7fe..407d7077a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.impl;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.util;version="4.0.400",
- org.eclipse.emf.cdo.examples.company.validation;version="4.0.400"
+Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.impl;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.util;version="4.0.500",
+ org.eclipse.emf.cdo.examples.company.validation;version="4.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
index f790ffadc4..3b2875b91c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
@@ -171,8 +171,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory
     VAT result = VAT.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
index ec355db211..1fdeca3655 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
@@ -146,9 +146,8 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     }
 
     // Obtain or create and register package
-    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new CompanyPackageImpl());
+    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CompanyPackageImpl());
 
     isInited = true;
 
@@ -636,98 +635,79 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     salesOrderEClass.getESuperTypes().add(getOrder());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAddressable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddressable_Street(), ecorePackage.getEString(), "street", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddressable_City(), ecorePackage.getEString(), "city", null, 0, 1, Addressable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
-        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
-        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
-        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
-        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
-        Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, Product.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(vatEEnum, org.eclipse.emf.cdo.examples.company.VAT.class, "VAT");
@@ -754,11 +734,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     addAnnotation(this, source, new String[] { "value",
         "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
-    addAnnotation(getCategory_Name(), source,
-        new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
+    addAnnotation(getCategory_Name(), source, new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
     addAnnotation(getProduct_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(getProduct_Vat(), source,
-        new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
+    addAnnotation(getProduct_Vat(), source, new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
   }
 
 } // CompanyPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index 6ed5249fed..021323f736 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class BusinessDayItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_BusinessDay_date_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
-            BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_date_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -96,11 +93,10 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addMenuCardPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_BusinessDay_menuCard_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
-            BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_menuCard_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
   }
 
   /**
@@ -110,14 +106,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addClosedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_BusinessDay_closed_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature",
-                    "_UI_BusinessDay_type"),
-                BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_closed_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -233,11 +224,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
 
-    newChildDescriptors.add(
-        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index d551fabc05..6a14a7331c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 866f1ac584..2fe4c796fb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderDetailItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addOfferingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_OrderDetail_offering_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
-            BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_offering_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
   }
 
   /**
@@ -93,14 +92,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_quantity_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_quantity_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -110,14 +105,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addStatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_state_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_state_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -127,14 +117,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -177,8 +162,7 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     OrderDetail orderDetail = (OrderDetail)object;
-    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type")
-        : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
+    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type") : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index 57482a3381..0852403b26 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addTablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Order_table_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
-            BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Order_table_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
+        BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +91,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNumberPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Order_number_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
-            BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Order_number_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
+        BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -210,8 +205,7 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS,
-        BusinessFactory.eINSTANCE.createOrderDetail()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS, BusinessFactory.eINSTANCE.createOrderDetail()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index d108c09739..297b2a2095 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class WaiterItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addTablesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_tables_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_tables_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
   }
 
   /**
@@ -93,11 +91,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addEmployeePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_employee_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_employee_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
   }
 
   /**
@@ -107,12 +103,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addFromPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_from_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_from_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -122,12 +115,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addUntilPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_until_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_until_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
index 51cbd6f9a9..6676b6d2af 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.business;version="4.0.400",
- org.gastro.business.impl;version="4.0.400",
- org.gastro.business.util;version="4.0.400"
+Export-Package: org.gastro.business;version="4.0.500",
+ org.gastro.business.impl;version="4.0.500",
+ org.gastro.business.util;version="4.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index aaf1e9edde..e58356583b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -43,8 +43,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
   {
     try
     {
-      BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.gastro.org/business/1.0");
+      BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/business/1.0");
       if (theBusinessFactory != null)
       {
         return theBusinessFactory;
@@ -170,8 +169,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
     OrderState result = OrderState.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index 6ccd6762e2..cf449f317a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -109,9 +109,8 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     }
 
     // Obtain or create and register package
-    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new BusinessPackageImpl());
+    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BusinessPackageImpl());
 
     isInited = true;
 
@@ -435,8 +434,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE
-        .getEPackage(InventoryPackage.eNS_URI);
+    InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
 
     // Create type parameters
 
@@ -445,64 +443,51 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
-        Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(orderStateEEnum, OrderState.class, "OrderState");
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 84429271f4..74cedd8790 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class DepartmentItemProvider extends StationItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -168,14 +168,11 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES,
-        InventoryFactory.eINSTANCE.createEmployee()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES, InventoryFactory.eINSTANCE.createEmployee()));
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index 17739155e6..70d4b36288 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class EmployeeItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Employee_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
-            InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Employee_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
+        InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 47263a0c6f..80f2dc4505 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class IngredientItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -77,11 +77,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Ingredient_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
-            InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Ingredient_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
+        InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -91,14 +89,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Ingredient_quantity_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature",
-                    "_UI_Ingredient_type"),
-                InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Ingredient_quantity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature", "_UI_Ingredient_type"),
+        InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -143,8 +136,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
   public String getText(Object object)
   {
     Ingredient ingredient = (Ingredient)object;
-    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type")
-        : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
+    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type") : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index 0f878076c1..c6719bb48a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 67bf336330..d0165b9976 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class MenuCardItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_MenuCard_title_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
-            InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_MenuCard_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
+        InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -198,8 +195,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS,
-        InventoryFactory.eINSTANCE.createSection()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS, InventoryFactory.eINSTANCE.createSection()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 0aee60e852..ca2307643a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OfferingItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,11 +79,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +91,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -108,14 +103,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Offering_description_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature",
-                    "_UI_Offering_type"),
-                InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -125,12 +115,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index f676dd3475..cbb9a03ea5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class ProductItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-            InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+        InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 99966c527f..72fdd8dcfe 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RecipeItemProvider extends ProductItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Recipe_cost_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
-            InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Recipe_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
+        InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -185,8 +182,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS,
-        InventoryFactory.eINSTANCE.createIngredient()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS, InventoryFactory.eINSTANCE.createIngredient()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index 8df3223e09..ea9b267d36 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RestaurantItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Restaurant_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
-            InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Restaurant_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
+        InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -94,11 +91,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addStationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Restaurant_stations_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
-            InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Restaurant_stations_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
+        InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -217,14 +212,11 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS,
-        InventoryFactory.eINSTANCE.createDepartment()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS, InventoryFactory.eINSTANCE.createDepartment()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS,
-        InventoryFactory.eINSTANCE.createMenuCard()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS, InventoryFactory.eINSTANCE.createMenuCard()));
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 1bfbce1a21..c48d3351dd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class SectionItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Section_title_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
-            InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Section_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
+        InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -94,12 +91,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addTextPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Section_text_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
-            InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Section_text_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
+        InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -215,8 +209,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS,
-        InventoryFactory.eINSTANCE.createOffering()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS, InventoryFactory.eINSTANCE.createOffering()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index aa36005f76..6eb02eb33d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StationItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addStationIDPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Station_stationID_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
-            InventoryPackage.Literals.STATION__STATION_ID, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Station_stationID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
+        InventoryPackage.Literals.STATION__STATION_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index 30d4d27fcc..9f3e5fc7df 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Stock_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
-            InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Stock_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
+        InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -198,8 +195,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS,
-        InventoryFactory.eINSTANCE.createStockProduct()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS, InventoryFactory.eINSTANCE.createStockProduct()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index 2a8f4ff5c8..594c454d98 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockProductItemProvider extends ProductItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,14 +76,9 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_StockProduct_cost_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature",
-                    "_UI_StockProduct_type"),
-                InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -93,13 +88,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addAvailablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_StockProduct_available_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature",
-                "_UI_StockProduct_type"),
-            InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_available_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -109,13 +101,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addOrderLimitPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
-                "_UI_StockProduct_type"),
-            InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_orderLimit_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index efec05d89c..043ae6cd9c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class TableItemProvider extends StationItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,12 +74,9 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
    */
   protected void addSeatsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Table_seats_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
-            InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Table_seats_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
+        InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
index 3463c7e000..97c6eb6ee6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.inventory;version="4.0.400",
- org.gastro.inventory.impl;version="4.0.400",
- org.gastro.inventory.util;version="4.0.400"
+Export-Package: org.gastro.inventory;version="4.0.500",
+ org.gastro.inventory.impl;version="4.0.500",
+ org.gastro.inventory.util;version="4.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 26f888e90d..bab3335017 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -49,8 +49,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
   {
     try
     {
-      InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.gastro.org/inventory/1.0");
+      InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/inventory/1.0");
       if (theInventoryFactory != null)
       {
         return theInventoryFactory;
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index fdd5ff8c6f..2466c1b3a6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -178,9 +178,8 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
     }
 
     // Obtain or create and register package
-    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new InventoryPackageImpl());
+    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InventoryPackageImpl());
 
     isInited = true;
 
@@ -865,139 +864,112 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
     // Initialize classes and features; add operations and parameters
     initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
-        Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
-        Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(productEClass, ecorePackage.getEFloat(), "getCost", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-    initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+    initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
-        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
-
-    initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1, Restaurant.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+    initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1, Department.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
-        Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
-        Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(stationEClass, Station.class, "Station", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
-        Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.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/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 205b6faf64..4fed648bab 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.400";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
index 0dbf576886..38b5a5413a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
@@ -130,8 +130,7 @@ public class OrdersView extends ViewPart
             {
               public Object execute(OrderDetail orderDetail)
               {
-                orderDetail
-                    .setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
+                orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
                 return null;
               }
             });
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.core.prefs
index 974b3ff926..02375399fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
index e1d72181ba..8b18200385 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
@@ -52,8 +52,7 @@ public class StandaloneManualExample
     IBufferProvider bufferProvider = Net4jUtil.createBufferPool();
     LifecycleUtil.activate(bufferProvider);
 
-    IProtocolProvider protocolProvider = new FactoriesProtocolProvider(
-        new org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocolFactory());
+    IProtocolProvider protocolProvider = new FactoriesProtocolProvider(new org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocolFactory());
 
     // Prepare selector
     org.eclipse.net4j.internal.tcp.TCPSelector selector = new org.eclipse.net4j.internal.tcp.TCPSelector();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
index 1324da2fa9..163af51d24 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
@@ -48,8 +48,7 @@ public class VariousExamples
 
   public static void registerSessionWithPluginContainer() throws CommitException
   {
-    CDONet4jSession session = (CDONet4jSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions",
-        "cdo", "tcp://repos.foo.org:2036/MyRepo");
+    CDONet4jSession session = (CDONet4jSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo", "tcp://repos.foo.org:2036/MyRepo");
     CDOTransaction transaction = session.openTransaction();
     // ...
     transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index 8f45e60d1d..21400a04f0 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -191,8 +191,7 @@ public abstract class FailoverExample
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -256,8 +255,7 @@ public abstract class FailoverExample
 
   protected IRepositorySynchronizer createRepositorySynchronizer(String peerHost, int peerPort, String repositoryName)
   {
-    CDOSessionConfigurationFactory factory = createSessionConfigurationFactory(peerHost + ":" + peerPort,
-        repositoryName);
+    CDOSessionConfigurationFactory factory = createSessionConfigurationFactory(peerHost + ":" + peerPort, repositoryName);
 
     IRepositorySynchronizer synchronizer = CDOServerUtil.createRepositorySynchronizer(factory);
     synchronizer.setRetryInterval(2);
@@ -266,8 +264,7 @@ public abstract class FailoverExample
     return synchronizer;
   }
 
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {
@@ -316,8 +313,7 @@ public abstract class FailoverExample
     protected IRepository createRepository(IStore store, Map<String, String> props)
     {
       IRepositorySynchronizer synchronizer = createRepositorySynchronizer(peerHost, peerPort, peerRepository);
-      ISynchronizableRepository repository = CDOServerUtil.createFailoverParticipant(name, store, props, synchronizer,
-          master);
+      ISynchronizableRepository repository = CDOServerUtil.createFailoverParticipant(name, store, props, synchronizer, master);
       repository.setInitialPackages(CompanyPackage.eINSTANCE);
       return repository;
     }
@@ -438,8 +434,7 @@ public abstract class FailoverExample
       FailoverAgent agent = new FailoverAgent()
       {
         @Override
-        protected org.eclipse.emf.cdo.session.CDOSessionConfiguration createSessionConfiguration(
-            String connectorDescription, String repositoryName)
+        protected org.eclipse.emf.cdo.session.CDOSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName)
         {
           return Monitored.this.createSessionConfiguration(connectorDescription, repositoryName);
         }
@@ -470,8 +465,7 @@ public abstract class FailoverExample
       public static void main(String[] args) throws Exception
       {
         IManagedContainer container = createContainer();
-        FailoverMonitor monitor = (FailoverMonitor)container.getElement(FailoverMonitor.PRODUCT_GROUP, "net4j",
-            REPOSITORY_GROUP);
+        FailoverMonitor monitor = (FailoverMonitor)container.getElement(FailoverMonitor.PRODUCT_GROUP, "net4j", REPOSITORY_GROUP);
 
         monitor.addListener(new ContainerEventAdapter<AgentProtocol>()
         {
@@ -554,8 +548,8 @@ public abstract class FailoverExample
       public static void main(String[] args) throws Exception
       {
         IManagedContainer container = createContainer();
-        CDONet4jSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(
-            REPOSITORY_MONITOR_HOST + ":" + REPOSITORY_MONITOR_PORT, REPOSITORY_GROUP, container);
+        CDONet4jSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(REPOSITORY_MONITOR_HOST + ":" + REPOSITORY_MONITOR_PORT,
+            REPOSITORY_GROUP, container);
 
         final CDONet4jSession session = configuration.openNet4jSession();
         System.out.println("Connected");
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 25b7a5b1e8..42b3475e22 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -180,8 +180,7 @@ public abstract class AbstractOfflineExampleServer
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -205,8 +204,7 @@ public abstract class AbstractOfflineExampleServer
 
   protected IAcceptor createAcceptor()
   {
-    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "0.0.0.0:" + port);
+    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE, "0.0.0.0:" + port);
   }
 
   protected void disconnect()
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
index 7faf4cc0e4..a433e6ff27 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
@@ -177,8 +177,7 @@ public class OfflineExampleClient
 
     System.out.println("Client starting...");
     IManagedContainer container = OfflineExampleUtil.createContainer();
-    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "localhost:" + PORT);
+    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE, "localhost:" + PORT);
 
     CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
     configuration.setConnector(connector);
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4c20a676fd..f22befc593 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -48,8 +48,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
   @Override
   protected IRepository createRepository(IStore store, Map<String, String> props)
   {
-    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT,
-        OfflineExampleUtil.MASTER_NAME);
+    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT, OfflineExampleUtil.MASTER_NAME);
     return CDOServerUtil.createOfflineClone(name, store, props, synchronizer);
   }
 
@@ -71,8 +70,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
    * creates a CDOSessionConfigurationFactory for the offline clone. It instantiates a connection to the master
    * repository.
    */
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/DeleteElementsDialog.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/DeleteElementsDialog.java
index d5cc0e447f..3e790c127f 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/DeleteElementsDialog.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/DeleteElementsDialog.java
@@ -73,8 +73,7 @@ public class DeleteElementsDialog extends TitleAreaDialog
       getShell().setText(title);
       setTitle(title);
       setTitleImage(OM.getImage("icons/wiz/delete_" + type.toLowerCase() + ".gif"));
-      setMessage("Are you sure you want to delete " + (size == 1 ? "this" : "these") + " " + size + " "
-          + (size == 1 ? type : types).toLowerCase() + "?");
+      setMessage("Are you sure you want to delete " + (size == 1 ? "this" : "these") + " " + size + " " + (size == 1 ? type : types).toLowerCase() + "?");
 
       Composite container = new Composite(area, SWT.NONE);
       container.setLayoutData(new GridData(GridData.FILL_BOTH));
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/ViewerUtil.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/ViewerUtil.java
index f7b11b1e36..608292c3ee 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/ViewerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/ViewerUtil.java
@@ -89,8 +89,7 @@ public final class ViewerUtil
     refresh(viewer, element, async, false);
   }
 
-  public static void refresh(final StructuredViewer viewer, final Object element, boolean async,
-      final boolean setSelectionBack)
+  public static void refresh(final StructuredViewer viewer, final Object element, boolean async, final boolean setSelectionBack)
   {
     if (viewer != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java
index dd55707f9a..0f93e577d5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/application/CDOExplorerPerspective.java
@@ -62,26 +62,22 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
 
   protected void addViews()
   {
-    IFolderLayout checkoutArea = pageLayout.createFolder(CHECKOUT_AREA, IPageLayout.LEFT, 0.30f,
-        pageLayout.getEditorArea());
+    IFolderLayout checkoutArea = pageLayout.createFolder(CHECKOUT_AREA, IPageLayout.LEFT, 0.30f, pageLayout.getEditorArea());
     checkoutArea.addView(IPageLayout.ID_PROJECT_EXPLORER);
 
     IFolderLayout repositoryArea = pageLayout.createFolder(REPOSITORY_AREA, IPageLayout.BOTTOM, 0.70f, CHECKOUT_AREA);
     repositoryArea.addView(CDORepositoriesView.ID);
 
-    IFolderLayout propertiesArea = pageLayout.createFolder(PROPERTIES_AREA, IPageLayout.BOTTOM, 0.70f,
-        pageLayout.getEditorArea());
+    IFolderLayout propertiesArea = pageLayout.createFolder(PROPERTIES_AREA, IPageLayout.BOTTOM, 0.70f, pageLayout.getEditorArea());
     propertiesArea.addView(IPageLayout.ID_PROP_SHEET);
     propertiesArea.addView(ShowInActionProvider.HISTORY_VIEW_ID);
     propertiesArea.addView(CDOWatchListView.ID);
     propertiesArea.addView(CDORemoteSessionsView.ID);
 
-    IFolderLayout outlineArea = pageLayout.createFolder(OUTLINE_AREA, IPageLayout.RIGHT, 0.70f,
-        pageLayout.getEditorArea());
+    IFolderLayout outlineArea = pageLayout.createFolder(OUTLINE_AREA, IPageLayout.RIGHT, 0.70f, pageLayout.getEditorArea());
     outlineArea.addView(IPageLayout.ID_OUTLINE);
 
-    IPlaceholderFolderLayout auditingArea = pageLayout.createPlaceholderFolder(AUDITING_AREA, IPageLayout.BOTTOM, 0.84f,
-        pageLayout.getEditorArea());
+    IPlaceholderFolderLayout auditingArea = pageLayout.createPlaceholderFolder(AUDITING_AREA, IPageLayout.BOTTOM, 0.84f, pageLayout.getEditorArea());
     auditingArea.addPlaceholder(CDOTimeMachineView.ID);
   }
 
@@ -107,8 +103,7 @@ public class CDOExplorerPerspective implements IPerspectiveFactory
   {
     try
     {
-      return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
-          .equals(CDOExplorerPerspective.ID);
+      return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId().equals(CDOExplorerPerspective.ID);
     }
     catch (Throwable ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
index be6f2f8d1d..1623cd01cf 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
@@ -154,8 +154,7 @@ public interface CDOCheckoutContentModifier
           String type = key.getType();
           if (deltaKind == IContainerDelta.Kind.ADDED)
           {
-            CDOCheckoutContentModifier modifier = (CDOCheckoutContentModifier)IPluginContainer.INSTANCE
-                .getElement(Factory.PRODUCT_GROUP, type, null);
+            CDOCheckoutContentModifier modifier = (CDOCheckoutContentModifier)IPluginContainer.INSTANCE.getElement(Factory.PRODUCT_GROUP, type, null);
 
             synchronized (modifiers)
             {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
index 650a9b9646..59595e1fcf 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
@@ -115,8 +115,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
 
   private static final Set<Object> LOADING_OBJECTS = new HashSet<Object>();
 
-  private static final Method GET_CHILDREN_FEATURES_METHOD = getMethod(ItemProviderAdapter.class, "getChildrenFeatures",
-      Object.class);
+  private static final Method GET_CHILDREN_FEATURES_METHOD = getMethod(ItemProviderAdapter.class, "getChildrenFeatures", Object.class);
 
   private static final Method FIND_ITEM_METHOD = getMethod(StructuredViewer.class, "findItem", Object.class);
 
@@ -419,8 +418,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
           {
             try
             {
-              ITreeItemContentProvider provider = (ITreeItemContentProvider)stateManager.adapt(object,
-                  ITreeItemContentProvider.class);
+              ITreeItemContentProvider provider = (ITreeItemContentProvider)stateManager.adapt(object, ITreeItemContentProvider.class);
               if (provider instanceof ItemProviderAdapter)
               {
                 return hasChildren(cdoObject, revision, (ItemProviderAdapter)provider);
@@ -560,8 +558,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
                 CDOView view = cdoObject.cdoView();
                 CDORevisionManager revisionManager = view.getSession().getRevisionManager();
 
-                List<CDORevision> revisions = revisionManager.getRevisions(missingIDs, view, CDORevision.UNCHUNKED,
-                    CDORevision.DEPTH_NONE, true);
+                List<CDORevision> revisions = revisionManager.getRevisions(missingIDs, view, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
                 loadedRevisions.addAll(revisions);
               }
 
@@ -717,8 +714,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
         {
           try
           {
-            ITreeItemContentProvider provider = (ITreeItemContentProvider)stateManager.adapt(object,
-                ITreeItemContentProvider.class);
+            ITreeItemContentProvider provider = (ITreeItemContentProvider)stateManager.adapt(object, ITreeItemContentProvider.class);
             if (provider instanceof ItemProviderAdapter)
             {
               determineChildRevisions(cdoObject, revision, (ItemProviderAdapter)provider, loadedRevisions, missingIDs);
@@ -946,8 +942,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
     return (InternalCDOObject)CDOUtil.getCDOObject(eObject, false);
   }
 
-  private static boolean hasChildren(InternalCDOObject cdoObject, InternalCDORevision revision,
-      ItemProviderAdapter provider) throws Exception
+  private static boolean hasChildren(InternalCDOObject cdoObject, InternalCDORevision revision, ItemProviderAdapter provider) throws Exception
   {
     for (EStructuralFeature feature : getChildrenFeatures(cdoObject, provider))
     {
@@ -967,8 +962,8 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
     return false;
   }
 
-  private static void determineChildRevisions(InternalCDOObject cdoObject, InternalCDORevision revision,
-      ItemProviderAdapter provider, List<CDORevision> loadedRevisions, List<CDOID> missingIDs) throws Exception
+  private static void determineChildRevisions(InternalCDOObject cdoObject, InternalCDORevision revision, ItemProviderAdapter provider,
+      List<CDORevision> loadedRevisions, List<CDOID> missingIDs) throws Exception
   {
     InternalCDOView view = cdoObject.cdoView();
     InternalCDORevisionCache revisionCache = view.getSession().getRevisionManager().getCache();
@@ -991,8 +986,8 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
     }
   }
 
-  private static void determineChildRevision(List<CDORevision> loadedRevisions, List<CDOID> missingIDs,
-      InternalCDOView view, InternalCDORevisionCache cache, Object object)
+  private static void determineChildRevision(List<CDORevision> loadedRevisions, List<CDOID> missingIDs, InternalCDOView view, InternalCDORevisionCache cache,
+      Object object)
   {
     if (object instanceof CDOID)
     {
@@ -1010,8 +1005,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
   }
 
   @SuppressWarnings("unchecked")
-  private static Collection<? extends EStructuralFeature> getChildrenFeatures(InternalCDOObject cdoObject,
-      ItemProviderAdapter provider) throws Exception
+  private static Collection<? extends EStructuralFeature> getChildrenFeatures(InternalCDOObject cdoObject, ItemProviderAdapter provider) throws Exception
   {
     return (Collection<? extends EStructuralFeature>)GET_CHILDREN_FEATURES_METHOD.invoke(provider, cdoObject);
   }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
index 3dc74f0422..55ae5397b7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutDropAdapterAssistant.java
@@ -184,8 +184,7 @@ public class CDOCheckoutDropAdapterAssistant extends CommonDropAdapterAssistant
     return Status.CANCEL_STATUS;
   }
 
-  private static Pair<CDOBranchPoint, CDOCheckout> getSelectedBranchPoint(Object target, int dropOperation,
-      TransferData transferType)
+  private static Pair<CDOBranchPoint, CDOCheckout> getSelectedBranchPoint(Object target, int dropOperation, TransferData transferType)
   {
     // Drag within Eclipse?
     if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
@@ -395,8 +394,7 @@ public class CDOCheckoutDropAdapterAssistant extends CommonDropAdapterAssistant
 
     public final void drop(final boolean copy)
     {
-      final String title = (copy ? "Copy " : "Move ")
-          + (ObjectType.valueFor(objects[0]) == ObjectType.Object ? "objects" : "resource nodes");
+      final String title = (copy ? "Copy " : "Move ") + (ObjectType.valueFor(objects[0]) == ObjectType.Object ? "objects" : "resource nodes");
 
       new Job(title)
       {
@@ -538,8 +536,7 @@ public class CDOCheckoutDropAdapterAssistant extends CommonDropAdapterAssistant
       return null;
     }
 
-    private static void setUniqueName(CDOResourceNode resourceNode, EList<? extends EObject> targetContents,
-        boolean copy)
+    private static void setUniqueName(CDOResourceNode resourceNode, EList<? extends EObject> targetContents, boolean copy)
     {
       boolean nameConflict = false;
       String resourceName = resourceNode.getName();
@@ -754,8 +751,7 @@ public class CDOCheckoutDropAdapterAssistant extends CommonDropAdapterAssistant
       }
 
       @Override
-      protected void insert(List<? extends EObject> objects, CDOResourceFolder target, boolean copy,
-          IProgressMonitor monitor)
+      protected void insert(List<? extends EObject> objects, CDOResourceFolder target, boolean copy, IProgressMonitor monitor)
       {
         EList<CDOResourceNode> nodes = target.getNodes();
         for (EObject object : objects)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
index 419cc58fb1..e2722fabb0 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
@@ -39,11 +39,9 @@ import org.eclipse.ui.navigator.ICommonLabelProvider;
 /**
  * @author Eike Stepper
  */
-public class CDOCheckoutLabelProvider extends LabelProvider
-    implements ICommonLabelProvider, IColorProvider, IStyledLabelProvider
+public class CDOCheckoutLabelProvider extends LabelProvider implements ICommonLabelProvider, IColorProvider, IStyledLabelProvider
 {
-  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages()
-      .getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
 
   private static final IEditorRegistry EDITOR_REGISTRY = PlatformUI.getWorkbench().getEditorRegistry();
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
index b3344f5733..2fc81d256d 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
@@ -70,8 +70,7 @@ public final class CDOCheckoutState
 
   private static final Image FOLDER_IMAGE = OM.getImage("icons/CDOResourceFolder.gif");
 
-  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages()
-      .getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
 
   private static final IEditorRegistry EDITOR_REGISTRY = PlatformUI.getWorkbench().getEditorRegistry();
 
@@ -337,8 +336,7 @@ public final class CDOCheckoutState
   /**
    * @author Eike Stepper
    */
-  public static final class LabelProvider extends AdapterFactoryLabelProvider
-      implements IColorProvider, IStyledLabelProvider
+  public static final class LabelProvider extends AdapterFactoryLabelProvider implements IColorProvider, IStyledLabelProvider
   {
     private final CDOCheckoutState checkoutState;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerRefresh.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerRefresh.java
index c7135843fb..5a6d8d8832 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerRefresh.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutViewerRefresh.java
@@ -109,8 +109,7 @@ public final class CDOCheckoutViewerRefresh extends ViewerRefresh
       }
       else
       {
-        RunnableViewerNotification newResult = new RunnableViewerNotification(result.getElement(),
-            result.isContentRefresh(), result.isLabelUpdate());
+        RunnableViewerNotification newResult = new RunnableViewerNotification(result.getElement(), result.isContentRefresh(), result.isLabelUpdate());
         newResult.getRunnables().addAll(runnables);
         result = newResult;
       }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
index ab53a1fdec..cdb935b364 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
@@ -57,8 +57,7 @@ public class CDOModelEditorOpener extends CDOEditorOpener.Default
     CDOCheckout checkout = CDOExplorerUtil.getCheckout(uri);
     if (checkout == null)
     {
-      MessageDialog.openError(page.getWorkbenchWindow().getShell(), "Error",
-          "The checkout for " + uri + " could not be found.");
+      MessageDialog.openError(page.getWorkbenchWindow().getShell(), "Error", "The checkout for " + uri + " could not be found.");
       return null;
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/ResourceGroup.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/ResourceGroup.java
index b08d79e7e4..c83715dcdc 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/ResourceGroup.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/ResourceGroup.java
@@ -127,8 +127,7 @@ public class ResourceGroup extends CDOElement
                   }
 
                   CDOCheckoutManagerImpl checkoutManager = (CDOCheckoutManagerImpl)CDOExplorerUtil.getCheckoutManager();
-                  checkoutManager.fireElementChangedEvent(ElementsChangedEvent.StructuralImpact.PARENT,
-                      ResourceGroup.this);
+                  checkoutManager.fireElementChangedEvent(ElementsChangedEvent.StructuralImpact.PARENT, ResourceGroup.this);
                 }
 
                 return Status.OK_STATUS;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/AbstractBranchPointActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/AbstractBranchPointActionProvider.java
index 762cd945d3..dac9f4b7b4 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/AbstractBranchPointActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/AbstractBranchPointActionProvider.java
@@ -42,8 +42,7 @@ public abstract class AbstractBranchPointActionProvider extends AbstractActionPr
 {
   private static final ImageDescriptor CHECKOUT_IMAGE_DESCRIPTOR = OM.getImageDescriptor("icons/checkout.gif");
 
-  private static final ImageDescriptor CHECKOUT_CLOSED_IMAGE_DESCRIPTOR = OM
-      .getImageDescriptor("icons/checkout_closed.gif");
+  private static final ImageDescriptor CHECKOUT_CLOSED_IMAGE_DESCRIPTOR = OM.getImageDescriptor("icons/checkout_closed.gif");
 
   public AbstractBranchPointActionProvider(String id, String title)
   {
@@ -106,8 +105,7 @@ public abstract class AbstractBranchPointActionProvider extends AbstractActionPr
           continue;
         }
 
-        if (otherCheckout.getBranchID() == checkout.getBranchID()
-            && otherCheckout.getTimeStamp() == checkout.getTimeStamp())
+        if (otherCheckout.getBranchID() == checkout.getBranchID() && otherCheckout.getTimeStamp() == checkout.getTimeStamp())
         {
           continue;
         }
@@ -117,8 +115,7 @@ public abstract class AbstractBranchPointActionProvider extends AbstractActionPr
     }
   }
 
-  protected void fillHistorizedAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout,
-      CDOBranchPoint branchPoint)
+  protected void fillHistorizedAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout, CDOBranchPoint branchPoint)
   {
     subMenu.add(new HistorizedBranchPointAction(page, checkout, branchPoint));
   }
@@ -138,8 +135,7 @@ public abstract class AbstractBranchPointActionProvider extends AbstractActionPr
     subMenu.add(new CommitBranchPointAction(page, checkout));
   }
 
-  protected void fillOtherCheckoutAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout,
-      CDOCheckout otherCheckout)
+  protected void fillOtherCheckoutAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout, CDOCheckout otherCheckout)
   {
     subMenu.add(new OtherCheckoutAction(page, checkout, otherCheckout));
   }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/CDOCheckoutDashboard.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/CDOCheckoutDashboard.java
index 58cc2ad818..4abded33d8 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/CDOCheckoutDashboard.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/CDOCheckoutDashboard.java
@@ -330,8 +330,7 @@ public class CDOCheckoutDashboard extends Composite implements ISelectionListene
 
       Label label = new Label(this, SWT.WRAP);
       label.setForeground(getDisplay().getSystemColor(SWT.COLOR_DARK_BLUE));
-      label.setText("This dashboard is context-sensitive. "
-          + "Select checkouts or models to show view and transaction controls.");
+      label.setText("This dashboard is context-sensitive. " + "Select checkouts or models to show view and transaction controls.");
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
index f6a191fe8a..2c4defc87c 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
@@ -117,8 +117,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
       CDOCheckoutContentProvider contentProvider = getContentProvider();
       IWizardRegistry wrapperRegistry = new WizardRegistryWrapper(contentProvider);
 
-      newWizardActionGroup = new WizardActionGroup(window, wrapperRegistry, WizardActionGroup.TYPE_NEW,
-          extensionSite.getContentService());
+      newWizardActionGroup = new WizardActionGroup(window, wrapperRegistry, WizardActionGroup.TYPE_NEW, extensionSite.getContentService());
 
       viewer = (TreeViewer)extensionSite.getStructuredViewer();
       viewer.addSelectionChangedListener(this);
@@ -342,8 +341,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
       String toolTipText = delegate.getToolTipText();
       ImageDescriptor imageDescriptor = delegate.getImageDescriptor();
 
-      NewChildAction action = new NewChildAction(text, toolTipText, imageDescriptor, checkout, cdoObject,
-          childDescriptor);
+      NewChildAction action = new NewChildAction(text, toolTipText, imageDescriptor, checkout, cdoObject, childDescriptor);
       menu.add(action);
     }
   }
@@ -503,8 +501,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
 
     private EObject newObject;
 
-    public AbstractNewAction(String text, String toolTipText, ImageDescriptor image, CDOCheckout checkout,
-        CDOObject parent)
+    public AbstractNewAction(String text, String toolTipText, ImageDescriptor image, CDOCheckout checkout, CDOObject parent)
     {
       super(page, text, toolTipText, image, parent);
       this.checkout = checkout;
@@ -585,8 +582,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
     @Override
     protected void preRun() throws Exception
     {
-      SelectClassDialog dialog = new SelectClassDialog(page, "New Root Object",
-          "Select a package and a class for the new root object.");
+      SelectClassDialog dialog = new SelectClassDialog(page, "New Root Object", "Select a package and a class for the new root object.");
 
       if (dialog.open() == SelectClassDialog.OK)
       {
@@ -615,8 +611,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
   {
     private final Object childDescriptor;
 
-    public NewChildAction(String text, String toolTipText, ImageDescriptor image, CDOCheckout checkout,
-        CDOObject parent, Object childDescriptor)
+    public NewChildAction(String text, String toolTipText, ImageDescriptor image, CDOCheckout checkout, CDOObject parent, Object childDescriptor)
     {
       super(text, toolTipText, image, checkout, parent);
       this.childDescriptor = childDescriptor;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
index 658c9d627d..ddcd7dc8d7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
@@ -271,8 +271,7 @@ public class OpenWithActionProvider extends CommonActionProvider
   // }.schedule();
   // }
 
-  public static void openEditor(IWorkbenchPage page, ComposedAdapterFactory adapterFactory, EObject object,
-      String editorOpenerID)
+  public static void openEditor(IWorkbenchPage page, ComposedAdapterFactory adapterFactory, EObject object, String editorOpenerID)
   {
     if (page == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
index 55247467f5..7ee0db4880 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
@@ -116,8 +116,7 @@ public class ShowInActionProvider extends AbstractActionProvider<Object>
     return fillMenu(page, viewer, subMenu, selectedElement);
   }
 
-  public static boolean fillMenu(IWorkbenchPage page, StructuredViewer viewer, IMenuManager menu,
-      Object selectedElement)
+  public static boolean fillMenu(IWorkbenchPage page, StructuredViewer viewer, IMenuManager menu, Object selectedElement)
   {
     boolean filled = false;
 
@@ -510,8 +509,7 @@ public class ShowInActionProvider extends AbstractActionProvider<Object>
     @Override
     protected void run(IViewPart viewPart) throws Exception
     {
-      CDOCheckoutContentProvider checkoutContentProvider = CDOCheckoutContentProvider
-          .getInstance(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
+      CDOCheckoutContentProvider checkoutContentProvider = CDOCheckoutContentProvider.getInstance(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
       if (checkoutContentProvider != null)
       {
         checkoutContentProvider.selectObjects((Object[])checkouts);
@@ -609,12 +607,11 @@ public class ShowInActionProvider extends AbstractActionProvider<Object>
 
       String description = repository.getURI();
       int lastSlash = description.lastIndexOf('/');
-      description = description.substring(0, lastSlash) + "?repositoryName=" + repository.getName()
-          + "&automaticPackageRegistry=true&repositoryID=" + repository.getID();
+      description = description.substring(0, lastSlash) + "?repositoryName=" + repository.getName() + "&automaticPackageRegistry=true&repositoryID="
+          + repository.getID();
 
-      return (CDOSession)IPluginContainer.INSTANCE.getElement(CDOSessionFactory.PRODUCT_GROUP, "cdo",
-          repository.getConnectorType() + "://" + repository.getConnectorDescription() + "?repositoryName="
-              + repository.getName() + "&repositoryID=" + repository.getID());
+      return (CDOSession)IPluginContainer.INSTANCE.getElement(CDOSessionFactory.PRODUCT_GROUP, "cdo", repository.getConnectorType() + "://"
+          + repository.getConnectorDescription() + "?repositoryName=" + repository.getName() + "&repositoryID=" + repository.getID());
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
index d36823eb72..fbdc2ce5fe 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
@@ -44,8 +44,7 @@ public class SwitchToActionProvider extends AbstractBranchPointActionProvider
   }
 
   @Override
-  protected void fillHistorizedAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout,
-      CDOBranchPoint branchPoint)
+  protected void fillHistorizedAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout, CDOBranchPoint branchPoint)
   {
     if (checkout.isReadOnly() || branchPoint.getTimeStamp() == CDOBranchPoint.UNSPECIFIED_DATE)
     {
@@ -81,8 +80,7 @@ public class SwitchToActionProvider extends AbstractBranchPointActionProvider
   }
 
   @Override
-  protected void fillOtherCheckoutAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout,
-      CDOCheckout otherCheckout)
+  protected void fillOtherCheckoutAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout, CDOCheckout otherCheckout)
   {
     if (checkout.isReadOnly() == otherCheckout.isReadOnly())
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutTypePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutTypePage.java
index 3e7c4ba58c..1834a5a40c 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutTypePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutTypePage.java
@@ -78,14 +78,13 @@ public class CheckoutTypePage extends CheckoutWizardPage
   @Override
   protected void createUI(Composite parent)
   {
-    transactionalButton = addChoice(parent, "Online Transactional", "icons/transactional.gif",
-        "Creates a remote connection for online editing.", CDOCheckout.TYPE_ONLINE_TRANSACTIONAL);
+    transactionalButton = addChoice(parent, "Online Transactional", "icons/transactional.gif", "Creates a remote connection for online editing.",
+        CDOCheckout.TYPE_ONLINE_TRANSACTIONAL);
 
-    historicalButton = addChoice(parent, "Online Historical", "icons/historical.gif",
-        "Creates a remote connection for online auditing.", CDOCheckout.TYPE_ONLINE_HISTORICAL);
+    historicalButton = addChoice(parent, "Online Historical", "icons/historical.gif", "Creates a remote connection for online auditing.",
+        CDOCheckout.TYPE_ONLINE_HISTORICAL);
 
-    offlineButton = addChoice(parent, "Offline", "icons/disconnect.gif",
-        "Creates a local checkout for offline editing.", CDOCheckout.TYPE_OFFLINE);
+    offlineButton = addChoice(parent, "Offline", "icons/disconnect.gif", "Creates a local checkout for offline editing.", CDOCheckout.TYPE_OFFLINE);
   }
 
   private Button addChoice(Composite composite, String text, String imagePath, String description, final String type)
@@ -219,7 +218,6 @@ public class CheckoutTypePage extends CheckoutWizardPage
   protected void fillProperties(Properties properties)
   {
     properties.setProperty(CDOCheckoutImpl.PROP_TYPE, type);
-    properties.setProperty(CDOCheckoutImpl.PROP_READ_ONLY,
-        Boolean.toString(CDOCheckout.TYPE_ONLINE_HISTORICAL.equals(type)));
+    properties.setProperty(CDOCheckoutImpl.PROP_READ_ONLY, Boolean.toString(CDOCheckout.TYPE_ONLINE_HISTORICAL.equals(type)));
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
index 5542bbecef..0348ab3627 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
@@ -211,8 +211,7 @@ public class CheckoutWizard extends Wizard implements IImportWizard, IPageChange
       {
         IWorkbench workbench = PlatformUI.getWorkbench();
 
-        IViewDescriptor viewDescriptor = workbench.getViewRegistry()
-            .find(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
+        IViewDescriptor viewDescriptor = workbench.getViewRegistry().find(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
         if (viewDescriptor != null)
         {
           IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
@@ -225,8 +224,7 @@ public class CheckoutWizard extends Wizard implements IImportWizard, IPageChange
               {
                 page.showView(viewDescriptor.getId());
 
-                CDOCheckoutContentProvider checkoutContentProvider = CDOCheckoutContentProvider
-                    .getInstance(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
+                CDOCheckoutContentProvider checkoutContentProvider = CDOCheckoutContentProvider.getInstance(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
                 if (checkoutContentProvider != null)
                 {
                   checkoutContentProvider.selectObjects(objects);
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/AbstractObjectHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/AbstractObjectHandler.java
index a4ebb8a50d..a9e9cd0da2 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/AbstractObjectHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/AbstractObjectHandler.java
@@ -138,6 +138,5 @@ public abstract class AbstractObjectHandler extends AbstractBaseHandler<EObject>
     }
   }
 
-  protected abstract boolean doExecute(ExecutionEvent event, List<EObject> transactionalElements,
-      IProgressMonitor monitor);
+  protected abstract boolean doExecute(ExecutionEvent event, List<EObject> transactionalElements, IProgressMonitor monitor);
 }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/ObjectDeleteHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/ObjectDeleteHandler.java
index f830ce45bc..bed3c470fa 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/ObjectDeleteHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/ObjectDeleteHandler.java
@@ -169,8 +169,7 @@ public class ObjectDeleteHandler extends AbstractObjectHandler
       }
       else
       {
-        setMessage("Are you sure you want to delete " + (size == 1 ? "this" : "these") + " " + size + " "
-            + (size == 1 ? "object" : "objects") + "?");
+        setMessage("Are you sure you want to delete " + (size == 1 ? "this" : "these") + " " + size + " " + (size == 1 ? "object" : "objects") + "?");
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryCheckoutHandlerQuick.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryCheckoutHandlerQuick.java
index 1eca182db1..6a5488c5bd 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryCheckoutHandlerQuick.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryCheckoutHandlerQuick.java
@@ -55,8 +55,7 @@ public class RepositoryCheckoutHandlerQuick extends AbstractBaseHandler<CDORepos
     properties.setProperty(CDOCheckoutImpl.PROP_BRANCH_ID, Integer.toString(repositoryElement.getBranchID()));
     properties.setProperty(CDOCheckoutImpl.PROP_TIME_STAMP, Long.toString(repositoryElement.getTimeStamp()));
     properties.setProperty(CDOCheckoutImpl.PROP_READ_ONLY, readOnly);
-    properties.setProperty(CDOCheckoutImpl.PROP_ROOT_ID,
-        CDOCheckoutImpl.getCDOIDString(repositoryElement.getObjectID()));
+    properties.setProperty(CDOCheckoutImpl.PROP_ROOT_ID, CDOCheckoutImpl.getCDOIDString(repositoryElement.getObjectID()));
 
     CDOCheckout checkout = CDOExplorerUtil.getCheckoutManager().addCheckout(properties);
     checkout.open();
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryDeleteHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryDeleteHandler.java
index c641474c1e..3e7626aaed 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryDeleteHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/RepositoryDeleteHandler.java
@@ -62,8 +62,8 @@ public class RepositoryDeleteHandler extends AbstractRepositoryHandler
       String plural = size == 1 ? "" : "s";
       String message = size == 1 ? "is 1" : "are " + size;
 
-      if (MessageDialog.openQuestion(shell, "Existing Checkouts", "There " + message + " existing checkout" + plural
-          + ".\n\n" + "Are you sure you want to delete the checkout" + plural + ", too?"))
+      if (MessageDialog.openQuestion(shell, "Existing Checkouts",
+          "There " + message + " existing checkout" + plural + ".\n\n" + "Are you sure you want to delete the checkout" + plural + ", too?"))
       {
         DeleteElementsDialog dialog = new DeleteElementsDialog(shell, checkouts.toArray(new AbstractElement[size]));
         if (dialog.open() == DeleteElementsDialog.OK)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
index ac848d679b..f82adf8246 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
@@ -97,8 +97,7 @@ public class WorkspaceRevertHandler extends AbstractBaseHandler<OfflineCDOChecko
         String message = size == 1 ? "is 1" : "are " + size;
 
         if (!MessageDialog.openQuestion(shell, "Uncommitted Transaction" + plural,
-            "There " + message + " uncommitted transaction" + plural + ".\n\n"
-                + "Are you sure you want to rollback the transaction" + plural + ", too?"))
+            "There " + message + " uncommitted transaction" + plural + ".\n\n" + "Are you sure you want to rollback the transaction" + plural + ", too?"))
         {
           cancel();
           return;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
index 6e5ea87d81..a43f6aebbc 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
@@ -80,8 +80,7 @@ public class WorkspaceUpdateHandler extends AbstractBaseHandler<OfflineCDOChecko
         CDOTransaction transaction = workspace.update(new CompareCDOMerger()
         {
           @Override
-          public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
-              throws ConflictException
+          public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws ConflictException
           {
             IRegistry<String, Object> remoteProperties = remoteView.properties();
             remoteProperties.put(CDOCompareEditorUtil.PROP_COMPARISON_IMAGE, OM.getImage("icons/repository.gif"));
@@ -107,8 +106,7 @@ public class WorkspaceUpdateHandler extends AbstractBaseHandler<OfflineCDOChecko
     });
   }
 
-  private void mergeDefault(OfflineCDOCheckout checkout, CDOWorkspace workspace, IProgressMonitor monitor)
-      throws ConcurrentAccessException, CommitException
+  private void mergeDefault(OfflineCDOCheckout checkout, CDOWorkspace workspace, IProgressMonitor monitor) throws ConcurrentAccessException, CommitException
   {
     CDOTransaction transaction = workspace.update(new DefaultCDOMerger.PerFeature.ManyValued());
     transaction.commit(monitor);
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPreferencePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPreferencePage.java
index a7bb880088..3a131569fb 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPreferencePage.java
@@ -41,8 +41,7 @@ public class ExplorerPreferencePage extends OMPreferencePage
     composite.setLayoutData(UIUtil.createGridData());
 
     new Label(composite, SWT.NONE).setText("Repository timeout:");
-    repositoryTimeout = new PrefIntegerAndDisable(composite, SWT.BORDER, OM.PREF_REPOSITORY_TIMEOUT_MINUTES,
-        OM.PREF_REPOSITORY_TIMEOUT_DISABLED)
+    repositoryTimeout = new PrefIntegerAndDisable(composite, SWT.BORDER, OM.PREF_REPOSITORY_TIMEOUT_MINUTES, OM.PREF_REPOSITORY_TIMEOUT_DISABLED)
     {
       @Override
       protected GridData createTextLayoutData()
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPropertiesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPropertiesAdapterFactory.java
index 88d7b683ab..5a18ca9405 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPropertiesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPropertiesAdapterFactory.java
@@ -32,11 +32,9 @@ import org.eclipse.ui.views.properties.IPropertySource;
  */
 public class ExplorerPropertiesAdapterFactory extends AbstractPropertyAdapterFactory
 {
-  private static final IActionFilter REPOSITORY_ACTION_FILTER = new DefaultActionFilter<CDORepository>(
-      CDORepositoryProperties.INSTANCE);
+  private static final IActionFilter REPOSITORY_ACTION_FILTER = new DefaultActionFilter<CDORepository>(CDORepositoryProperties.INSTANCE);
 
-  private static final IActionFilter CHECKOUT_ACTION_FILTER = new DefaultActionFilter<CDOCheckout>(
-      CDOCheckoutProperties.INSTANCE);
+  private static final IActionFilter CHECKOUT_ACTION_FILTER = new DefaultActionFilter<CDOCheckout>(CDOCheckoutProperties.INSTANCE);
 
   public ExplorerPropertiesAdapterFactory()
   {
@@ -50,8 +48,7 @@ public class ExplorerPropertiesAdapterFactory extends AbstractPropertyAdapterFac
       CDORepository repository = (CDORepository)object;
       CDOSession session = repository.getSession();
 
-      return new DefaultPropertySource.Augmented<CDORepository, CDOSession>(repository,
-          CDORepositoryProperties.INSTANCE, session)
+      return new DefaultPropertySource.Augmented<CDORepository, CDOSession>(repository, CDORepositoryProperties.INSTANCE, session)
       {
         @Override
         protected IPropertySource createAugmentingPropertySource(CDOSession session)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
index 0557193619..881e04e13f 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoriesView.java
@@ -161,8 +161,7 @@ public class CDORepositoriesView extends ContainerView
 
           try
           {
-            EPackage ePackage = EPackage.Registry.INSTANCE
-                .getEPackage("http://www.eclipse.org/emf/CDO/examples/company/1.0.0");
+            EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/emf/CDO/examples/company/1.0.0");
             EClass eClass = (EClass)ePackage.getEClassifier("Company");
 
             EObject company = EcoreUtil.create(eClass);
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
index 8a02474d50..4f6164da0b 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/MasterRepositoryController.java
@@ -76,8 +76,7 @@ public class MasterRepositoryController
 
   private static final Image OK_IMAGE = OM.getImage("icons/ok.gif");
 
-  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages()
-      .getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
 
   private static final int VALIDATING_WIDTH = 120;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
index 3626485188..9599bef221 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
@@ -53,8 +53,7 @@ public class RepositoryTypePage extends WizardPage
     NewRepositoryWizard wizard = getWizard();
 
     RepositoryRemotePage remotePage = wizard.getRemotePage();
-    addChoice(composite, "Connect to an existing remote repository.", "icons/wiz/new_repo_remote.gif", remotePage,
-        true);
+    addChoice(composite, "Connect to an existing remote repository.", "icons/wiz/new_repo_remote.gif", remotePage, true);
 
     RepositoryClonePage clonePage = wizard.getClonePage();
     addChoice(composite, "Clone an existing remote repository.", "icons/wiz/new_repo_clone.gif", clonePage, false);
@@ -66,8 +65,7 @@ public class RepositoryTypePage extends WizardPage
     setPageComplete(true);
   }
 
-  private Button addChoice(Composite composite, String text, String imagePath, final AbstractRepositoryPage nextPage,
-      boolean enabled)
+  private Button addChoice(Composite composite, String text, String imagePath, final AbstractRepositoryPage nextPage, boolean enabled)
   {
     this.nextPage = nextPage;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
index 0e4ff306e2..5b7c83b8da 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
@@ -32,8 +32,8 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider2;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface CDORepository extends CDOExplorerElement, IContainer<CDOBranch>, IPasswordCredentialsProvider2,
-    CDOSessionProvider, CDOViewOpener, CDOTransactionOpener
+public interface CDORepository
+    extends CDOExplorerElement, IContainer<CDOBranch>, IPasswordCredentialsProvider2, CDOSessionProvider, CDOViewOpener, CDOTransactionOpener
 {
   public static final String TYPE_REMOTE = "remote";
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
index 77be55c28c..161d508da1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
@@ -39,8 +39,7 @@ import java.util.regex.Pattern;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractManager<T extends CDOExplorerElement> extends SetContainer<T>
-    implements CDOExplorerManager<T>
+public abstract class AbstractManager<T extends CDOExplorerElement> extends SetContainer<T> implements CDOExplorerManager<T>
 {
   private static final Pattern LABEL_PATTERN = Pattern.compile("(.+?) *\\([0-9]+\\)");
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
index 49129f571b..dfd3aa7e1d 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java
@@ -38,8 +38,7 @@ public abstract class OM
 
   public static final OMLogger LOG = BUNDLE.logger();
 
-  private static final String STATE_LOCATION = OMPlatform.INSTANCE
-      .getProperty("org.eclipse.emf.cdo.explorer.stateLocation");
+  private static final String STATE_LOCATION = OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.explorer.stateLocation");
 
   private static String stateLocation;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
index cea378f369..cc2eda281f 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
@@ -69,8 +69,7 @@ public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> impleme
     return newElement(properties);
   }
 
-  public void fireCheckoutOpenEvent(CDOCheckout checkout, CDOView view, CDOCheckout.State oldState,
-      CDOCheckout.State newState)
+  public void fireCheckoutOpenEvent(CDOCheckout checkout, CDOView view, CDOCheckout.State oldState, CDOCheckout.State newState)
   {
     if (view != null)
     {
@@ -148,8 +147,7 @@ public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> impleme
 
     private final CDOCheckout.State newState;
 
-    public CheckoutStateEventImpl(CDOCheckoutManager repositoryManager, CDOCheckout checkout,
-        CDOCheckout.State oldState, CDOCheckout.State newState)
+    public CheckoutStateEventImpl(CDOCheckoutManager repositoryManager, CDOCheckout checkout, CDOCheckout.State oldState, CDOCheckout.State newState)
     {
       super(repositoryManager);
       this.checkout = checkout;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
index fc0035b195..77f4fd0ed2 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
@@ -171,8 +171,8 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryConnected", "Connected",
-        "Whether the repository of this checkout is connected", CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryConnected", "Connected", "Whether the repository of this checkout is connected",
+        CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -187,8 +187,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryType", "Type", "The type of the repository of this checkout",
-        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryType", "Type", "The type of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -203,8 +202,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryID", "ID", "The ID of the repository of this checkout",
-        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryID", "ID", "The ID of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -219,8 +217,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryLabel", "Label", "The label of the repository of this checkout",
-        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryLabel", "Label", "The label of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -235,8 +232,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryFolder", "Folder", "The folder of the repository of this checkout",
-        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryFolder", "Folder", "The folder of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -251,8 +247,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("repositoryURI", "URI", "The URI of the repository of this checkout",
-        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    add(new Property<CDOCheckout>("repositoryURI", "URI", "The URI of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
index 95926d4dbb..590c3428e2 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
@@ -203,8 +203,7 @@ public class CDOCheckoutViewProvider extends AbstractCDOViewProvider
     {
       EList<Adapter> adapters = resourceSet.eAdapters();
 
-      CheckoutViewProviderAdapter adapter = (CheckoutViewProviderAdapter)EcoreUtil.getAdapter(adapters,
-          CheckoutViewProviderAdapter.class);
+      CheckoutViewProviderAdapter adapter = (CheckoutViewProviderAdapter)EcoreUtil.getAdapter(adapters, CheckoutViewProviderAdapter.class);
       if (adapter != null && adapter.getTarget() != resourceSet)
       {
         adapters.remove(adapter);
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
index b41a0f4f70..267ce499ee 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java
@@ -627,27 +627,26 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe
           {
             counters = new HashMap<EClass, AtomicInteger>();
             CDOView view = CDOUtil.getView(object);
-            view.getSession().getRevisionManager().handleRevisions(null, null, false, CDOBranchPoint.UNSPECIFIED_DATE,
-                false, new CDORevisionHandler()
+            view.getSession().getRevisionManager().handleRevisions(null, null, false, CDOBranchPoint.UNSPECIFIED_DATE, false, new CDORevisionHandler()
+            {
+              public boolean handleRevision(CDORevision revision)
+              {
+                EClass eClass = revision.getEClass();
+                AtomicInteger counter = getCounter(eClass);
+
+                String id = revision.getID().toString();
+                id = id.substring(0, id.length() - "A".length());
+                id = id.substring(id.lastIndexOf('_') + 1);
+
+                int counterValue = Integer.parseInt(id);
+                if (counterValue > counter.get())
                 {
-                  public boolean handleRevision(CDORevision revision)
-                  {
-                    EClass eClass = revision.getEClass();
-                    AtomicInteger counter = getCounter(eClass);
-
-                    String id = revision.getID().toString();
-                    id = id.substring(0, id.length() - "A".length());
-                    id = id.substring(id.lastIndexOf('_') + 1);
-
-                    int counterValue = Integer.parseInt(id);
-                    if (counterValue > counter.get())
-                    {
-                      counter.set(counterValue);
-                    }
-
-                    return true;
-                  }
-                });
+                  counter.set(counterValue);
+                }
+
+                return true;
+              }
+            });
           }
 
           EClass eClass = object.eClass();
@@ -665,8 +664,7 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe
           AtomicInteger counter = getCounter(eClass);
 
           String str = "_" + counter.incrementAndGet();
-          String id = type + "____________________________________".substring(0, 22 - type.length() - str.length())
-              + str + "A";
+          String id = type + "____________________________________".substring(0, 22 - type.length() - str.length()) + str + "A";
 
           if ("_CDOResource_________5A".equals(id))
           {
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
index 7edcb61fdc..f2d67be175 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
@@ -146,8 +146,7 @@ public class CDORepositoryManagerImpl extends AbstractManager<CDORepository> imp
 
     private final boolean connected;
 
-    public RepositoryConnectionEventImpl(CDORepositoryManager repositoryManager, CDORepository repository,
-        boolean connected)
+    public RepositoryConnectionEventImpl(CDORepositoryManager repositoryManager, CDORepository repository, boolean connected)
     {
       super(repositoryManager);
       this.repository = repository;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
index ec5bc3cab4..e89f3b0063 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
@@ -40,8 +40,7 @@ public class CDORepositoryProperties extends Properties<CDORepository>
       }
     });
 
-    add(new Property<CDORepository>("connected", "Connected", "Whether this repository is connected",
-        CATEGORY_REPOSITORY)
+    add(new Property<CDORepository>("connected", "Connected", "Whether this repository is connected", CATEGORY_REPOSITORY)
     {
       @Override
       protected Object eval(CDORepository repository)
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java
index 46cd5e6eb0..d81e6de836 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java
@@ -174,8 +174,7 @@ public class CloneCDORepository extends CDORepositoryImpl
       }
     };
 
-    IRepositorySynchronizer synchronizer = CDOServerUtil
-        .createRepositorySynchronizer(remoteSessionConfigurationFactory);
+    IRepositorySynchronizer synchronizer = CDOServerUtil.createRepositorySynchronizer(remoteSessionConfigurationFactory);
 
     repository = CDOServerUtil.createOfflineClone(repositoryName + "-clone", store, props, synchronizer);
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
index 6f7ba1404d..c96cb287e9 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
@@ -126,8 +126,8 @@ public class LocalCDORepository extends CDORepositoryImpl
     JdbcDataSource dataSource = new JdbcDataSource();
     dataSource.setURL("jdbc:h2:" + folder);
 
-    IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(
-        getVersioningMode().isSupportingAudits(), getVersioningMode().isSupportingBranches(), false);
+    IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(getVersioningMode().isSupportingAudits(),
+        getVersioningMode().isSupportingBranches(), false);
     mappingStrategy.setProperties(getMappingStrategyProperties());
 
     IDBAdapter dbAdapter = DBUtil.getDBAdapter("h2");
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.core.prefs
index 8380acd460..3fec73e73e 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
index 778825855b..832aba4720 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
@@ -42,9 +42,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AccessItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+public class AccessItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -174,59 +173,41 @@ public class AccessItemProvider extends ItemProviderAdapter implements IEditingD
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(
-        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(
-        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(
-        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(
-        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
index b06c771858..d831ce67dd 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
@@ -68,13 +68,10 @@ public class BooleanValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_BooleanValue_literal_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_BooleanValue_literal_feature",
-                "_UI_BooleanValue_type"),
-            ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BooleanValue_literal_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_BooleanValue_literal_feature", "_UI_BooleanValue_type"),
+        ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
index e9c5d02a76..7da7b845b1 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
@@ -68,12 +68,9 @@ public class ByteValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ByteValue_literal_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ByteValue_literal_feature", "_UI_ByteValue_type"),
-            ExpressionsPackage.Literals.BYTE_VALUE__LITERAL, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ByteValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ByteValue_literal_feature", "_UI_ByteValue_type"),
+        ExpressionsPackage.Literals.BYTE_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
index 2215c5ece8..3cc9613c13 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
@@ -68,12 +68,9 @@ public class CharValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_CharValue_literal_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_CharValue_literal_feature", "_UI_CharValue_type"),
-            ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, false, false,
-            ItemPropertyDescriptor.TEXT_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_CharValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_CharValue_literal_feature", "_UI_CharValue_type"),
+        ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
index 409b03b5fd..a82e73c82b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ContainedObjectItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class ContainedObjectItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -186,8 +186,7 @@ public class ContainedObjectItemProvider extends ItemProviderAdapter implements
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT,
-        EcoreFactory.eINSTANCE.createEObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT, EcoreFactory.eINSTANCE.createEObject()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
index 100272931f..9566976bfc 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
@@ -68,14 +68,10 @@ public class DoubleValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_DoubleValue_literal_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DoubleValue_literal_feature",
-                    "_UI_DoubleValue_type"),
-                ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_DoubleValue_literal_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_DoubleValue_literal_feature", "_UI_DoubleValue_type"),
+        ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
index e47c935b32..bae6ad398e 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
@@ -75,8 +75,8 @@ public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFac
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      ExpressionsEditPlugin.INSTANCE, ExpressionsPackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(ExpressionsEditPlugin.INSTANCE,
+      ExpressionsPackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
index 048eef1819..12d7f9e6d0 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
@@ -68,14 +68,9 @@ public class FloatValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_FloatValue_literal_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_FloatValue_literal_feature",
-                    "_UI_FloatValue_type"),
-                ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_FloatValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_FloatValue_literal_feature", "_UI_FloatValue_type"),
+        ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
index d089b6a630..dcbd3994dd 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
@@ -129,13 +129,11 @@ public class FunctionInvocationItemProvider extends InvocationItemProvider
     Object childFeature = feature;
     Object childObject = child;
 
-    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS
-        || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME;
+    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME;
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2",
-          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
index 66392cafae..306b496937 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
@@ -68,12 +68,9 @@ public class IntValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_IntValue_literal_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_IntValue_literal_feature", "_UI_IntValue_type"),
-            ExpressionsPackage.Literals.INT_VALUE__LITERAL, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_IntValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_IntValue_literal_feature", "_UI_IntValue_type"),
+        ExpressionsPackage.Literals.INT_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
index 57c17767f5..0d0ff7865d 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
@@ -42,9 +42,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvocationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+public class InvocationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -176,113 +175,77 @@ public class InvocationItemProvider extends ItemProviderAdapter implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, ExpressionsFactory.eINSTANCE.createListConstruction()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.INVOCATION__NAME, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
   /**
@@ -297,13 +260,11 @@ public class InvocationItemProvider extends ItemProviderAdapter implements IEdit
     Object childFeature = feature;
     Object childObject = child;
 
-    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS
-        || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME;
+    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME;
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2",
-          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
index 296c71c811..b029f954d8 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class LinkedExpressionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class LinkedExpressionItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -80,12 +80,10 @@ public class LinkedExpressionItemProvider extends ItemProviderAdapter implements
    */
   protected void addExpressionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_LinkedExpression_expression_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_LinkedExpression_expression_feature",
-                "_UI_LinkedExpression_type"),
-            ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_LinkedExpression_expression_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_LinkedExpression_expression_feature", "_UI_LinkedExpression_type"),
+        ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
index e171d824f5..64b122bad4 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class LinkedObjectItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class LinkedObjectItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -80,11 +80,10 @@ public class LinkedObjectItemProvider extends ItemProviderAdapter implements IEd
    */
   protected void addObjectPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_LinkedObject_object_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_LinkedObject_object_feature", "_UI_LinkedObject_type"),
-            ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_LinkedObject_object_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_LinkedObject_object_feature", "_UI_LinkedObject_type"),
+        ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
index 2586c298dc..d600a51507 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ListConstructionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class ListConstructionItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
@@ -186,59 +186,46 @@ public class ListConstructionItemProvider extends ItemProviderAdapter implements
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
index 244b02bbe8..252133082b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
@@ -68,12 +68,9 @@ public class LongValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_LongValue_literal_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_LongValue_literal_feature", "_UI_LongValue_type"),
-            ExpressionsPackage.Literals.LONG_VALUE__LITERAL, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_LongValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LongValue_literal_feature", "_UI_LongValue_type"),
+        ExpressionsPackage.Literals.LONG_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
index ae7cda9d4d..cddc9f0931 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
@@ -160,59 +160,41 @@ public class MemberAccessItemProvider extends AccessItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
   /**
@@ -227,13 +209,11 @@ public class MemberAccessItemProvider extends AccessItemProvider
     Object childFeature = feature;
     Object childObject = child;
 
-    boolean qualify = childFeature == ExpressionsPackage.Literals.ACCESS__NAME
-        || childFeature == ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT;
+    boolean qualify = childFeature == ExpressionsPackage.Literals.ACCESS__NAME || childFeature == ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT;
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2",
-          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
index 3bee24040e..d2c006fc00 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
@@ -160,59 +160,42 @@ public class MemberInvocationItemProvider extends InvocationItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors
+        .add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
   /**
@@ -227,14 +210,12 @@ public class MemberInvocationItemProvider extends InvocationItemProvider
     Object childFeature = feature;
     Object childObject = child;
 
-    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS
-        || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME
+    boolean qualify = childFeature == ExpressionsPackage.Literals.INVOCATION__ARGUMENTS || childFeature == ExpressionsPackage.Literals.INVOCATION__NAME
         || childFeature == ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT;
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2",
-          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
index 8886c7da70..676b5f6a54 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
@@ -68,14 +68,9 @@ public class ShortValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_ShortValue_literal_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ShortValue_literal_feature",
-                    "_UI_ShortValue_type"),
-                ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ShortValue_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ShortValue_literal_feature", "_UI_ShortValue_type"),
+        ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
index 7ff8ef6861..d3f3c7fe55 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
@@ -68,14 +68,10 @@ public class StringValueItemProvider extends ValueItemProvider
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_StringValue_literal_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_StringValue_literal_feature",
-                    "_UI_StringValue_type"),
-                ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StringValue_literal_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StringValue_literal_feature", "_UI_StringValue_type"),
+        ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -111,8 +107,7 @@ public class StringValueItemProvider extends ValueItemProvider
   public String getText(Object object)
   {
     String label = ((StringValue)object).getLiteral();
-    return label == null || label.length() == 0 ? getString("_UI_StringValue_type")
-        : getString("_UI_StringValue_type") + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_StringValue_type") : getString("_UI_StringValue_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
index 0f4aef0948..d670290bd8 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
@@ -36,9 +36,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+public class ValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.core.prefs
index 303d2d75e1..ff3d8e623b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
index 81c3b906cf..00c08d06cd 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
@@ -49,8 +49,7 @@ import java.util.Collection;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ExpressionsActionBarContributor extends EditingDomainActionBarContributor
-    implements ISelectionChangedListener
+public class ExpressionsActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor.
@@ -74,8 +73,7 @@ public class ExpressionsActionBarContributor extends EditingDomainActionBarContr
    * <!-- end-user-doc -->
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      ExpressionsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -98,8 +96,7 @@ public class ExpressionsActionBarContributor extends EditingDomainActionBarContr
    * <!-- end-user-doc -->
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      ExpressionsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+  protected IAction refreshViewerAction = new Action(ExpressionsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -194,8 +191,7 @@ public class ExpressionsActionBarContributor extends EditingDomainActionBarContr
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(
-        ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditor_menu"),
+    IMenuManager submenuManager = new MenuManager(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditor_menu"),
         "org.eclipse.emf.cdo.expressionsMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
@@ -210,8 +206,7 @@ public class ExpressionsActionBarContributor extends EditingDomainActionBarContr
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(
-        ExpressionsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    createSiblingMenuManager = new MenuManager(ExpressionsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
@@ -366,8 +361,7 @@ public class ExpressionsActionBarContributor extends EditingDomainActionBarContr
    * <!-- end-user-doc -->
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
index 26a765aeff..80cc5ad290 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
@@ -126,8 +126,7 @@ import java.util.Map;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ExpressionsEditor extends MultiPageEditorPart
-    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
+public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model.
@@ -420,11 +419,9 @@ public class ExpressionsEditor extends MultiPageEditorPart
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -654,8 +651,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -931,8 +927,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
     getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
 
     int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-    Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(),
-        FileTransfer.getInstance() };
+    Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
     viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
     viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
   }
@@ -980,16 +975,15 @@ public class ExpressionsEditor extends MultiPageEditorPart
     boolean hasErrors = !resource.getErrors().isEmpty();
     if (hasErrors || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-          "org.eclipse.emf.cdo.expressions.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING, "org.eclipse.emf.cdo.expressions.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.expressions.editor", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.expressions.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception });
     }
     else
     {
@@ -1021,8 +1015,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
       setCurrentViewer(selectionViewer);
 
       selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer
-          .setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
+      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
       selectionViewer.setInput(editingDomain.getResourceSet());
       selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
 
@@ -1180,8 +1173,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
           // Set up the tree viewer.
           //
           contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-          contentOutlineViewer.setLabelProvider(
-              new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
+          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
           contentOutlineViewer.setInput(editingDomain.getResourceSet());
 
           // Make sure our popups work.
@@ -1192,14 +1184,12 @@ public class ExpressionsEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1333,8 +1323,7 @@ public class ExpressionsEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1447,8 +1436,8 @@ public class ExpressionsEditor extends MultiPageEditorPart
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1552,8 +1541,8 @@ public class ExpressionsEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
index 7652b711a7..34e10b15ab 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
@@ -82,8 +82,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
-      ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display.
@@ -91,8 +91,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = ExpressionsEditorPlugin.INSTANCE
-      .getString("_UI_ExpressionsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameExtensions")
+      .replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package.
@@ -161,8 +161,7 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
-        .getImageDescriptor(ExpressionsEditorPlugin.INSTANCE.getImage("full/wizban/NewExpressions")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExpressionsEditorPlugin.INSTANCE.getImage("full/wizban/NewExpressions")));
   }
 
   /**
@@ -289,13 +288,11 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            ExpressionsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        MessageDialog.openError(workbenchWindow.getShell(), ExpressionsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
         return false;
       }
 
@@ -583,8 +580,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            ExpressionsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
+        for (StringTokenizer stringTokenizer = new StringTokenizer(ExpressionsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -606,11 +603,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new ExpressionsModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_label"));
-    newFileCreationPage
-        .setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_description"));
-    newFileCreationPage
-        .setFileName(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameDefaultBase") + "."
-            + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_description"));
+    newFileCreationPage.setFileName(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -640,8 +634,7 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
 
           // Make up a unique new name here.
           //
-          String defaultModelBaseFilename = ExpressionsEditorPlugin.INSTANCE
-              .getString("_UI_ExpressionsEditorFilenameDefaultBase");
+          String defaultModelBaseFilename = ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameDefaultBase");
           String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
           String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
           for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -654,8 +647,7 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new ExpressionsModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_label"));
-    initialObjectCreationPage
-        .setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage.setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.core.prefs
index 303d2d75e1..ff3d8e623b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/AccessImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/AccessImpl.java
index efe54cc98f..06d87f30d7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/AccessImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/AccessImpl.java
@@ -78,8 +78,7 @@ public abstract class AccessImpl extends CDOObjectImpl implements Access
    */
   public Expression getName()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.ACCESS__NAME, ExpressionsPackage.Literals.ACCESS__NAME, true,
-        true);
+    return (Expression)eDynamicGet(ExpressionsPackage.ACCESS__NAME, ExpressionsPackage.Literals.ACCESS__NAME, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/BooleanValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/BooleanValueImpl.java
index e38df4ce3d..888edc259d 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/BooleanValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/BooleanValueImpl.java
@@ -68,8 +68,7 @@ public class BooleanValueImpl extends ValueImpl implements BooleanValue
    */
   public boolean isLiteral()
   {
-    return (Boolean)eDynamicGet(ExpressionsPackage.BOOLEAN_VALUE__LITERAL,
-        ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, true);
+    return (Boolean)eDynamicGet(ExpressionsPackage.BOOLEAN_VALUE__LITERAL, ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, true);
   }
 
   /**
@@ -79,8 +78,7 @@ public class BooleanValueImpl extends ValueImpl implements BooleanValue
    */
   public void setLiteral(boolean newLiteral)
   {
-    eDynamicSet(ExpressionsPackage.BOOLEAN_VALUE__LITERAL, ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL,
-        newLiteral);
+    eDynamicSet(ExpressionsPackage.BOOLEAN_VALUE__LITERAL, ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, newLiteral);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ByteValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ByteValueImpl.java
index 6d0f21143a..34c8fa4cfb 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ByteValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ByteValueImpl.java
@@ -69,8 +69,7 @@ public class ByteValueImpl extends ValueImpl implements ByteValue
   @Override
   public Byte getLiteral()
   {
-    return (Byte)eDynamicGet(ExpressionsPackage.BYTE_VALUE__LITERAL, ExpressionsPackage.Literals.BYTE_VALUE__LITERAL,
-        true, true);
+    return (Byte)eDynamicGet(ExpressionsPackage.BYTE_VALUE__LITERAL, ExpressionsPackage.Literals.BYTE_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/CharValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/CharValueImpl.java
index e738fc62bd..36a5def416 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/CharValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/CharValueImpl.java
@@ -69,8 +69,7 @@ public class CharValueImpl extends ValueImpl implements CharValue
   @Override
   public Character getLiteral()
   {
-    return (Character)eDynamicGet(ExpressionsPackage.CHAR_VALUE__LITERAL,
-        ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, true);
+    return (Character)eDynamicGet(ExpressionsPackage.CHAR_VALUE__LITERAL, ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ContainedObjectImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ContainedObjectImpl.java
index 6e496b5445..7295836d80 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ContainedObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ContainedObjectImpl.java
@@ -78,8 +78,7 @@ public class ContainedObjectImpl extends CDOObjectImpl implements ContainedObjec
    */
   public EObject getObject()
   {
-    return (EObject)eDynamicGet(ExpressionsPackage.CONTAINED_OBJECT__OBJECT,
-        ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT, true, true);
+    return (EObject)eDynamicGet(ExpressionsPackage.CONTAINED_OBJECT__OBJECT, ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT, true, true);
   }
 
   /**
@@ -100,8 +99,7 @@ public class ContainedObjectImpl extends CDOObjectImpl implements ContainedObjec
   	 */
   public void setObject(EObject newObject)
   {
-    eDynamicSet(ExpressionsPackage.CONTAINED_OBJECT__OBJECT, ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT,
-        newObject);
+    eDynamicSet(ExpressionsPackage.CONTAINED_OBJECT__OBJECT, ExpressionsPackage.Literals.CONTAINED_OBJECT__OBJECT, newObject);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
index 606c74218f..861fdc0e26 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
@@ -69,8 +69,7 @@ public class DoubleValueImpl extends ValueImpl implements DoubleValue
   @Override
   public Double getLiteral()
   {
-    return (Double)eDynamicGet(ExpressionsPackage.DOUBLE_VALUE__LITERAL,
-        ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, true);
+    return (Double)eDynamicGet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, true);
   }
 
   /**
@@ -80,8 +79,7 @@ public class DoubleValueImpl extends ValueImpl implements DoubleValue
    */
   public void setLiteral(double newLiteral)
   {
-    eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL,
-        newLiteral);
+    eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, newLiteral);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
index 3760b30666..bd4c31d6c4 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsFactoryImpl.java
@@ -56,8 +56,7 @@ public class ExpressionsFactoryImpl extends EFactoryImpl implements ExpressionsF
   {
     try
     {
-      ExpressionsFactory theExpressionsFactory = (ExpressionsFactory)EPackage.Registry.INSTANCE
-          .getEFactory(ExpressionsPackage.eNS_URI);
+      ExpressionsFactory theExpressionsFactory = (ExpressionsFactory)EPackage.Registry.INSTANCE.getEFactory(ExpressionsPackage.eNS_URI);
       if (theExpressionsFactory != null)
       {
         return theExpressionsFactory;
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
index 2ee088d5db..04e995b8ee 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
@@ -261,9 +261,8 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
     }
 
     // Obtain or create and register package
-    ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new ExpressionsPackageImpl());
+    ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExpressionsPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExpressionsPackageImpl());
 
     isInited = true;
 
@@ -873,120 +872,93 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
     listConstructionEClass.getESuperTypes().add(getExpression());
 
     // Initialize classes, features, and operations; add parameters
-    initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
+    initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    EOperation op = initEOperation(getExpression__Evaluate__EvaluationContext(), ecorePackage.getEJavaObject(),
-        "evaluate", 0, 1, IS_UNIQUE, IS_ORDERED);
+    EOperation op = initEOperation(getExpression__Evaluate__EvaluationContext(), ecorePackage.getEJavaObject(), "evaluate", 0, 1, IS_UNIQUE, IS_ORDERED);
     addEParameter(op, getEvaluationContext(), "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
     initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEOperation(getValue__GetLiteral(), ecorePackage.getEJavaObject(), "getLiteral", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(booleanValueEClass, BooleanValue.class, "BooleanValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBooleanValue_Literal(), ecorePackage.getEBoolean(), "literal", null, 0, 1, BooleanValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(booleanValueEClass, BooleanValue.class, "BooleanValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBooleanValue_Literal(), ecorePackage.getEBoolean(), "literal", null, 0, 1, BooleanValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(byteValueEClass, ByteValue.class, "ByteValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getByteValue_Literal(), ecorePackage.getEByte(), "literal", null, 0, 1, ByteValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getByteValue_Literal(), ecorePackage.getEByte(), "literal", null, 0, 1, ByteValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(shortValueEClass, ShortValue.class, "ShortValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getShortValue_Literal(), ecorePackage.getEShort(), "literal", null, 0, 1, ShortValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(shortValueEClass, ShortValue.class, "ShortValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getShortValue_Literal(), ecorePackage.getEShort(), "literal", null, 0, 1, ShortValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(intValueEClass, IntValue.class, "IntValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIntValue_Literal(), ecorePackage.getEInt(), "literal", null, 0, 1, IntValue.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIntValue_Literal(), ecorePackage.getEInt(), "literal", null, 0, 1, IntValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(longValueEClass, LongValue.class, "LongValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getLongValue_Literal(), ecorePackage.getELong(), "literal", null, 0, 1, LongValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getLongValue_Literal(), ecorePackage.getELong(), "literal", null, 0, 1, LongValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(floatValueEClass, FloatValue.class, "FloatValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFloatValue_Literal(), ecorePackage.getEFloat(), "literal", null, 0, 1, FloatValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(floatValueEClass, FloatValue.class, "FloatValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getFloatValue_Literal(), ecorePackage.getEFloat(), "literal", null, 0, 1, FloatValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(doubleValueEClass, DoubleValue.class, "DoubleValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDoubleValue_Literal(), ecorePackage.getEDouble(), "literal", null, 0, 1, DoubleValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(doubleValueEClass, DoubleValue.class, "DoubleValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getDoubleValue_Literal(), ecorePackage.getEDouble(), "literal", null, 0, 1, DoubleValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(charValueEClass, CharValue.class, "CharValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCharValue_Literal(), ecorePackage.getEChar(), "literal", null, 0, 1, CharValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringValue_Literal(), ecorePackage.getEString(), "literal", null, 0, 1, StringValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(invocationEClass, Invocation.class, "Invocation", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getInvocation_Arguments(), getExpression(), null, "arguments", null, 0, -1, Invocation.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getInvocation_Name(), getExpression(), null, "name", null, 1, 1, Invocation.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(functionInvocationEClass, FunctionInvocation.class, "FunctionInvocation", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(memberInvocationEClass, MemberInvocation.class, "MemberInvocation", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMemberInvocation_Object(), getExpression(), null, "object", null, 1, 1, MemberInvocation.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCharValue_Literal(), ecorePackage.getEChar(), "literal", null, 0, 1, CharValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringValue_Literal(), ecorePackage.getEString(), "literal", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(invocationEClass, Invocation.class, "Invocation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getInvocation_Arguments(), getExpression(), null, "arguments", null, 0, -1, Invocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getInvocation_Name(), getExpression(), null, "name", null, 1, 1, Invocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(functionInvocationEClass, FunctionInvocation.class, "FunctionInvocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(memberInvocationEClass, MemberInvocation.class, "MemberInvocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMemberInvocation_Object(), getExpression(), null, "object", null, 1, 1, MemberInvocation.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(accessEClass, Access.class, "Access", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAccess_Name(), getExpression(), null, "name", null, 1, 1, Access.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(staticAccessEClass, StaticAccess.class, "StaticAccess", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(memberAccessEClass, MemberAccess.class, "MemberAccess", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMemberAccess_Object(), getExpression(), null, "object", null, 1, 1, MemberAccess.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(contextAccessEClass, ContextAccess.class, "ContextAccess", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(containedObjectEClass, ContainedObject.class, "ContainedObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainedObject_Object(), theEcorePackage.getEObject(), null, "object", null, 0, 1,
-        ContainedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(linkedObjectEClass, LinkedObject.class, "LinkedObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getLinkedObject_Object(), theEcorePackage.getEObject(), null, "object", null, 0, 1,
-        LinkedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(linkedExpressionEClass, LinkedExpression.class, "LinkedExpression", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getLinkedExpression_Expression(), getExpression(), null, "expression", null, 1, 1,
-        LinkedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(listConstructionEClass, ListConstruction.class, "ListConstruction", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getListConstruction_Elements(), getExpression(), null, "elements", null, 0, -1,
-        ListConstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAccess_Name(), getExpression(), null, "name", null, 1, 1, Access.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(staticAccessEClass, StaticAccess.class, "StaticAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(memberAccessEClass, MemberAccess.class, "MemberAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMemberAccess_Object(), getExpression(), null, "object", null, 1, 1, MemberAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(contextAccessEClass, ContextAccess.class, "ContextAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(containedObjectEClass, ContainedObject.class, "ContainedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getContainedObject_Object(), theEcorePackage.getEObject(), null, "object", null, 0, 1, ContainedObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(linkedObjectEClass, LinkedObject.class, "LinkedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getLinkedObject_Object(), theEcorePackage.getEObject(), null, "object", null, 0, 1, LinkedObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(linkedExpressionEClass, LinkedExpression.class, "LinkedExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getLinkedExpression_Expression(), getExpression(), null, "expression", null, 1, 1, LinkedExpression.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(listConstructionEClass, ListConstruction.class, "ListConstruction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getListConstruction_Elements(), getExpression(), null, "elements", null, 0, -1, ListConstruction.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
-    initEDataType(evaluationContextEDataType, EvaluationContext.class, "EvaluationContext", !IS_SERIALIZABLE,
-        !IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(evaluationContextEDataType, EvaluationContext.class, "EvaluationContext", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
index 80b38fc2e6..75fe2e0720 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
@@ -69,8 +69,7 @@ public class FloatValueImpl extends ValueImpl implements FloatValue
   @Override
   public Float getLiteral()
   {
-    return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL, ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL,
-        true, true);
+    return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL, ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/IntValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/IntValueImpl.java
index 5a97d95361..919dff0ff4 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/IntValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/IntValueImpl.java
@@ -69,8 +69,7 @@ public class IntValueImpl extends ValueImpl implements IntValue
   @Override
   public Integer getLiteral()
   {
-    return (Integer)eDynamicGet(ExpressionsPackage.INT_VALUE__LITERAL, ExpressionsPackage.Literals.INT_VALUE__LITERAL,
-        true, true);
+    return (Integer)eDynamicGet(ExpressionsPackage.INT_VALUE__LITERAL, ExpressionsPackage.Literals.INT_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/InvocationImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/InvocationImpl.java
index 2cc7ee6617..be64864063 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/InvocationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/InvocationImpl.java
@@ -89,8 +89,7 @@ public abstract class InvocationImpl extends CDOObjectImpl implements Invocation
   @SuppressWarnings("unchecked")
   public EList<Expression> getArguments()
   {
-    return (EList<Expression>)eDynamicGet(ExpressionsPackage.INVOCATION__ARGUMENTS,
-        ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, true, true);
+    return (EList<Expression>)eDynamicGet(ExpressionsPackage.INVOCATION__ARGUMENTS, ExpressionsPackage.Literals.INVOCATION__ARGUMENTS, true, true);
   }
 
   /**
@@ -100,8 +99,7 @@ public abstract class InvocationImpl extends CDOObjectImpl implements Invocation
    */
   public Expression getName()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.INVOCATION__NAME, ExpressionsPackage.Literals.INVOCATION__NAME,
-        true, true);
+    return (Expression)eDynamicGet(ExpressionsPackage.INVOCATION__NAME, ExpressionsPackage.Literals.INVOCATION__NAME, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
index 66307240e3..7a560fb460 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedExpressionImpl.java
@@ -76,8 +76,7 @@ public class LinkedExpressionImpl extends CDOObjectImpl implements LinkedExpress
    */
   public Expression getExpression()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION,
-        ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, true);
+    return (Expression)eDynamicGet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION, ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, true);
   }
 
   /**
@@ -87,8 +86,7 @@ public class LinkedExpressionImpl extends CDOObjectImpl implements LinkedExpress
    */
   public Expression basicGetExpression()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION,
-        ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, false, true);
+    return (Expression)eDynamicGet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION, ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, false, true);
   }
 
   /**
@@ -98,8 +96,7 @@ public class LinkedExpressionImpl extends CDOObjectImpl implements LinkedExpress
    */
   public void setExpression(Expression newExpression)
   {
-    eDynamicSet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION,
-        ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, newExpression);
+    eDynamicSet(ExpressionsPackage.LINKED_EXPRESSION__EXPRESSION, ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, newExpression);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
index c1d8bc29a8..5480ae94f6 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LinkedObjectImpl.java
@@ -76,8 +76,7 @@ public class LinkedObjectImpl extends CDOObjectImpl implements LinkedObject
    */
   public EObject getObject()
   {
-    return (EObject)eDynamicGet(ExpressionsPackage.LINKED_OBJECT__OBJECT,
-        ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, true);
+    return (EObject)eDynamicGet(ExpressionsPackage.LINKED_OBJECT__OBJECT, ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, true);
   }
 
   /**
@@ -87,8 +86,7 @@ public class LinkedObjectImpl extends CDOObjectImpl implements LinkedObject
    */
   public EObject basicGetObject()
   {
-    return (EObject)eDynamicGet(ExpressionsPackage.LINKED_OBJECT__OBJECT,
-        ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, false, true);
+    return (EObject)eDynamicGet(ExpressionsPackage.LINKED_OBJECT__OBJECT, ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, false, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ListConstructionImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ListConstructionImpl.java
index ce58633a63..12e92b5879 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ListConstructionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ListConstructionImpl.java
@@ -82,8 +82,7 @@ public class ListConstructionImpl extends CDOObjectImpl implements ListConstruct
   @SuppressWarnings("unchecked")
   public EList<Expression> getElements()
   {
-    return (EList<Expression>)eDynamicGet(ExpressionsPackage.LIST_CONSTRUCTION__ELEMENTS,
-        ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, true, true);
+    return (EList<Expression>)eDynamicGet(ExpressionsPackage.LIST_CONSTRUCTION__ELEMENTS, ExpressionsPackage.Literals.LIST_CONSTRUCTION__ELEMENTS, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LongValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LongValueImpl.java
index f8432002a2..0fd4d791a7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LongValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/LongValueImpl.java
@@ -69,8 +69,7 @@ public class LongValueImpl extends ValueImpl implements LongValue
   @Override
   public Long getLiteral()
   {
-    return (Long)eDynamicGet(ExpressionsPackage.LONG_VALUE__LITERAL, ExpressionsPackage.Literals.LONG_VALUE__LITERAL,
-        true, true);
+    return (Long)eDynamicGet(ExpressionsPackage.LONG_VALUE__LITERAL, ExpressionsPackage.Literals.LONG_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberAccessImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberAccessImpl.java
index 1764dace39..5836c0fe85 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberAccessImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberAccessImpl.java
@@ -69,8 +69,7 @@ public class MemberAccessImpl extends AccessImpl implements MemberAccess
    */
   public Expression getObject()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.MEMBER_ACCESS__OBJECT,
-        ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, true, true);
+    return (Expression)eDynamicGet(ExpressionsPackage.MEMBER_ACCESS__OBJECT, ExpressionsPackage.Literals.MEMBER_ACCESS__OBJECT, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberInvocationImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberInvocationImpl.java
index 411b1478a1..0278e8a9f2 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberInvocationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/MemberInvocationImpl.java
@@ -72,8 +72,7 @@ public class MemberInvocationImpl extends InvocationImpl implements MemberInvoca
    */
   public Expression getObject()
   {
-    return (Expression)eDynamicGet(ExpressionsPackage.MEMBER_INVOCATION__OBJECT,
-        ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, true, true);
+    return (Expression)eDynamicGet(ExpressionsPackage.MEMBER_INVOCATION__OBJECT, ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, true, true);
   }
 
   /**
@@ -94,8 +93,7 @@ public class MemberInvocationImpl extends InvocationImpl implements MemberInvoca
    */
   public void setObject(Expression newObject)
   {
-    eDynamicSet(ExpressionsPackage.MEMBER_INVOCATION__OBJECT, ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT,
-        newObject);
+    eDynamicSet(ExpressionsPackage.MEMBER_INVOCATION__OBJECT, ExpressionsPackage.Literals.MEMBER_INVOCATION__OBJECT, newObject);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
index 4c5d6781a2..bcd4b7221f 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
@@ -69,8 +69,7 @@ public class ShortValueImpl extends ValueImpl implements ShortValue
   @Override
   public Short getLiteral()
   {
-    return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL, ExpressionsPackage.Literals.SHORT_VALUE__LITERAL,
-        true, true);
+    return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL, ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
index 06419e5a0b..25526e7c4e 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
@@ -69,8 +69,7 @@ public class StringValueImpl extends ValueImpl implements StringValue
   @Override
   public String getLiteral()
   {
-    return (String)eDynamicGet(ExpressionsPackage.STRING_VALUE__LITERAL,
-        ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, true);
+    return (String)eDynamicGet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, true);
   }
 
   /**
@@ -80,8 +79,7 @@ public class StringValueImpl extends ValueImpl implements StringValue
    */
   public void setLiteral(String newLiteral)
   {
-    eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL,
-        newLiteral);
+    eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL, newLiteral);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
index af8f5400d8..0725106a64 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
@@ -76,12 +76,10 @@ public class CDOImporter extends ModelImporter
 
       for (Resource resource : ecoreResourceSet.getResources())
       {
-        getEPackages()
-            .addAll(EcoreUtil.<EPackage> getObjectsByType(resource.getContents(), EcorePackage.Literals.EPACKAGE));
+        getEPackages().addAll(EcoreUtil.<EPackage> getObjectsByType(resource.getContents(), EcorePackage.Literals.EPACKAGE));
       }
 
-      BasicDiagnostic diagnosticChain = new BasicDiagnostic(ConverterPlugin.ID, ConverterUtil.ACTION_MESSAGE_NONE,
-          Messages.getString("CDOImporter_5"), null); //$NON-NLS-1$
+      BasicDiagnostic diagnosticChain = new BasicDiagnostic(ConverterPlugin.ID, ConverterUtil.ACTION_MESSAGE_NONE, Messages.getString("CDOImporter_5"), null); //$NON-NLS-1$
       for (EPackage ePackage : getEPackages())
       {
         Diagnostician.INSTANCE.validate(ePackage, diagnosticChain);
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
index d9e4aeb2b7..dccb6a7ca7 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
@@ -36,15 +36,13 @@ public class CDOImporterWizard extends ModelImporterWizard
   @Override
   public void addPages()
   {
-    ModelImporterDetailPage detailPage = new ModelImporterDetailPage(getModelImporter(),
-        Messages.getString("CDOImporterWizard_0")); //$NON-NLS-1$
+    ModelImporterDetailPage detailPage = new ModelImporterDetailPage(getModelImporter(), Messages.getString("CDOImporterWizard_0")); //$NON-NLS-1$
     detailPage.setTitle(Messages.getString("CDOImporterWizard_1")); //$NON-NLS-1$
     detailPage.setDescription(detailPage.showGenModel() ? Messages.getString("CDOImporterWizard_2") //$NON-NLS-1$
         : Messages.getString("CDOImporterWizard_3")); //$NON-NLS-1$
     addPage(detailPage);
 
-    ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(),
-        Messages.getString("CDOImporterWizard_4")); //$NON-NLS-1$
+    ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(), Messages.getString("CDOImporterWizard_4")); //$NON-NLS-1$
     packagePage.setShowReferencedGenModels(true);
     addPage(packagePage);
   }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
index 6a5cc40c90..23ddd2167d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
@@ -39,11 +39,9 @@ import java.util.Set;
  * @author Eike Stepper
  */
 @SuppressWarnings("deprecation")
-public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImpl
-    implements org.eclipse.emf.cdo.net4j.CDOSessionConfiguration
+public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImpl implements org.eclipse.emf.cdo.net4j.CDOSessionConfiguration
 {
-  private static final boolean TEST_RECORDER = Boolean
-      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.enabled", "false"));
+  private static final boolean TEST_RECORDER = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.enabled", "false"));
 
   private String repositoryName;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
index 16d272d9e0..6380c04d8e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
@@ -148,24 +148,23 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
     CDOClientProtocol protocol = createProtocol();
     setSessionProtocol(protocol);
     hookSessionProtocol();
-  
+
     try
     {
       String userID = getUserID();
       boolean passiveUpdateEnabled = options().isPassiveUpdateEnabled();
       PassiveUpdateMode passiveUpdateMode = options().getPassiveUpdateMode();
       LockNotificationMode lockNotificationMode = options().getLockNotificationMode();
-  
+
       // TODO (CD) The next call is on the CDOClientProtocol; shouldn't it be on the DelegatingSessionProtocol instead?
-      OpenSessionResult result = protocol.openSession(repositoryName, userID, passiveUpdateEnabled, passiveUpdateMode,
-          lockNotificationMode);
-  
+      OpenSessionResult result = protocol.openSession(repositoryName, userID, passiveUpdateEnabled, passiveUpdateMode, lockNotificationMode);
+
       if (result == null)
       {
         // Skip to response because the user has canceled the authentication
         return null;
       }
-  
+
       setSessionID(result.getSessionID());
       setUserID(result.getUserID());
       setLastUpdateTime(result.getLastUpdateTime());
@@ -178,7 +177,7 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
       {
         throw (SecurityException)ex.getCause();
       }
-  
+
       throw ex;
     }
   }
@@ -298,7 +297,7 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
     {
       protocol.setStreamWrapper(streamWrapper);
     }
-  
+
     protocol.open(connector);
     protocol.setTimeout(signalTimeout);
     return protocol;
@@ -319,15 +318,14 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
     {
       clientProtocol = (CDOClientProtocol)sessionProtocol;
     }
-  
+
     return clientProtocol;
   }
 
   /**
    * @author Eike Stepper
    */
-  protected class OptionsImpl extends org.eclipse.emf.internal.cdo.session.CDOSessionImpl.OptionsImpl
-      implements org.eclipse.emf.cdo.net4j.CDOSession.Options
+  protected class OptionsImpl extends org.eclipse.emf.internal.cdo.session.CDOSessionImpl.OptionsImpl implements org.eclipse.emf.cdo.net4j.CDOSession.Options
   {
     private int commitTimeout = CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
index 27da01d300..7fc6532d2c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
@@ -22,15 +22,13 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
  * @author Eike Stepper
  * @since 4.0
  */
-public class FailoverCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl
-    implements FailoverCDOSessionConfiguration
+public class FailoverCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl implements FailoverCDOSessionConfiguration
 {
   private String monitorConnectorDescription;
 
   private String repositoryGroup;
 
-  public FailoverCDOSessionConfigurationImpl(String monitorConnectorDescription, String repositoryGroup,
-      IManagedContainer container)
+  public FailoverCDOSessionConfigurationImpl(String monitorConnectorDescription, String repositoryGroup, IManagedContainer container)
   {
     super(container);
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/Net4jConnectorInjector.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/Net4jConnectorInjector.java
index aa5e210264..bacbd356ee 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/Net4jConnectorInjector.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/Net4jConnectorInjector.java
@@ -27,8 +27,7 @@ public class Net4jConnectorInjector implements IElementProcessor
   {
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof CDONet4jSessionImpl)
     {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
index 5371ea6f1e..7a6dd2736f 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
@@ -20,8 +20,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
 /**
  * @author Caspar De Groot
  */
-public class ReconnectingCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl
-    implements ReconnectingCDOSessionConfiguration
+public class ReconnectingCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl implements ReconnectingCDOSessionConfiguration
 {
   private String hostAndPort;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
index 6aac0c0599..799232278b 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
@@ -19,8 +19,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
 /**
  * @author Caspar De Groot
  */
-public abstract class RecoveringCDOSessionConfigurationImpl extends CDONet4jSessionConfigurationImpl
-    implements RecoveringCDOSessionConfiguration
+public abstract class RecoveringCDOSessionConfigurationImpl extends CDONet4jSessionConfigurationImpl implements RecoveringCDOSessionConfiguration
 {
   private IManagedContainer container;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
index d9ed8ea76f..8ef48e3cd6 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
@@ -112,11 +112,10 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     return packageURICompressor;
   }
 
-  public OpenSessionResult openSession(String repositoryName, String userID, boolean passiveUpdateEnabled,
-      PassiveUpdateMode passiveUpdateMode, LockNotificationMode lockNotificationMode)
+  public OpenSessionResult openSession(String repositoryName, String userID, boolean passiveUpdateEnabled, PassiveUpdateMode passiveUpdateMode,
+      LockNotificationMode lockNotificationMode)
   {
-    return send(new OpenSessionRequest(this, repositoryName, userID, passiveUpdateEnabled, passiveUpdateMode,
-        lockNotificationMode), new Monitor());
+    return send(new OpenSessionRequest(this, repositoryName, userID, passiveUpdateEnabled, passiveUpdateMode, lockNotificationMode), new Monitor());
   }
 
   public void disablePassiveUpdate()
@@ -191,14 +190,12 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     return send(new LoadCommitDataRequest(this, timeStamp));
   }
 
-  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex,
-      int fromIndex, int toIndex)
+  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex)
   {
     return send(new LoadChunkRequest(this, revision, feature, accessIndex, fetchIndex, fromIndex, toIndex));
   }
 
-  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth)
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     return send(new LoadRevisionsRequest(this, infos, branchPoint, referenceChunk, prefetchDepth));
   }
@@ -213,12 +210,10 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     return send(new LoadObjectLifetimeRequest(this, id, branchPoint));
   }
 
-  public RefreshSessionResult refresh(long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
+  public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates)
   {
-    return send(
-        new RefreshSessionRequest(this, lastUpdateTime, viewedRevisions, initialChunkSize, enablePassiveUpdates));
+    return send(new RefreshSessionRequest(this, lastUpdateTime, viewedRevisions, initialChunkSize, enablePassiveUpdates));
   }
 
   public void openView(int viewID, boolean readOnly, CDOBranchPoint branchPoint)
@@ -231,11 +226,10 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     return send(new OpenViewRequest(this, viewID, readOnly, durableLockingID));
   }
 
-  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
+  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
   {
-    send(new SwitchTargetRequest(this, viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects),
-        monitor);
+    send(new SwitchTargetRequest(this, viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects), monitor);
   }
 
   public void closeView(int viewID)
@@ -266,8 +260,8 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
   }
 
   @Deprecated
-  public LockObjectsResult lockObjects(List<InternalCDORevision> revisions, int viewID, CDOBranch viewedBranch,
-      LockType lockType, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects(List<InternalCDORevision> revisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
+      throws InterruptedException
   {
     // List<CDORevisionKey> revisionKeys = new LinkedList<CDORevisionKey>();
     // for (InternalCDORevision rev : revisions)
@@ -280,8 +274,8 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     throw new UnsupportedOperationException();
   }
 
-  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch,
-      LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch, LockType lockType, boolean recursive,
+      long timeout) throws InterruptedException
   {
     InterruptedException interruptedException = null;
     RuntimeException runtimeException = null;
@@ -318,16 +312,15 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     throw runtimeException;
   }
 
-  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys,
-      CDOBranch viewedBranch, LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, LockType lockType,
+      boolean recursive, long timeout) throws InterruptedException
   {
     InterruptedException interruptedException = null;
     RuntimeException runtimeException = null;
 
     try
     {
-      return new LockDelegationRequest(this, lockAreaID, revisionKeys, viewedBranch, lockType, recursive, timeout)
-          .send();
+      return new LockDelegationRequest(this, lockAreaID, revisionKeys, viewedBranch, lockType, recursive, timeout).send();
     }
     catch (RemoteException ex)
     {
@@ -365,14 +358,12 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     throw new UnsupportedOperationException();
   }
 
-  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     return send(new UnlockObjectsRequest(this, view.getViewID(), objectIDs, lockType, recursive));
   }
 
-  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     return send(new UnlockDelegationRequest(this, lockAreaID, objectIDs, lockType, recursive));
   }
@@ -412,15 +403,14 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     }
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     send(new HandleRevisionsRequest(this, eClass, branch, exactBranch, timeStamp, exactTime, handler));
   }
 
   @Deprecated
-  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
+      Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -431,8 +421,8 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
   }
 
   @Deprecated
-  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
+      Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -498,8 +488,8 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
   }
 
   @Deprecated
-  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
+  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo)
   {
     throw new UnsupportedOperationException();
   }
@@ -546,8 +536,7 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
     send(new ChangeCredentialsRequest(this, CredentialsUpdateOperation.RESET_PASSWORD, userID), new Monitor());
   }
 
-  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler,
-      OMMonitor monitor)
+  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor)
   {
     return send(new UnitRequest(this, viewID, rootID, opcode, revisionHandler), monitor);
   }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
index 83188ffa25..cdf241c7ef 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
@@ -42,8 +42,7 @@ public class ChangeSubscriptionRequest extends CDOClientRequest<Boolean>
 
   private boolean clear;
 
-  public ChangeSubscriptionRequest(CDOClientProtocol protocol, int viewID, List<CDOID> ids, boolean subscribeMode,
-      boolean clear)
+  public ChangeSubscriptionRequest(CDOClientProtocol protocol, int viewID, List<CDOID> ids, boolean subscribeMode, boolean clear)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_CHANGE_SUBSCRIPTION);
     this.viewID = viewID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
index b59fdd8d14..df6b60ace8 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
@@ -43,8 +43,7 @@ import java.util.Map.Entry;
  */
 public class CommitXATransactionPhase2Request extends CommitXATransactionRequest
 {
-  private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL,
-      CommitXATransactionPhase1Request.class);
+  private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitXATransactionPhase1Request.class);
 
   public CommitXATransactionPhase2Request(CDOClientProtocol protocol, InternalCDOXACommitContext xaContext)
   {
@@ -81,17 +80,15 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest
       InternalCDOXACommitContext commitContext = context.getTransactionManager().getCommitContext(entry.getValue());
       if (commitContext == null)
       {
-        throw new IllegalStateException(
-            MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.1"), entry //$NON-NLS-1$
-                .getValue()));
+        throw new IllegalStateException(MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.1"), entry //$NON-NLS-1$
+            .getValue()));
       }
 
       CDOID newID = commitContext.getResult().getIDMappings().get(oldCDOID);
       if (newID == null)
       {
-        throw new IllegalStateException(
-            MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.2"), oldCDOID //$NON-NLS-1$
-                .toURIFragment()));
+        throw new IllegalStateException(MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.2"), oldCDOID //$NON-NLS-1$
+            .toURIFragment()));
       }
 
       CDOID newIDExternal = CDOURIUtil.convertExternalCDOID(oldURIExternal, newID);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
index da525007a0..59be1ffb04 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CredentialsChallengeIndication.java
@@ -90,8 +90,7 @@ public class CredentialsChallengeIndication extends IndicationWithMonitoring
         throw new IllegalStateException("No credentials update provider configured"); //$NON-NLS-1$
       }
 
-      IPasswordCredentialsUpdate credentials = ((IPasswordCredentialsUpdateProvider)credentialsProvider)
-          .getCredentialsUpdate(userID, operation);
+      IPasswordCredentialsUpdate credentials = ((IPasswordCredentialsUpdateProvider)credentialsProvider).getCredentialsUpdate(userID, operation);
       if (credentials == null)
       {
         // User canceled. Fine
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java
index 4d3969874b..59f2d49172 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java
@@ -44,8 +44,8 @@ public class HandleRevisionsRequest extends CDOClientRequest<Boolean>
 
   private CDORevisionHandler handler;
 
-  public HandleRevisionsRequest(CDOClientProtocol protocol, EClass eClass, CDOBranch branch, boolean exactBranch,
-      long timeStamp, boolean exactTime, CDORevisionHandler handler)
+  public HandleRevisionsRequest(CDOClientProtocol protocol, EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
+      CDORevisionHandler handler)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_HANDLE_REVISIONS);
     this.eClass = eClass;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java
index 9b3a13da5d..d08a4cef58 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java
@@ -46,8 +46,8 @@ public class LoadChunkRequest extends CDOClientRequest<Object>
 
   private int fetchIndex;
 
-  public LoadChunkRequest(CDOClientProtocol protocol, InternalCDORevision revision, EStructuralFeature feature,
-      int accessIndex, int fetchIndex, int fromIndex, int toIndex)
+  public LoadChunkRequest(CDOClientProtocol protocol, InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex,
+      int toIndex)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOAD_CHUNK);
     this.revision = revision;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadCommitInfosRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadCommitInfosRequest.java
index 3d23bcd8e6..b8efdcba29 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadCommitInfosRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadCommitInfosRequest.java
@@ -36,8 +36,7 @@ public class LoadCommitInfosRequest extends CDOClientRequest<Boolean>
 
   private CDOCommitInfoHandler handler;
 
-  public LoadCommitInfosRequest(CDOClientProtocol protocol, CDOBranch branch, long startTime, long endTime,
-      CDOCommitInfoHandler handler)
+  public LoadCommitInfosRequest(CDOClientProtocol protocol, CDOBranch branch, long startTime, long endTime, CDOCommitInfoHandler handler)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOAD_COMMIT_INFOS);
     this.branch = branch;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java
index 65f3522923..f8eb63c115 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java
@@ -47,9 +47,8 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa
 
   private boolean auto;
 
-  public LoadMergeDataRequest(CDOClientProtocol protocol, CDORevisionAvailabilityInfo targetInfo,
-      CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
-      CDORevisionAvailabilityInfo sourceBaseInfo)
+  public LoadMergeDataRequest(CDOClientProtocol protocol, CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
+      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOAD_MERGE_DATA);
     this.targetInfo = targetInfo;
@@ -86,8 +85,7 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa
     }
   }
 
-  private void writeRevisionAvailabilityInfo(CDODataOutput out, CDORevisionAvailabilityInfo info, OMMonitor monitor)
-      throws IOException
+  private void writeRevisionAvailabilityInfo(CDODataOutput out, CDORevisionAvailabilityInfo info, OMMonitor monitor) throws IOException
   {
     CDOBranchPoint branchPoint = info.getBranchPoint();
     if (branchPoint != CDOBranchUtil.AUTO_BRANCH_POINT)
@@ -206,8 +204,7 @@ public class LoadMergeDataRequest extends CDOClientRequestWithMonitoring<MergeDa
     }
   }
 
-  private void readRevisionAvailabilityInfo(CDODataInput in, CDORevisionAvailabilityInfo info, Set<CDOID> result,
-      OMMonitor monitor) throws IOException
+  private void readRevisionAvailabilityInfo(CDODataInput in, CDORevisionAvailabilityInfo info, Set<CDOID> result, OMMonitor monitor) throws IOException
   {
     int size = in.readInt();
     monitor.begin(size + 1);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java
index bf263ee3ef..0695d072e3 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java
@@ -37,8 +37,7 @@ public class LoadRevisionByVersionRequest extends CDOClientRequest<InternalCDORe
 
   private int referenceChunk;
 
-  public LoadRevisionByVersionRequest(CDOClientProtocol protocol, CDOID id, CDOBranchVersion branchVersion,
-      int referenceChunk)
+  public LoadRevisionByVersionRequest(CDOClientProtocol protocol, CDOID id, CDOBranchVersion branchVersion, int referenceChunk)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_VERSION);
     this.id = id;
@@ -78,7 +77,6 @@ public class LoadRevisionByVersionRequest extends CDOClientRequest<InternalCDORe
   @Override
   public String toString()
   {
-    return MessageFormat.format("LoadRevisionByVersionRequest(id={0}, branchVersion={1}, referenceChunk={2})", id,
-        branchVersion, referenceChunk);
+    return MessageFormat.format("LoadRevisionByVersionRequest(id={0}, branchVersion={1}, referenceChunk={2})", id, branchVersion, referenceChunk);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
index 4d5e2042c8..e64e23d40c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
@@ -45,8 +45,7 @@ public class LoadRevisionsRequest extends CDOClientRequest<List<RevisionInfo>>
 
   private int prefetchDepth;
 
-  public LoadRevisionsRequest(CDOClientProtocol protocol, List<RevisionInfo> infos, CDOBranchPoint branchPoint,
-      int referenceChunk, int prefetchDepth)
+  public LoadRevisionsRequest(CDOClientProtocol protocol, List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOAD_REVISIONS);
     this.infos = infos;
@@ -117,8 +116,7 @@ public class LoadRevisionsRequest extends CDOClientRequest<List<RevisionInfo>>
       CDOID contextID = ruleManager.getContext();
 
       out.writeInt(fetchSize);
-      out.writeInt(
-          collectionLoadingPolicy != null ? collectionLoadingPolicy.getInitialChunkSize() : CDORevision.UNCHUNKED);
+      out.writeInt(collectionLoadingPolicy != null ? collectionLoadingPolicy.getInitialChunkSize() : CDORevision.UNCHUNKED);
       out.writeCDOID(contextID);
 
       for (CDOFetchRule fetchRule : fetchRules)
@@ -166,8 +164,7 @@ public class LoadRevisionsRequest extends CDOClientRequest<List<RevisionInfo>>
   @Override
   public String toString()
   {
-    return MessageFormat.format(
-        "LoadRevisionsRequest(infos={0}, branchPoint={1}, referenceChunk={2}, prefetchDepth={3})", infos, branchPoint,
-        referenceChunk, prefetchDepth);
+    return MessageFormat.format("LoadRevisionsRequest(infos={0}, branchPoint={1}, referenceChunk={2}, prefetchDepth={3})", infos, branchPoint, referenceChunk,
+        prefetchDepth);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
index fd01230222..36f709f1d4 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
@@ -29,8 +29,8 @@ public class LockDelegationRequest extends LockObjectsRequest
 
   private CDOBranch viewedBranch;
 
-  public LockDelegationRequest(CDOClientProtocol protocol, String lockAreaID, List<CDORevisionKey> revisionKeys,
-      CDOBranch viewedBranch, LockType lockType, boolean recursive, long timeout)
+  public LockDelegationRequest(CDOClientProtocol protocol, String lockAreaID, List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, LockType lockType,
+      boolean recursive, long timeout)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_LOCK_DELEGATION, revisionKeys, 0, lockType, recursive, timeout);
     this.lockAreaID = lockAreaID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
index 534edd1809..d17fe24816 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
@@ -40,14 +40,13 @@ public class LockObjectsRequest extends CDOClientRequest<LockObjectsResult>
 
   private boolean recursive;
 
-  public LockObjectsRequest(CDOClientProtocol protocol, List<CDORevisionKey> revisionKeys, int viewID,
-      LockType lockType, boolean recursive, long timeout)
+  public LockObjectsRequest(CDOClientProtocol protocol, List<CDORevisionKey> revisionKeys, int viewID, LockType lockType, boolean recursive, long timeout)
   {
     this(protocol, CDOProtocolConstants.SIGNAL_LOCK_OBJECTS, revisionKeys, viewID, lockType, recursive, timeout);
   }
 
-  protected LockObjectsRequest(CDOClientProtocol protocol, short signalID, List<CDORevisionKey> revisionKeys,
-      int viewID, LockType lockType, boolean recursive, long timeout)
+  protected LockObjectsRequest(CDOClientProtocol protocol, short signalID, List<CDORevisionKey> revisionKeys, int viewID, LockType lockType, boolean recursive,
+      long timeout)
   {
     super(protocol, signalID);
 
@@ -97,7 +96,6 @@ public class LockObjectsRequest extends CDOClientRequest<LockObjectsResult>
       newLockStates[i] = in.readCDOLockState();
     }
 
-    return new LockObjectsResult(succesful, timeout, waitForUpdate, requiredTimestamp, staleRevisions, newLockStates,
-        timestamp);
+    return new LockObjectsResult(succesful, timeout, waitForUpdate, requiredTimestamp, staleRevisions, newLockStates, timestamp);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java
index a45d8b44d0..6952934ebc 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java
@@ -37,8 +37,7 @@ public class ObjectLockedRequest extends CDOClientRequest<Boolean>
 
   private boolean byOthers;
 
-  public ObjectLockedRequest(CDOClientProtocol protocol, CDOView view, CDOObject object, LockType lockType,
-      boolean byOthers)
+  public ObjectLockedRequest(CDOClientProtocol protocol, CDOView view, CDOObject object, LockType lockType, boolean byOthers)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_OBJECT_LOCKED);
     this.view = view;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
index 7d34ba3733..001fa8e3f1 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
@@ -42,8 +42,8 @@ public class OpenSessionRequest extends CDOClientRequestWithMonitoring<OpenSessi
 
   private LockNotificationMode lockNotificationMode;
 
-  public OpenSessionRequest(CDOClientProtocol protocol, String repositoryName, String userID,
-      boolean passiveUpdateEnabled, PassiveUpdateMode passiveUpdateMode, LockNotificationMode lockNotificationMode)
+  public OpenSessionRequest(CDOClientProtocol protocol, String repositoryName, String userID, boolean passiveUpdateEnabled, PassiveUpdateMode passiveUpdateMode,
+      LockNotificationMode lockNotificationMode)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_OPEN_SESSION);
     this.repositoryName = repositoryName;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RefreshSessionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RefreshSessionRequest.java
index ecc6431620..67576df022 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RefreshSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RefreshSessionRequest.java
@@ -42,17 +42,14 @@ public class RefreshSessionRequest extends CDOClientRequest<RefreshSessionResult
 
   private boolean enablePassiveUpdates;
 
-  public RefreshSessionRequest(CDOClientProtocol protocol, long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
-      boolean enablePassiveUpdates)
+  public RefreshSessionRequest(CDOClientProtocol protocol, long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions,
+      int initialChunkSize, boolean enablePassiveUpdates)
   {
-    this(protocol, CDOProtocolConstants.SIGNAL_REFRESH_SESSION, lastUpdateTime, viewedRevisions, initialChunkSize,
-        enablePassiveUpdates);
+    this(protocol, CDOProtocolConstants.SIGNAL_REFRESH_SESSION, lastUpdateTime, viewedRevisions, initialChunkSize, enablePassiveUpdates);
   }
 
   protected RefreshSessionRequest(CDOClientProtocol protocol, short signalID, long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
-      boolean enablePassiveUpdates)
+      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize, boolean enablePassiveUpdates)
   {
     super(protocol, signalID);
     this.lastUpdateTime = lastUpdateTime;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java
index 04fd9be1de..07a9ef6874 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java
@@ -27,8 +27,7 @@ import java.io.IOException;
  */
 public class RemoteMessageNotificationIndication extends CDOClientIndication
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL,
-      RemoteMessageNotificationIndication.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageNotificationIndication.class);
 
   public RemoteMessageNotificationIndication(CDOClientProtocol protocol)
   {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java
index 4bad89b402..da3edbf3b1 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java
@@ -35,8 +35,7 @@ public class RemoteMessageRequest extends CDOClientRequest<Set<Integer>>
 
   private List<CDORemoteSession> recipients;
 
-  public RemoteMessageRequest(CDOClientProtocol protocol, CDORemoteSessionMessage message,
-      List<CDORemoteSession> recipients)
+  public RemoteMessageRequest(CDOClientProtocol protocol, CDORemoteSessionMessage message, List<CDORemoteSession> recipients)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_REMOTE_MESSAGE);
     this.message = message;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SwitchTargetRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SwitchTargetRequest.java
index 73744e53bf..12d8a36f6a 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SwitchTargetRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SwitchTargetRequest.java
@@ -42,9 +42,8 @@ public class SwitchTargetRequest extends CDOClientRequestWithMonitoring<Object>
 
   private List<CDOIDAndVersion> allDetachedObjects;
 
-  public SwitchTargetRequest(CDOClientProtocol protocol, int viewID, CDOBranchPoint branchPoint,
-      List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects)
+  public SwitchTargetRequest(CDOClientProtocol protocol, int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
+      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_SWITCH_TARGET);
     this.viewID = viewID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnitRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnitRequest.java
index 0c99609296..f9f3c41239 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnitRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnitRequest.java
@@ -35,8 +35,7 @@ public class UnitRequest extends CDOClientRequestWithMonitoring<Boolean>
 
   private CDORevisionHandler revisionHandler;
 
-  public UnitRequest(CDOClientProtocol protocol, int viewID, CDOID rootID, UnitOpcode opcode,
-      CDORevisionHandler revisionHandler)
+  public UnitRequest(CDOClientProtocol protocol, int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_UNIT);
     this.viewID = viewID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
index 6a8cd6b530..5d4b3e619e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
@@ -26,8 +26,7 @@ public class UnlockDelegationRequest extends UnlockObjectsRequest
 {
   private String lockAreaID;
 
-  public UnlockDelegationRequest(CDOClientProtocol protocol, String lockAreaID, Collection<CDOID> objectIDs,
-      LockType lockType, boolean recursive)
+  public UnlockDelegationRequest(CDOClientProtocol protocol, String lockAreaID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_UNLOCK_DELEGATION, 0, objectIDs, lockType, recursive);
     this.lockAreaID = lockAreaID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java
index 914e8bdd86..69a45fe808 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java
@@ -40,14 +40,12 @@ public class UnlockObjectsRequest extends CDOClientRequest<UnlockObjectsResult>
 
   private boolean recursive;
 
-  public UnlockObjectsRequest(CDOClientProtocol protocol, int viewID, Collection<CDOID> objects, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsRequest(CDOClientProtocol protocol, int viewID, Collection<CDOID> objects, LockType lockType, boolean recursive)
   {
     this(protocol, CDOProtocolConstants.SIGNAL_UNLOCK_OBJECTS, viewID, objects, lockType, recursive);
   }
 
-  protected UnlockObjectsRequest(CDOClientProtocol protocol, short signalID, int viewID, Collection<CDOID> objectIDs,
-      LockType lockType, boolean recursive)
+  protected UnlockObjectsRequest(CDOClientProtocol protocol, short signalID, int viewID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     super(protocol, signalID);
     this.viewID = viewID;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
index 39f2b16538..1249b1aa5d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
@@ -24,8 +24,7 @@ import java.io.IOException;
  */
 public class UnsubscribeRemoteSessionsRequest extends CDOClientRequest<Boolean>
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL,
-      UnsubscribeRemoteSessionsRequest.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, UnsubscribeRemoteSessionsRequest.class);
 
   public UnsubscribeRemoteSessionsRequest(CDOClientProtocol protocol)
   {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/testrecorder/TestRecorder.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/testrecorder/TestRecorder.java
index d770196cb4..9987f27868 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/testrecorder/TestRecorder.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/testrecorder/TestRecorder.java
@@ -71,17 +71,13 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
 {
   public static final TestRecorder INSTANCE = new TestRecorder();
 
-  private static final String OUTPUT_FOLDER = OMPlatform.INSTANCE
-      .getProperty("org.eclipse.emf.cdo.test.recorder.outputFolder");
+  private static final String OUTPUT_FOLDER = OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.outputFolder");
 
-  private static final String CLASS_NAME = OMPlatform.INSTANCE
-      .getProperty("org.eclipse.emf.cdo.test.recorder.className");
+  private static final String CLASS_NAME = OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.className");
 
-  private static final String DESCRIPTION = OMPlatform.INSTANCE
-      .getProperty("org.eclipse.emf.cdo.test.recorder.description");
+  private static final String DESCRIPTION = OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.description");
 
-  private static final boolean RECORD_VIEWS = Boolean
-      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.recordViews", "false"));
+  private static final boolean RECORD_VIEWS = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.test.recorder.recordViews", "false"));
 
   private static final Map<Object, String> TYPES = new HashMap<Object, String>();
   static
@@ -240,8 +236,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
     Variable variable = createVariable("branch", branch);
 
     String lhs = "CDOBranch " + variable + " = ";
-    String create = ".createBranch(" + list(quot(branch.getName()), formatTimeStamp(originalBaseTimeStamp, true))
-        + ");";
+    String create = ".createBranch(" + list(quot(branch.getName()), formatTimeStamp(originalBaseTimeStamp, true)) + ");";
 
     CDOBranch baseBranch = branch.getBase().getBranch();
     if (baseBranch.isMainBranch())
@@ -257,8 +252,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
       }
       else
       {
-        println(lhs + variables.get(getSession(branch)) + ".getBranchManager().getBranch("
-            + quot(baseBranch.getPathName()) + ")" + create);
+        println(lhs + variables.get(getSession(branch)) + ".getBranchManager().getBranch(" + quot(baseBranch.getPathName()) + ")" + create);
       }
     }
   }
@@ -272,8 +266,8 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
     if (RECORD_VIEWS)
     {
       Variable variable = createVariable("view", view);
-      println("CDOView " + variable + " = " + variables.get(session) + ".openView("
-          + list(formatBranch(branch, true), formatTimeStamp(timeStamp, true)) + ");");
+      println(
+          "CDOView " + variable + " = " + variables.get(session) + ".openView(" + list(formatBranch(branch, true), formatTimeStamp(timeStamp, true)) + ");");
 
       addCloseListener(variable);
     }
@@ -282,8 +276,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
   public synchronized void openTransaction(TestRecorderTransaction transaction, CDOSession session, CDOBranch branch)
   {
     Variable variable = createVariable("transaction", transaction);
-    println("CDOTransaction " + variable + " = " + variables.get(session) + ".openTransaction("
-        + formatBranch(branch, true) + ");");
+    println("CDOTransaction " + variable + " = " + variables.get(session) + ".openTransaction(" + formatBranch(branch, true) + ");");
 
     addCloseListener(variable);
     transaction.addTransactionHandler(this);
@@ -300,8 +293,8 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
       String type = TYPES.get(eClass);
       Variable variable = createVariable(type, resourceNode);
 
-      println(typeName + " " + variable + " = " + variables.get(transaction) + "." + typeName.replace("CDO", "create")
-          + "(getResourcePath(" + quot(resourceNode.getPath()) + "));");
+      println(typeName + " " + variable + " = " + variables.get(transaction) + "." + typeName.replace("CDO", "create") + "(getResourcePath("
+          + quot(resourceNode.getPath()) + "));");
     }
   }
 
@@ -316,8 +309,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
     }
   }
 
-  public synchronized void modifyingObject(CDOTransaction transaction, final CDOObject object,
-      CDOFeatureDelta featureDelta)
+  public synchronized void modifyingObject(CDOTransaction transaction, final CDOObject object, CDOFeatureDelta featureDelta)
   {
     if (object instanceof CDOResourceNode)
     {
@@ -464,15 +456,12 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
 
   public synchronized void mergeTransaction(TestRecorderTransaction transaction, CDOBranch source, CDOMerger merger)
   {
-    println(variables.get(transaction) + ".merge(" + formatBranch(source, false) + ", new " + simpleClassName(merger)
-        + "());");
+    println(variables.get(transaction) + ".merge(" + formatBranch(source, false) + ", new " + simpleClassName(merger) + "());");
   }
 
-  public synchronized void mergeTransaction(TestRecorderTransaction transaction, CDOBranchPoint source,
-      CDOMerger merger)
+  public synchronized void mergeTransaction(TestRecorderTransaction transaction, CDOBranchPoint source, CDOMerger merger)
   {
-    println(variables.get(transaction) + ".merge(" + formatBranchPoint(source, false) + ", new "
-        + simpleClassName(merger) + "());");
+    println(variables.get(transaction) + ".merge(" + formatBranchPoint(source, false) + ", new " + simpleClassName(merger) + "());");
   }
 
   public synchronized void commitTransaction(TestRecorderTransaction transaction, CDOCommitInfo commitInfo)
@@ -493,8 +482,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
       variables.put(branchPoint, oldVariable);
     }
 
-    StringBuilder builder = new StringBuilder(
-        "CDOCommitInfo " + variable + " = commitAndSync(" + variables.get(transaction));
+    StringBuilder builder = new StringBuilder("CDOCommitInfo " + variable + " = commitAndSync(" + variables.get(transaction));
 
     for (InternalCDOView view : transaction.getSession().getViews())
     {
@@ -562,8 +550,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
     if (branchPointVariable == null)
     {
       branchPointVariable = createVariable("point", branchPoint);
-      println("CDOBranchPoint " + branchPointVariable + " = " + formatBranch(branch, false) + ".getPoint("
-          + formatTimeStamp(timeStamp, false) + ");");
+      println("CDOBranchPoint " + branchPointVariable + " = " + formatBranch(branch, false) + ".getPoint(" + formatTimeStamp(timeStamp, false) + ");");
     }
 
     return branchPointVariable.toString();
@@ -587,8 +574,7 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
       }
 
       branchVariable = createVariable("branch", branch);
-      println("CDOBranch " + branchVariable + " = " + sessionVariable + ".getBranchManager().getBranch("
-          + quot(branch.getPathName()) + ");");
+      println("CDOBranch " + branchVariable + " = " + sessionVariable + ".getBranchManager().getBranch(" + quot(branch.getPathName()) + ");");
     }
 
     return branchVariable.toString();
@@ -625,8 +611,8 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
       String type = TYPES.get(eClass);
       variable = createVariable(type, resourceNode);
 
-      println(typeName + " " + variable + " = " + variables.get(resourceNode.cdoView()) + "."
-          + typeName.replace("CDO", "get") + "(getResourcePath(" + quot(resourceNode.getPath()) + "));");
+      println(typeName + " " + variable + " = " + variables.get(resourceNode.cdoView()) + "." + typeName.replace("CDO", "get") + "(getResourcePath("
+          + quot(resourceNode.getPath()) + "));");
     }
 
     return variable.toString();
@@ -661,14 +647,12 @@ public final class TestRecorder implements CDOTransactionHandler1.WithUndo
             List<?> list = (List<?>)value;
             for (Object element : list)
             {
-              println(variable + ".get" + StringUtil.cap(feature.getName()) + "().add("
-                  + formatValue(object, feature, element) + ");");
+              println(variable + ".get" + StringUtil.cap(feature.getName()) + "().add(" + formatValue(object, feature, element) + ");");
             }
           }
           else if (value != null)
           {
-            println(variable + ".set" + StringUtil.cap(feature.getName()) + "(" + formatValue(object, feature, value)
-                + ");");
+            println(variable + ".set" + StringUtil.cap(feature.getName()) + "(" + formatValue(object, feature, value) + ");");
           }
         }
       }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
index f25661eeb5..5c7458e250 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
@@ -125,8 +125,7 @@ public final class CDONet4jUtil
   /**
    * @since 4.0
    */
-  public static ReconnectingCDOSessionConfiguration createReconnectingSessionConfiguration(String hostAndPort,
-      String repoName, IManagedContainer container)
+  public static ReconnectingCDOSessionConfiguration createReconnectingSessionConfiguration(String hostAndPort, String repoName, IManagedContainer container)
   {
     return new ReconnectingCDOSessionConfigurationImpl(hostAndPort, repoName, container);
   }
@@ -134,8 +133,7 @@ public final class CDONet4jUtil
   /**
    * @since 4.0
    */
-  public static FailoverCDOSessionConfiguration createFailoverSessionConfiguration(String monitorConnectorDescription,
-      String repositoryGroup)
+  public static FailoverCDOSessionConfiguration createFailoverSessionConfiguration(String monitorConnectorDescription, String repositoryGroup)
   {
     return createFailoverSessionConfiguration(monitorConnectorDescription, repositoryGroup, IPluginContainer.INSTANCE);
   }
@@ -143,8 +141,8 @@ public final class CDONet4jUtil
   /**
    * @since 4.0
    */
-  public static FailoverCDOSessionConfiguration createFailoverSessionConfiguration(String monitorConnectorDescription,
-      String repositoryGroup, IManagedContainer container)
+  public static FailoverCDOSessionConfiguration createFailoverSessionConfiguration(String monitorConnectorDescription, String repositoryGroup,
+      IManagedContainer container)
   {
     return new FailoverCDOSessionConfigurationImpl(monitorConnectorDescription, repositoryGroup, container);
   }
@@ -161,8 +159,7 @@ public final class CDONet4jUtil
    */
   public static CDONet4jSession getNet4jSession(IManagedContainer container, String description)
   {
-    return (CDONet4jSession)container.getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE,
-        description);
+    return (CDONet4jSession)container.getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE, description);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
index 0767e8b021..a97404726b 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
@@ -55,8 +55,7 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
     CDOURIData data = new CDOURIData(uri);
 
     IConnector connector = getConnector(data.getAuthority());
-    CDONet4jSession session = getNet4jSession(connector, data.getUserName(), data.getPassWord(),
-        data.getRepositoryName());
+    CDONet4jSession session = getNet4jSession(connector, data.getUserName(), data.getPassWord(), data.getRepositoryName());
 
     String viewID = data.getViewID();
     if (viewID != null)
@@ -181,19 +180,16 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
   /**
    * @since 4.1
    */
-  protected CDONet4jSession getNet4jSession(IConnector connector, String userName, String passWord,
-      String repositoryName)
+  protected CDONet4jSession getNet4jSession(IConnector connector, String userName, String passWord, String repositoryName)
   {
-    CDONet4jSessionConfiguration configuration = getNet4jSessionConfiguration(connector, userName, passWord,
-        repositoryName);
+    CDONet4jSessionConfiguration configuration = getNet4jSessionConfiguration(connector, userName, passWord, repositoryName);
     return configuration.openNet4jSession();
   }
 
   /**
    * @since 4.1
    */
-  protected CDONet4jSessionConfiguration getNet4jSessionConfiguration(IConnector connector, String userName,
-      String passWord, String repositoryName)
+  protected CDONet4jSessionConfiguration getNet4jSessionConfiguration(IConnector connector, String userName, String passWord, String repositoryName)
   {
     CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
     configuration.setConnector(connector);
@@ -212,8 +208,7 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
 
       try
       {
-        credentialsProvider = (IPasswordCredentialsProvider)getContainer()
-            .getElement("org.eclipse.net4j.util.credentialsProviders", "password", resource);
+        credentialsProvider = (IPasswordCredentialsProvider)getContainer().getElement("org.eclipse.net4j.util.credentialsProviders", "password", resource);
       }
       catch (FactoryNotFoundException ex)
       {
@@ -239,8 +234,7 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
    *             getNet4jSessionConfiguration()}.
    */
   @Deprecated
-  protected CDOSessionConfiguration getSessionConfiguration(IConnector connector, String userName, String passWord,
-      String repositoryName)
+  protected CDOSessionConfiguration getSessionConfiguration(IConnector connector, String userName, String passWord, String repositoryName)
   {
     return (CDOSessionConfiguration)getNet4jSessionConfiguration(connector, userName, passWord, repositoryName);
   }
diff --git a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
index f4a56bc04a..ac8a417390 100644
--- a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
@@ -386,7 +386,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
index 362eba0d48..00745c0c5c 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
@@ -54,8 +54,8 @@ public class Api2Html extends DefaultHandler
 
   private static final String NO_DOCS = "";
 
-  private static final Pattern VERSION_CHANGED = Pattern.compile(
-      "The ([^ ]+) version has been changed for the api component ([^ ]+) \\(from version ([^ ]+) to ([^ ]+)\\)");
+  private static final Pattern VERSION_CHANGED = Pattern
+      .compile("The ([^ ]+) version has been changed for the api component ([^ ]+) \\(from version ([^ ]+) to ([^ ]+)\\)");
 
   private int lastNodeID;
 
@@ -143,8 +143,7 @@ public class Api2Html extends DefaultHandler
           Matcher matcher = VERSION_CHANGED.matcher(message);
           if (matcher.matches())
           {
-            componentChange = "The " + matcher.group(1) + " version has been changed from " + matcher.group(3) + " to "
-                + matcher.group(4);
+            componentChange = "The " + matcher.group(1) + " version has been changed from " + matcher.group(3) + " to " + matcher.group(4);
           }
         }
 
@@ -334,8 +333,8 @@ public class Api2Html extends DefaultHandler
       out.println("</script>");
       out.println("</head>");
       out.println("<body>");
-      out.println("<h1>API Evolution Report for CDO <a href='http://www.eclipse.org/cdo/downloads/#"
-          + buildQualifier.replace('-', '_') + "'>" + buildQualifier + "</a></h1>");
+      out.println("<h1>API Evolution Report for CDO <a href='http://www.eclipse.org/cdo/downloads/#" + buildQualifier.replace('-', '_') + "'>" + buildQualifier
+          + "</a></h1>");
 
       breaking.generate(out, "");
       out.println("<p/>");
@@ -378,8 +377,7 @@ public class Api2Html extends DefaultHandler
     if (args.length == 0)
     {
       // Just for local testing!
-      args = new String[] { "/develop", "R20120918-0947", "/develop/git/cdo/plugins",
-          "/develop/ws/cdo/.buckminster/tp/plugins" };
+      args = new String[] { "/develop", "R20120918-0947", "/develop/git/cdo/plugins", "/develop/ws/cdo/.buckminster/tp/plugins" };
     }
 
     new Api2Html(new File(args[0]), args[1], new File(args[2]), new File(args[3]));
@@ -476,8 +474,7 @@ public class Api2Html extends DefaultHandler
     public void generate(PrintStream out, String indent) throws Exception
     {
       String href = getHref();
-      out.print(indent + getIcon() + " " + (href != null ? "<a href='" + href + "' target='_blank'>" : "") + getText()
-          + (href != null ? "</a>" : ""));
+      out.print(indent + getIcon() + " " + (href != null ? "<a href='" + href + "' target='_blank'>" : "") + getText() + (href != null ? "</a>" : ""));
     }
 
     protected String getHref() throws Exception
@@ -502,14 +499,12 @@ public class Api2Html extends DefaultHandler
     @Override
     public void generate(PrintStream out, String indent) throws Exception
     {
-      out.print(
-          indent + "<div class='" + getClass().getSimpleName().toLowerCase() + "'><a href=\"javascript:toggle('node"
-              + id + "')\"><img src='" + (isCollapsed() ? PLUS : MINUS) + "' id='img_node" + id + "'></a>");
+      out.print(indent + "<div class='" + getClass().getSimpleName().toLowerCase() + "'><a href=\"javascript:toggle('node" + id + "')\"><img src='"
+          + (isCollapsed() ? PLUS : MINUS) + "' id='img_node" + id + "'></a>");
       super.generate(out, "");
       out.println("</div>");
 
-      out.println(indent + "<div id=\"node" + id + "\" style='" + (isCollapsed() ? "display:none; " : "")
-          + "margin-left:20px;'>");
+      out.println(indent + "<div id=\"node" + id + "\" style='" + (isCollapsed() ? "display:none; " : "") + "margin-left:20px;'>");
 
       generateChildren(out, indent + "  ");
 
@@ -648,8 +643,8 @@ public class Api2Html extends DefaultHandler
         return null;
       }
 
-      return "http://download.eclipse.org/modeling/emf/cdo/drops/" + buildQualifier + "/help/" + docProject
-          + "/javadoc/" + componentID.replace('.', '/') + "/package-summary.html";
+      return "http://download.eclipse.org/modeling/emf/cdo/drops/" + buildQualifier + "/help/" + docProject + "/javadoc/" + componentID.replace('.', '/')
+          + "/package-summary.html";
     }
   }
 
@@ -750,8 +745,8 @@ public class Api2Html extends DefaultHandler
         return null;
       }
 
-      return "http://download.eclipse.org/modeling/emf/cdo/drops/" + buildQualifier + "/help/" + docProject
-          + "/javadoc/" + getTypeName().replace('.', '/').replace('$', '.') + ".html";
+      return "http://download.eclipse.org/modeling/emf/cdo/drops/" + buildQualifier + "/help/" + docProject + "/javadoc/"
+          + getTypeName().replace('.', '/').replace('$', '.') + ".html";
     }
 
     private String determineElementType(String typeName) throws MalformedURLException
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
index 9e8239fca6..57a09f5776 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
@@ -66,8 +66,7 @@ public class GenerateExampleBuilders
     }
   }
 
-  private static void processProjectDescriptor(File exampleProject, File installerPoject, String targetFolder)
-      throws Exception
+  private static void processProjectDescriptor(File exampleProject, File installerPoject, String targetFolder) throws Exception
   {
     String exampleProjectName = exampleProject.getName();
     String targetPath = installerPoject.getName() + "/" + targetFolder;
@@ -99,8 +98,7 @@ public class GenerateExampleBuilders
     updateProjectDescription(exampleProject, substitutes);
   }
 
-  private static void copy(File targetProject, Map<String, String> substitutes, String template, String targetPath)
-      throws IOException
+  private static void copy(File targetProject, Map<String, String> substitutes, String template, String targetPath) throws IOException
   {
     File source = getTemplate(targetProject.getParentFile(), template);
     String content = substitute(readFile(source), substitutes);
@@ -127,10 +125,8 @@ public class GenerateExampleBuilders
 
     String newDescription = description;
 
-    Pattern pattern = Pattern.compile(
-        "(\\s*<buildCommand>.*?</buildCommand>)*(\\s*<buildCommand>.*?<value>&lt;project&gt;/\\.externalToolBuilders/"
-            + targetProject.getName().replace(".", "\\.") + "\\.launch</value>.*?</buildCommand>)",
-        Pattern.DOTALL);
+    Pattern pattern = Pattern.compile("(\\s*<buildCommand>.*?</buildCommand>)*(\\s*<buildCommand>.*?<value>&lt;project&gt;/\\.externalToolBuilders/"
+        + targetProject.getName().replace(".", "\\.") + "\\.launch</value>.*?</buildCommand>)", Pattern.DOTALL);
     Matcher matcher = pattern.matcher(description);
     if (matcher.find())
     {
@@ -197,8 +193,7 @@ public class GenerateExampleBuilders
 
   private static String getItemPath(String resource, int type)
   {
-    return "&lt;item path=&quot;/" + resource.replace('\\', '/') + "&quot; type=&quot;" + type
-        + "&quot;/&gt;&#13;&#10;";
+    return "&lt;item path=&quot;/" + resource.replace('\\', '/') + "&quot; type=&quot;" + type + "&quot;/&gt;&#13;&#10;";
   }
 
   private static File getTemplate(File root, String template)
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
index dde0274eb2..1828986754 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
@@ -30,8 +30,7 @@ public class PrintReleaseDeliverablesForPlan
     for (File featureFolder : new File("../../features").listFiles())
     {
       String folderName = featureFolder.getName();
-      if (folderName.equals("org.eclipse.emf.cdo.site-feature")
-          || folderName.equals("org.eclipse.emf.cdo.license-feature"))
+      if (folderName.equals("org.eclipse.emf.cdo.site-feature") || folderName.equals("org.eclipse.emf.cdo.license-feature"))
       {
         continue;
       }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
index 8380acd460..3fec73e73e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
index 4a6b16967c..be446a6469 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
@@ -69,11 +69,10 @@ public class AssigneeItemProvider extends SecurityItemItemProvider
    */
   protected void addRolesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Assignee_roles_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Assignee_roles_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.ASSIGNEE__ROLES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Assignee_roles_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Assignee_roles_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.ASSIGNEE__ROLES, true, false, true, null, null, null));
   }
 
   /**
@@ -84,12 +83,10 @@ public class AssigneeItemProvider extends SecurityItemItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Assignee_id_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Assignee_id_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.ASSIGNEE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Assignee_id_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Assignee_id_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.ASSIGNEE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
index 9bd9c040dc..bd3e30a822 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
@@ -71,12 +71,11 @@ public class ClassFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addApplicableClassPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ClassFilter_applicableClass_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ClassFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.CLASS_FILTER__APPLICABLE_CLASS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ClassFilter_applicableClass_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ClassFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.CLASS_FILTER__APPLICABLE_CLASS, true, false, true, null, null, null));
   }
 
   /**
@@ -87,12 +86,10 @@ public class ClassFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addSubTypesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ClassFilter_subTypes_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_subTypes_feature", "_UI_ClassFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.CLASS_FILTER__SUB_TYPES, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ClassFilter_subTypes_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_subTypes_feature", "_UI_ClassFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.CLASS_FILTER__SUB_TYPES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
index d3d722c924..16d9bf00e1 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
@@ -76,56 +76,54 @@ public class ClassPermissionItemProvider extends PermissionItemProvider
    */
   protected void addApplicableClassPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ClassPermission_applicableClass_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature",
-                "_UI_ClassPermission_type"),
-            SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false, true, null, null, null)
+    itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ClassPermission_applicableClass_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature", "_UI_ClassPermission_type"),
+        SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false, true, null, null, null)
+    {
+      @Override
+      public Collection<?> getChoiceOfValues(Object object)
+      {
+        if (object instanceof ClassPermission)
         {
-          @Override
-          public Collection<?> getChoiceOfValues(Object object)
+          ClassPermission classPermission = (ClassPermission)object;
+          CDOView view = classPermission.cdoView();
+          if (view != null)
           {
-            if (object instanceof ClassPermission)
+            List<EClass> result = new ArrayList<EClass>();
+            for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
             {
-              ClassPermission classPermission = (ClassPermission)object;
-              CDOView view = classPermission.cdoView();
-              if (view != null)
+              for (EClassifier classifier : packageInfo.getEPackage().getEClassifiers())
               {
-                List<EClass> result = new ArrayList<EClass>();
-                for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
+                if (classifier instanceof EClass)
                 {
-                  for (EClassifier classifier : packageInfo.getEPackage().getEClassifiers())
-                  {
-                    if (classifier instanceof EClass)
-                    {
-                      result.add((EClass)classifier);
-
-                    }
-                  }
+                  result.add((EClass)classifier);
+
                 }
+              }
+            }
 
-                Collections.sort(result, new Comparator<EClass>()
+            Collections.sort(result, new Comparator<EClass>()
+            {
+              public int compare(EClass c1, EClass c2)
+              {
+                int comparison = c1.getName().compareTo(c2.getName());
+                if (comparison == 0)
                 {
-                  public int compare(EClass c1, EClass c2)
-                  {
-                    int comparison = c1.getName().compareTo(c2.getName());
-                    if (comparison == 0)
-                    {
-                      comparison = c1.getEPackage().getNsURI().compareTo(c2.getEPackage().getNsURI());
-                    }
-
-                    return comparison;
-                  }
-                });
-
-                return result;
+                  comparison = c1.getEPackage().getNsURI().compareTo(c2.getEPackage().getNsURI());
+                }
+
+                return comparison;
               }
-            }
+            });
 
-            return super.getChoiceOfValues(object);
+            return result;
           }
-        });
+        }
+
+        return super.getChoiceOfValues(object);
+      }
+    });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
index d4f8c81820..3debb039b9 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
@@ -150,29 +150,21 @@ public class CombinedFilterItemProvider extends PermissionFilterItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createLinkedFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createLinkedFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createPackageFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createPackageFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createClassFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createClassFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createResourceFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createResourceFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createExpressionFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createExpressionFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createNotFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createNotFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createAndFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createAndFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS,
-        SecurityFactory.eINSTANCE.createOrFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.COMBINED_FILTER__OPERANDS, SecurityFactory.eINSTANCE.createOrFilter()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
index 02adfbfec3..c750cae65e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
@@ -70,12 +70,10 @@ public class DirectoryItemProvider extends SecurityItemItemProvider
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Directory_name_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Directory_name_feature", "_UI_Directory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.DIRECTORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Directory_name_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Directory_name_feature", "_UI_Directory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.DIRECTORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -184,17 +182,13 @@ public class DirectoryItemProvider extends SecurityItemItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createRole()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createRole()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createUser()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createUser()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
index 6ed33dd17d..faf55f3353 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
@@ -162,59 +162,45 @@ public class ExpressionFilterItemProvider extends ObjectFilterItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createBooleanValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createByteValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createShortValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createLongValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createFloatValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createFloatValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createDoubleValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createCharValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createStringValue()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createStringValue()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createFunctionInvocation()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createMemberInvocation()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createMemberInvocation()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createStaticAccess()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createStaticAccess()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createMemberAccess()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createMemberAccess()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createContextAccess()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createContextAccess()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createContainedObject()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createContainedObject()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createLinkedObject()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createLinkedObject()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createLinkedExpression()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createLinkedExpression()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION,
-        ExpressionsFactory.eINSTANCE.createListConstruction()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createListConstruction()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
index 614afae846..26cc47ec49 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
@@ -194,29 +194,21 @@ public class FilterPermissionItemProvider extends PermissionItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createLinkedFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createLinkedFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createPackageFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createPackageFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createClassFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createClassFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createResourceFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createResourceFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createExpressionFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createExpressionFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createNotFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createNotFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createAndFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createAndFilter()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS,
-        SecurityFactory.eINSTANCE.createOrFilter()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, SecurityFactory.eINSTANCE.createOrFilter()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
index a851397f5e..93fbb3b91e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
@@ -68,11 +68,10 @@ public class GroupItemProvider extends AssigneeItemProvider
    */
   protected void addUsersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Group_users_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Group_users_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.GROUP__USERS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Group_users_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Group_users_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.GROUP__USERS, true, false, true, null, null, null));
   }
 
   /**
@@ -83,11 +82,10 @@ public class GroupItemProvider extends AssigneeItemProvider
    */
   protected void addInheritedGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Group_inheritedGroups_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritedGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.GROUP__INHERITED_GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Group_inheritedGroups_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritedGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.GROUP__INHERITED_GROUPS, true, false, true, null, null, null));
   }
 
   /**
@@ -98,11 +96,10 @@ public class GroupItemProvider extends AssigneeItemProvider
    */
   protected void addInheritingGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Group_inheritingGroups_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritingGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.GROUP__INHERITING_GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Group_inheritingGroups_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritingGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.GROUP__INHERITING_GROUPS, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
index f08e1b9029..83b036ddca 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
@@ -67,11 +67,10 @@ public class LinkedFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addFilterPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_LinkedFilter_filter_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_LinkedFilter_filter_feature", "_UI_LinkedFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.LINKED_FILTER__FILTER, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_LinkedFilter_filter_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_LinkedFilter_filter_feature", "_UI_LinkedFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.LINKED_FILTER__FILTER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
index 8e6316d4db..a9153cf0dd 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
@@ -67,12 +67,11 @@ public class PackageFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addApplicablePackagePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_PackageFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.PACKAGE_FILTER__APPLICABLE_PACKAGE, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_PackageFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.PACKAGE_FILTER__APPLICABLE_PACKAGE, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
index 4fb1410173..a9953010f2 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
@@ -75,43 +75,41 @@ public class PackagePermissionItemProvider extends PermissionItemProvider
    */
   protected void addApplicablePackagePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_PackagePermission_applicablePackage_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature",
-                "_UI_PackagePermission_type"),
-            SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true, false, true, null, null, null)
+    itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_PackagePermission_applicablePackage_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature", "_UI_PackagePermission_type"),
+        SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true, false, true, null, null, null)
+    {
+      @Override
+      public Collection<?> getChoiceOfValues(Object object)
+      {
+        if (object instanceof PackagePermission)
         {
-          @Override
-          public Collection<?> getChoiceOfValues(Object object)
+          PackagePermission packagePermission = (PackagePermission)object;
+          CDOView view = packagePermission.cdoView();
+          if (view != null)
           {
-            if (object instanceof PackagePermission)
+            List<EPackage> result = new ArrayList<EPackage>();
+            for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
+            {
+              result.add(packageInfo.getEPackage());
+            }
+
+            Collections.sort(result, new Comparator<EPackage>()
             {
-              PackagePermission packagePermission = (PackagePermission)object;
-              CDOView view = packagePermission.cdoView();
-              if (view != null)
+              public int compare(EPackage p1, EPackage p2)
               {
-                List<EPackage> result = new ArrayList<EPackage>();
-                for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
-                {
-                  result.add(packageInfo.getEPackage());
-                }
-
-                Collections.sort(result, new Comparator<EPackage>()
-                {
-                  public int compare(EPackage p1, EPackage p2)
-                  {
-                    return p1.getNsURI().compareTo(p2.getNsURI());
-                  }
-                });
-
-                return result;
+                return p1.getNsURI().compareTo(p2.getNsURI());
               }
-            }
+            });
 
-            return super.getChoiceOfValues(object);
+            return result;
           }
-        });
+        }
+
+        return super.getChoiceOfValues(object);
+      }
+    });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
index 061cf475ad..f5116834a9 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PermissionFilterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class PermissionFilterItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
index 193cf9d44d..fc047d639c 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
@@ -43,9 +43,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PermissionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+public class PermissionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+    IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -84,12 +83,10 @@ public class PermissionItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Permission_access_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Permission_access_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
index a8f3a39506..6bebde64af 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
@@ -75,11 +75,10 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addAllPermissionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -90,12 +89,10 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_name_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_name_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.REALM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_name_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_name_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -106,12 +103,10 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addDefaultAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_defaultAccess_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultAccess_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.REALM__DEFAULT_ACCESS, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_defaultAccess_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultAccess_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__DEFAULT_ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -123,11 +118,10 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addDefaultUserDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_defaultUserDirectory_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultUserDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.REALM__DEFAULT_USER_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_defaultUserDirectory_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultUserDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__DEFAULT_USER_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -139,12 +133,11 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addDefaultGroupDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_defaultGroupDirectory_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_Realm_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.REALM__DEFAULT_GROUP_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_defaultGroupDirectory_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_Realm_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.REALM__DEFAULT_GROUP_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -156,11 +149,10 @@ public class RealmItemProvider extends SecurityElementItemProvider
    */
   protected void addDefaultRoleDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Realm_defaultRoleDirectory_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultRoleDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.REALM__DEFAULT_ROLE_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_defaultRoleDirectory_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultRoleDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__DEFAULT_ROLE_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -270,17 +262,13 @@ public class RealmItemProvider extends SecurityElementItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createRole()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createRole()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
 
-    newChildDescriptors
-        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createUser()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createUser()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
index 363f07fe6a..d685f077c5 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
@@ -78,13 +78,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addPathPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_path_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__PATH, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_path_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -95,13 +93,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addPatternStylePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -112,13 +108,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addFoldersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__FOLDERS, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__FOLDERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -129,13 +123,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addModelResourcesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__MODEL_RESOURCES, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__MODEL_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -146,13 +138,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addModelObjectsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__MODEL_OBJECTS, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__MODEL_OBJECTS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -163,13 +153,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addIncludeParentsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_PARENTS, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_PARENTS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -180,13 +168,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addIncludeRootPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_includeRoot_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_ROOT, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_includeRoot_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_ROOT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -197,13 +183,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addTextResourcesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__TEXT_RESOURCES, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__TEXT_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -214,13 +198,11 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider
    */
   protected void addBinaryResourcesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourceFilter_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_FILTER__BINARY_RESOURCES, true, false, false,
-            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourceFilter_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_FILTER__BINARY_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
index f2e27c84ea..2d22f402d7 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
@@ -70,13 +70,11 @@ public class ResourcePermissionItemProvider extends PermissionItemProvider
    */
   protected void addPatternPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", //$NON-NLS-1$//$NON-NLS-2$
-                "_UI_ResourcePermission_type"), //$NON-NLS-1$
-            SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", //$NON-NLS-1$//$NON-NLS-2$
+            "_UI_ResourcePermission_type"), //$NON-NLS-1$
+        SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
index 471f6fda59..757caf3961 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
@@ -73,11 +73,10 @@ public class RoleItemProvider extends SecurityItemItemProvider
    */
   protected void addAssigneesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Role_assignees_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_Role_assignees_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.ROLE__ASSIGNEES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Role_assignees_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Role_assignees_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.ROLE__ASSIGNEES, true, false, true, null, null, null));
   }
 
   /**
@@ -88,8 +87,7 @@ public class RoleItemProvider extends SecurityItemItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
         getString("_UI_Role_id_feature"), //$NON-NLS-1$
         getString("_UI_PropertyDescriptor_description", "_UI_Role_id_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         SecurityPackage.Literals.ROLE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
@@ -202,17 +200,13 @@ public class RoleItemProvider extends SecurityItemItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
-        SecurityFactory.eINSTANCE.createClassPermission()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, SecurityFactory.eINSTANCE.createClassPermission()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
-        SecurityFactory.eINSTANCE.createPackagePermission()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, SecurityFactory.eINSTANCE.createPackagePermission()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
-        SecurityFactory.eINSTANCE.createResourcePermission()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, SecurityFactory.eINSTANCE.createResourcePermission()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
-        SecurityFactory.eINSTANCE.createFilterPermission()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, SecurityFactory.eINSTANCE.createFilterPermission()));
   }
 
   @Override
@@ -227,8 +221,7 @@ public class RoleItemProvider extends SecurityItemItemProvider
       if (newChildDescriptor instanceof CommandParameter)
       {
         Object value = ((CommandParameter)newChildDescriptor).getValue();
-        if (value instanceof org.eclipse.emf.cdo.security.ClassPermission
-            || value instanceof org.eclipse.emf.cdo.security.PackagePermission
+        if (value instanceof org.eclipse.emf.cdo.security.ClassPermission || value instanceof org.eclipse.emf.cdo.security.PackagePermission
             || value instanceof org.eclipse.emf.cdo.security.ResourcePermission)
         {
           it.remove();
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
index ee4f559af2..b05da1f6b8 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
@@ -75,8 +75,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      SecurityEditPlugin.INSTANCE, SecurityPackage.eNS_URI);
+  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(SecurityEditPlugin.INSTANCE, SecurityPackage.eNS_URI);
 
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
index 196d51e612..ad401a563a 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
@@ -78,11 +78,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_groups_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_groups_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_groups_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_groups_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__GROUPS, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +92,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addLabelPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_label_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_label_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__LABEL, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_label_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_label_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__LABEL, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -109,12 +106,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addFirstNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_firstName_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_firstName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__FIRST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_firstName_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_firstName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__FIRST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -125,12 +120,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addLastNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_lastName_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_lastName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__LAST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_lastName_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_lastName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__LAST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -141,12 +134,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addEmailPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_email_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_email_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__EMAIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_email_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_email_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__EMAIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -157,12 +148,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addDefaultAccessOverridePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_defaultAccessOverride_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccessOverride_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_defaultAccessOverride_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccessOverride_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -173,12 +162,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addDefaultAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_defaultAccess_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccess_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__DEFAULT_ACCESS, false, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_defaultAccess_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccess_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__DEFAULT_ACCESS, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -189,12 +176,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addLockedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_locked_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_locked_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__LOCKED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_locked_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_locked_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__LOCKED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -205,11 +190,10 @@ public class UserItemProvider extends AssigneeItemProvider
    */
   protected void addAllPermissionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$
-            getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -338,8 +322,7 @@ public class UserItemProvider extends AssigneeItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(SecurityPackage.Literals.USER__PASSWORD, SecurityFactory.eINSTANCE.createUserPassword()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.USER__PASSWORD, SecurityFactory.eINSTANCE.createUserPassword()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
index 0c29acb941..f771eb68ce 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class UserPasswordItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+public class UserPasswordItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
index 303d2d75e1..ff3d8e623b 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
index c5f517fbd7..e0b4d59c48 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
@@ -73,8 +73,7 @@ public class SecurityActionBarContributor extends EditingDomainActionBarContribu
    * <!-- end-user-doc -->
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      SecurityEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+  protected IAction showPropertiesViewAction = new Action(SecurityEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
   {
     @Override
     public void run()
@@ -97,8 +96,7 @@ public class SecurityActionBarContributor extends EditingDomainActionBarContribu
    * <!-- end-user-doc -->
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(
-      SecurityEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+  protected IAction refreshViewerAction = new Action(SecurityEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
   {
     @Override
     public boolean isEnabled()
@@ -363,8 +361,7 @@ public class SecurityActionBarContributor extends EditingDomainActionBarContribu
    * <!-- end-user-doc -->
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
index 9787339e8d..76868bd9f6 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
@@ -126,8 +126,7 @@ import java.util.Map;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SecurityEditor extends MultiPageEditorPart
-    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
+public class SecurityEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model.
@@ -420,11 +419,9 @@ public class SecurityEditor extends MultiPageEditorPart
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED
-                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet
-                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -981,8 +978,7 @@ public class SecurityEditor extends MultiPageEditorPart
     boolean hasErrors = !resource.getErrors().isEmpty();
     if (hasErrors || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-          "org.eclipse.emf.cdo.security.editor", //$NON-NLS-1$
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING, "org.eclipse.emf.cdo.security.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));
@@ -1024,8 +1020,7 @@ public class SecurityEditor extends MultiPageEditorPart
       setCurrentViewer(selectionViewer);
 
       selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer
-          .setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
+      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
       selectionViewer.setInput(editingDomain.getResourceSet());
       selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
 
@@ -1183,8 +1178,7 @@ public class SecurityEditor extends MultiPageEditorPart
           // Set up the tree viewer.
           //
           contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-          contentOutlineViewer.setLabelProvider(
-              new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
+          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
           contentOutlineViewer.setInput(editingDomain.getResourceSet());
 
           // Make sure our popups work.
@@ -1195,14 +1189,12 @@ public class SecurityEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer
-                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1335,8 +1327,7 @@ public class SecurityEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1449,8 +1440,8 @@ public class SecurityEditor extends MultiPageEditorPart
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
-        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor()
+        : new NullProgressMonitor();
     doSave(progressMonitor);
   }
 
@@ -1554,8 +1545,8 @@ public class SecurityEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
index 0f0e531053..b51defba4c 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
@@ -82,8 +82,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays
-      .asList(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+  public static final List<String> FILE_EXTENSIONS = Collections
+      .unmodifiableList(Arrays.asList(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
 
   /**
    * A formatted list of supported file extensions, suitable for display.
@@ -91,8 +91,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = SecurityEditorPlugin.INSTANCE
-      .getString("_UI_SecurityEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+  public static final String FORMATTED_FILE_EXTENSIONS = SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameExtensions").replaceAll("\\s*,\\s*", //$NON-NLS-1$ //$NON-NLS-2$
+      ", "); //$NON-NLS-1$
 
   /**
    * This caches an instance of the model package.
@@ -161,8 +161,7 @@ public class SecurityModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(SecurityEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
-        .getImageDescriptor(SecurityEditorPlugin.INSTANCE.getImage("full/wizban/NewSecurity"))); //$NON-NLS-1$
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(SecurityEditorPlugin.INSTANCE.getImage("full/wizban/NewSecurity"))); //$NON-NLS-1$
   }
 
   /**
@@ -289,13 +288,11 @@ public class SecurityModelWizard extends Wizard implements INewWizard
       //
       try
       {
-        page.openEditor(new FileEditorInput(modelFile),
-            workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+        page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
       }
       catch (PartInitException exception)
       {
-        MessageDialog.openError(workbenchWindow.getShell(),
-            SecurityEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+        MessageDialog.openError(workbenchWindow.getShell(), SecurityEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
         return false;
       }
 
@@ -583,8 +580,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
       if (encodings == null)
       {
         encodings = new ArrayList<String>();
-        for (StringTokenizer stringTokenizer = new StringTokenizer(
-            SecurityEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$
+        for (StringTokenizer stringTokenizer = new StringTokenizer(SecurityEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer //$NON-NLS-1$
+            .hasMoreTokens();)
         {
           encodings.add(stringTokenizer.nextToken());
         }
@@ -638,8 +635,7 @@ public class SecurityModelWizard extends Wizard implements INewWizard
 
           // Make up a unique new name here.
           //
-          String defaultModelBaseFilename = SecurityEditorPlugin.INSTANCE
-              .getString("_UI_SecurityEditorFilenameDefaultBase"); //$NON-NLS-1$
+          String defaultModelBaseFilename = SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameDefaultBase"); //$NON-NLS-1$
           String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
           String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
           for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -652,8 +648,7 @@ public class SecurityModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new SecurityModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
     initialObjectCreationPage.setTitle(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityModelWizard_label")); //$NON-NLS-1$
-    initialObjectCreationPage
-        .setDescription(SecurityEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+    initialObjectCreationPage.setDescription(SecurityEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
index edaa6c7e35..11172b1deb 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
@@ -63,8 +63,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
  */
 public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSectionPart<T> implements IDetailsPage
 {
-  public AbstractDetailsPage(Class<T> elementType, EClass elementEClass, EditingDomain domain,
-      AdapterFactory adapterFactory)
+  public AbstractDetailsPage(Class<T> elementType, EClass elementEClass, EditingDomain domain, AdapterFactory adapterFactory)
   {
     super(elementType, elementEClass, domain, adapterFactory);
   }
@@ -72,8 +71,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
   @Override
   protected String getTitle()
   {
-    return NLS.bind(Messages.AbstractDetailsPage_0,
-        SecurityEditPlugin.INSTANCE.getString(String.format("_UI_%s_type", getInputEClass().getName()))); //$NON-NLS-1$
+    return NLS.bind(Messages.AbstractDetailsPage_0, SecurityEditPlugin.INSTANCE.getString(String.format("_UI_%s_type", getInputEClass().getName()))); //$NON-NLS-1$
   }
 
   @Override
@@ -104,12 +102,9 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
   protected Text text(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
   {
     toolkit.createLabel(parent, label);
-    Text result = toolkit.createText(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.FILL, false, 1)),
-        ""); //$NON-NLS-1$
-    getContext().bindValue(observeText(result),
-        EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute));
-    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null,
-        ObjectWritableConverter.createUpdateValueStrategy(attribute));
+    Text result = toolkit.createText(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.FILL, false, 1)), ""); //$NON-NLS-1$
+    getContext().bindValue(observeText(result), EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute));
+    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null, ObjectWritableConverter.createUpdateValueStrategy(attribute));
 
     addRevertDecoration(result, attribute);
     return result;
@@ -191,8 +186,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     return horzAlign(new TableWrapData(), horzAlign, horzGrab, horzSpan);
   }
 
-  protected static Object layoutData(Composite parent, int horzAlign, boolean horzGrab, int horzSpan, int vertAlign,
-      boolean vertGrab, int vertSpan)
+  protected static Object layoutData(Composite parent, int horzAlign, boolean horzGrab, int horzSpan, int vertAlign, boolean vertGrab, int vertSpan)
   {
     if (parent.getLayout() instanceof GridLayout)
     {
@@ -228,14 +222,12 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     return oneToMany(parent, toolkit, label, reference, reference.getEReferenceType());
   }
 
-  protected OneToManyBlock oneToMany(Composite parent, FormToolkit toolkit, String label, EReference reference,
-      EClass itemType)
+  protected OneToManyBlock oneToMany(Composite parent, FormToolkit toolkit, String label, EReference reference, EClass itemType)
   {
     return oneToMany(parent, toolkit, label, reference, itemType, null);
   }
 
-  protected OneToManyBlock oneToMany(Composite parent, FormToolkit toolkit, String label, EReference reference,
-      EClass itemType, IFilter itemFilter)
+  protected OneToManyBlock oneToMany(Composite parent, FormToolkit toolkit, String label, EReference reference, EClass itemType, IFilter itemFilter)
   {
     toolkit.createLabel(parent, label).setLayoutData(layoutData(parent, SWT.LEFT, false, 2));
     Composite blockParent = toolkit.createComposite(parent);
@@ -250,8 +242,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     return result;
   }
 
-  protected OneToManyTableBlock table(Composite parent, FormToolkit toolkit, String label,
-      OneToManyTableBlock.ITableConfiguration config)
+  protected OneToManyTableBlock table(Composite parent, FormToolkit toolkit, String label, OneToManyTableBlock.ITableConfiguration config)
   {
     toolkit.createLabel(parent, label).setLayoutData(layoutData(parent, SWT.LEFT, false, 2));
     Composite blockParent = toolkit.createComposite(parent);
@@ -267,12 +258,10 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
 
   protected Button checkbox(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
   {
-    Button result = toolkit.createButton(
-        createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 2)), label, SWT.CHECK);
+    Button result = toolkit.createButton(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 2)), label, SWT.CHECK);
     getContext().bindValue(WidgetProperties.enabled().observe(result),
         EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute));
-    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null,
-        ObjectWritableConverter.createUpdateValueStrategy(attribute));
+    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null, ObjectWritableConverter.createUpdateValueStrategy(attribute));
 
     addRevertDecoration(result, attribute);
     return result;
@@ -283,8 +272,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     Button result = toolkit.createButton(parent, label, SWT.PUSH);
     result.setLayoutData(layoutData(parent, SWT.LEFT, false, 2));
 
-    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null,
-        ObjectWritableConverter.createUpdateValueStrategy());
+    getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null, ObjectWritableConverter.createUpdateValueStrategy());
 
     result.addSelectionListener(selectionListener);
     return result;
@@ -293,9 +281,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
   protected ComboViewer combo(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
   {
     toolkit.createLabel(parent, label);
-    ComboViewer result = new ComboViewer(
-        createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 1)),
-        SWT.READ_ONLY | SWT.DROP_DOWN);
+    ComboViewer result = new ComboViewer(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 1)), SWT.READ_ONLY | SWT.DROP_DOWN);
     result.setLabelProvider(new AdapterFactoryLabelProvider(getAdapterFactory()));
     result.setContentProvider(new ArrayContentProvider());
     result.setInput(attribute.getEAttributeType().getInstanceClass().getEnumConstants());
@@ -328,8 +314,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     final ControlDecoration decoration = new ControlDecoration(control, SWT.RIGHT | SWT.CENTER);
     decoration.hide();
     decoration.setDescriptionText(Messages.AbstractDetailsPage_3);
-    decoration.setImage(ExtendedImageRegistry.getInstance()
-        .getImage(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/revert.gif", true))); //$NON-NLS-1$
+    decoration.setImage(ExtendedImageRegistry.getInstance().getImage(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/revert.gif", true))); //$NON-NLS-1$
     decoration.setMarginWidth(2);
 
     decoration.addSelectionListener(new SelectionAdapter()
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
index 24afb0efc7..a8c720957d 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
@@ -62,8 +62,7 @@ public abstract class AbstractSectionPart<T extends EObject> extends AbstractFor
 
   private IActionBars editorActionBars;
 
-  public AbstractSectionPart(Class<T> inputType, EClass inputEClass, EditingDomain domain,
-      AdapterFactory adapterFactory)
+  public AbstractSectionPart(Class<T> inputType, EClass inputEClass, EditingDomain domain, AdapterFactory adapterFactory)
   {
     this.inputType = inputType;
     this.inputEClass = inputEClass;
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
index 32462480ee..df573f9c87 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
@@ -108,8 +108,7 @@ public class CDOSecurityFormEditor extends FormEditor implements IEditingDomainP
       }
       catch (CommitException e)
       {
-        StatusAdapter status = new StatusAdapter(
-            new Status(IStatus.ERROR, OM.BUNDLE_ID, Messages.CDOSecurityFormEditor_0, e));
+        StatusAdapter status = new StatusAdapter(new Status(IStatus.ERROR, OM.BUNDLE_ID, Messages.CDOSecurityFormEditor_0, e));
         status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, Messages.CDOSecurityFormEditor_1);
         status.setProperty(IStatusAdapterConstants.TIMESTAMP_PROPERTY, System.currentTimeMillis());
         StatusManager.getManager().handle(status, StatusManager.SHOW);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
index f8c58a3ecf..a28976fa55 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
@@ -337,18 +337,16 @@ public class CDOSecurityPage extends FormPage
 
   private IAction createEditAdvancedAction()
   {
-    return new Action(Messages.CDOSecurityPage_0, ExtendedImageRegistry.getInstance()
-        .getImageDescriptor(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/advanced.gif", true))) //$NON-NLS-1$
+    return new Action(Messages.CDOSecurityPage_0,
+        ExtendedImageRegistry.getInstance().getImageDescriptor(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/advanced.gif", true))) //$NON-NLS-1$
     {
       @Override
       public void run()
       {
         try
         {
-          IEditorInput newEditorInput = CDOEditorUtil
-              .createCDOEditorInputWithEditingDomain((CDOEditorInput)getEditorInput(), getEditingDomain());
-          getSite().getPage().openEditor(newEditorInput, CDOEditorUtil.getEditorID(), true,
-              IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
+          IEditorInput newEditorInput = CDOEditorUtil.createCDOEditorInputWithEditingDomain((CDOEditorInput)getEditorInput(), getEditingDomain());
+          getSite().getPage().openEditor(newEditorInput, CDOEditorUtil.getEditorID(), true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
         }
         catch (PartInitException e)
         {
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
index 93110f4077..33ef9dde5e 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
@@ -83,11 +83,9 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
 
     space(parent, toolkit);
 
-    oneToMany(parent, toolkit, Messages.RoleDetailsPage_2, SecurityPackage.Literals.ROLE__ASSIGNEES,
-        SecurityPackage.Literals.GROUP);
+    oneToMany(parent, toolkit, Messages.RoleDetailsPage_2, SecurityPackage.Literals.ROLE__ASSIGNEES, SecurityPackage.Literals.GROUP);
 
-    oneToMany(parent, toolkit, Messages.RoleDetailsPage_3, SecurityPackage.Literals.ROLE__ASSIGNEES,
-        SecurityPackage.Literals.USER);
+    oneToMany(parent, toolkit, Messages.RoleDetailsPage_3, SecurityPackage.Literals.ROLE__ASSIGNEES, SecurityPackage.Literals.USER);
   }
 
   protected INewObjectConfigurator createNewPermissionConfigurator()
@@ -99,10 +97,8 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
       {
         ResourceFilter filter = SecurityFactory.eINSTANCE.createResourceFilter("/home/${user}", PatternStyle.TREE); //$NON-NLS-1$
         Command result = CreateChildCommand.create(getEditingDomain(), newObject,
-            new CommandParameter(newObject, SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, filter),
-            Collections.singleton(newObject));
-        result = result.chain(SetCommand.create(getEditingDomain(), newObject,
-            SecurityPackage.Literals.PERMISSION__ACCESS, Access.WRITE));
+            new CommandParameter(newObject, SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, filter), Collections.singleton(newObject));
+        result = result.chain(SetCommand.create(getEditingDomain(), newObject, SecurityPackage.Literals.PERMISSION__ACCESS, Access.WRITE));
         return result;
       }
     };
@@ -110,8 +106,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
 
   protected OneToManyTableBlock.ITableConfiguration createTableConfiguration()
   {
-    return new OneToManyTableBlock.TableConfiguration(getManagedForm(), SecurityPackage.Literals.ROLE__PERMISSIONS,
-        SecurityPackage.Literals.FILTER_PERMISSION)
+    return new OneToManyTableBlock.TableConfiguration(getManagedForm(), SecurityPackage.Literals.ROLE__PERMISSIONS, SecurityPackage.Literals.FILTER_PERMISSION)
     {
       private static final int COL_ACCESS = 0;
 
@@ -119,8 +114,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
 
       private static final int COL_PATH = 2;
 
-      private final String[] columnTitles = { Messages.RoleDetailsPage_5, Messages.RoleDetailsPage_6,
-          Messages.RoleDetailsPage_7 };
+      private final String[] columnTitles = { Messages.RoleDetailsPage_5, Messages.RoleDetailsPage_6, Messages.RoleDetailsPage_7 };
 
       private final CellEditor[] cellEditors = new CellEditor[3];
 
@@ -238,16 +232,14 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
         case COL_PATTERN_STYLE:
           if (filter.getPatternStyle() != value)
           {
-            execute(SetCommand.create(getEditingDomain(), filter,
-                SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, value));
+            execute(SetCommand.create(getEditingDomain(), filter, SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, value));
             viewer.refresh(element);
           }
           break;
         case COL_PATH:
           if (!ObjectUtil.equals(filter.getPath(), value))
           {
-            execute(
-                SetCommand.create(getEditingDomain(), filter, SecurityPackage.Literals.RESOURCE_FILTER__PATH, value));
+            execute(SetCommand.create(getEditingDomain(), filter, SecurityPackage.Literals.RESOURCE_FILTER__PATH, value));
             viewer.refresh(element);
           }
           break;
@@ -348,8 +340,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
                 }
               };
 
-              FilterTreeSelectionDialog dlg = new FilterTreeSelectionDialog(cellEditorWindow.getShell(), provider,
-                  provider);
+              FilterTreeSelectionDialog dlg = new FilterTreeSelectionDialog(cellEditorWindow.getShell(), provider, provider);
 
               dlg.setAllowMultiple(false);
               dlg.setMessage(Messages.RoleDetailsPage_4);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
index 51b3cf9421..f722f41d46 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
@@ -290,61 +290,59 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
 
   protected void configureDropSupport(final TableViewer viewer)
   {
-    viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
-        new Transfer[] { LocalSelectionTransfer.getTransfer() }, new ViewerDropAdapter(viewer)
-        {
-          {
-            // We don't want it to look like you can insert new elements, only drop onto existing elements
-            setFeedbackEnabled(false);
-          }
+    viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY, new Transfer[] { LocalSelectionTransfer.getTransfer() }, new ViewerDropAdapter(viewer)
+    {
+      {
+        // We don't want it to look like you can insert new elements, only drop onto existing elements
+        setFeedbackEnabled(false);
+      }
 
-          @Override
-          public boolean validateDrop(Object target, int operation, TransferData transferType)
+      @Override
+      public boolean validateDrop(Object target, int operation, TransferData transferType)
+      {
+        boolean result = false;
+
+        if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+        {
+          EObject objectToDrop = getObjectToDrop(transferType);
+          if (objectToDrop != null)
           {
-            boolean result = false;
+            result = getDropReference((EObject)target, objectToDrop) != null;
 
-            if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+            if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
             {
-              EObject objectToDrop = getObjectToDrop(transferType);
-              if (objectToDrop != null)
-              {
-                result = getDropReference((EObject)target, objectToDrop) != null;
-
-                if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
-                {
-                  overrideOperation(DND.DROP_COPY);
-                }
-              }
+              overrideOperation(DND.DROP_COPY);
             }
-
-            return result;
           }
+        }
 
-          @Override
-          public boolean performDrop(Object data)
-          {
-            IStructuredSelection selection = (IStructuredSelection)data;
-            EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
-            EObject target = (EObject)getCurrentTarget();
+        return result;
+      }
 
-            Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop),
-                selection.toList());
+      @Override
+      public boolean performDrop(Object data)
+      {
+        IStructuredSelection selection = (IStructuredSelection)data;
+        EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
+        EObject target = (EObject)getCurrentTarget();
 
-            boolean result = execute(command);
-            if (result)
-            {
-              viewer.getControl().setFocus();
-              viewer.setSelection(new StructuredSelection(target));
-            }
+        Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop), selection.toList());
 
-            return result;
-          }
+        boolean result = execute(command);
+        if (result)
+        {
+          viewer.getControl().setFocus();
+          viewer.setSelection(new StructuredSelection(target));
+        }
 
-          private EObject getObjectToDrop(TransferData transferType)
-          {
-            return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
-          }
-        });
+        return result;
+      }
+
+      private EObject getObjectToDrop(TransferData transferType)
+      {
+        return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
+      }
+    });
   }
 
   protected EReference getDropReference(EObject target, EObject objectToDrop)
@@ -367,16 +365,14 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
   {
     if (getInput() == null)
     {
-      getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_2, null, IStatus.WARNING,
-          viewer.getControl());
+      getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_2, null, IStatus.WARNING, viewer.getControl());
     }
     else
     {
       // Anything not matching filters?
       if (viewer.getTable().getItemCount() < getInput().getItems().size())
       {
-        getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_3, null, IStatus.WARNING,
-            viewer.getControl());
+        getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_3, null, IStatus.WARNING, viewer.getControl());
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/UserDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/UserDetailsPage.java
index 82b015b26f..2cc1a8be14 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/UserDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/UserDetailsPage.java
@@ -67,8 +67,7 @@ public class UserDetailsPage extends AbstractDetailsPage<User>
 
     space(parent, toolkit);
 
-    Control accessOverrideControl = combo(parent, toolkit, Messages.UserDetailsPage_6,
-        SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE).getControl();
+    Control accessOverrideControl = combo(parent, toolkit, Messages.UserDetailsPage_6, SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE).getControl();
     accessOverrideControl.setToolTipText(Messages.UserDetailsPage_10);
 
     space(parent, toolkit);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
index 25054007a7..530d06a76b 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
@@ -329,8 +329,7 @@ public class ManageSecurityHandler extends LongRunningHandler
 
         // If there's no user ID, then the repository doesn't require authentication,
         // so we can use that session
-        if (session != null && !session.isClosed()
-            && (User.ADMINISTRATOR.equals(session.getUserID()) || StringUtil.isEmpty(session.getUserID()))
+        if (session != null && !session.isClosed() && (User.ADMINISTRATOR.equals(session.getUserID()) || StringUtil.isEmpty(session.getUserID()))
             && ObjectUtil.equals(session.getRepositoryInfo().getUUID(), repository.getUUID()))
         {
           return session;
@@ -368,8 +367,7 @@ public class ManageSecurityHandler extends LongRunningHandler
       IManagedContainer container = IPluginContainer.INSTANCE;
       String productGroup = CredentialsProviderFactory.PRODUCT_GROUP;
       String factoryType = "interactive"; //$NON-NLS-1$
-      IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container
-          .getElement(productGroup, factoryType, null);
+      IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container.getElement(productGroup, factoryType, null);
 
       if (credentialsProvider == null)
       {
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
index 196fe0a150..e9922730da 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
@@ -113,20 +113,18 @@ public class OneToManyBlock
 
   private IActionBars editorActionBars;
 
-  public OneToManyBlock(IManagedForm managedForm, DataBindingContext context, EditingDomain domain,
-      AdapterFactory adapterFactory, EReference reference)
+  public OneToManyBlock(IManagedForm managedForm, DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory, EReference reference)
   {
     this(context, domain, adapterFactory, new OneToManyConfiguration(managedForm, reference));
   }
 
-  public OneToManyBlock(IManagedForm managedForm, DataBindingContext context, EditingDomain domain,
-      AdapterFactory adapterFactory, EReference reference, EClass itemType)
+  public OneToManyBlock(IManagedForm managedForm, DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory, EReference reference,
+      EClass itemType)
   {
     this(context, domain, adapterFactory, new OneToManyConfiguration(managedForm, reference, itemType));
   }
 
-  public OneToManyBlock(DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory,
-      IOneToManyConfiguration blockConfig)
+  public OneToManyBlock(DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory, IOneToManyConfiguration blockConfig)
   {
     this.context = context;
     this.domain = domain;
@@ -207,8 +205,7 @@ public class OneToManyBlock
       configureDropSupport(viewer);
     }
 
-    context.bindValue(WidgetProperties.enabled().observe(viewer.getControl()), input, null,
-        ObjectWritableConverter.createUpdateValueStrategy());
+    context.bindValue(WidgetProperties.enabled().observe(viewer.getControl()), input, null, ObjectWritableConverter.createUpdateValueStrategy());
 
     Composite buttons = toolkit.createComposite(parent);
     FillLayout fill = new FillLayout(SWT.VERTICAL);
@@ -230,16 +227,13 @@ public class OneToManyBlock
 
     final IObservableValue<?> selection = ViewersObservables.observeSingleSelection(viewer);
 
-    context.bindValue(WidgetProperties.enabled().observe(newButton), input, null,
-        ObjectWritableConverter.createUpdateValueStrategy());
+    context.bindValue(WidgetProperties.enabled().observe(newButton), input, null, ObjectWritableConverter.createUpdateValueStrategy());
     if (addButton != null)
     {
-      context.bindValue(WidgetProperties.enabled().observe(addButton), input, null,
-          ObjectWritableConverter.createUpdateValueStrategy());
+      context.bindValue(WidgetProperties.enabled().observe(addButton), input, null, ObjectWritableConverter.createUpdateValueStrategy());
     }
 
-    context.bindValue(WidgetProperties.enabled().observe(removeButton), selection, null,
-        ObjectWritableConverter.createUpdateValueStrategy());
+    context.bindValue(WidgetProperties.enabled().observe(removeButton), selection, null, ObjectWritableConverter.createUpdateValueStrategy());
 
     newButton.addSelectionListener(new SelectionAdapter()
     {
@@ -312,12 +306,11 @@ public class OneToManyBlock
             available.removeAll(value);
             SecurityUIUtil.applySupportedElementFilter(available, itemType);
 
-            String label = NLS.bind(Messages.OneToManyBlock_3, SecurityEditPlugin.INSTANCE.getString(
-                String.format("_UI_%s_%s_feature", reference.getEContainingClass().getName(), reference.getName()))); //$NON-NLS-1$
+            String label = NLS.bind(Messages.OneToManyBlock_3,
+                SecurityEditPlugin.INSTANCE.getString(String.format("_UI_%s_%s_feature", reference.getEContainingClass().getName(), reference.getName()))); //$NON-NLS-1$
 
-            FeatureEditorDialog dlg = new FeatureEditorDialog(viewer.getControl().getShell(),
-                new TableLabelProvider(adapterFactory), input.getValue(), reference.getEContainingClass(),
-                Collections.EMPTY_LIST, label, available, false, true, true);
+            FeatureEditorDialog dlg = new FeatureEditorDialog(viewer.getControl().getShell(), new TableLabelProvider(adapterFactory), input.getValue(),
+                reference.getEContainingClass(), Collections.EMPTY_LIST, label, available, false, true, true);
 
             if (dlg.open() == Window.OK && !dlg.getResult().isEmpty())
             {
@@ -333,8 +326,8 @@ public class OneToManyBlock
       });
     }
 
-    final SelectionListenerAction<EObject> removeAction = new SelectionListenerAction<EObject>(
-        Messages.OneToManyBlock_2, SharedIcons.getDescriptor("etool16/delete.gif")) //$NON-NLS-1$
+    final SelectionListenerAction<EObject> removeAction = new SelectionListenerAction<EObject>(Messages.OneToManyBlock_2,
+        SharedIcons.getDescriptor("etool16/delete.gif")) //$NON-NLS-1$
     {
       @Override
       public void run()
@@ -405,8 +398,7 @@ public class OneToManyBlock
       value.dispose();
     }
 
-    value = EMFEditObservables.observeDetailList(context.getValidationRealm(), domain, input,
-        getConfiguration().getModelReference());
+    value = EMFEditObservables.observeDetailList(context.getValidationRealm(), domain, input, getConfiguration().getModelReference());
 
     if (viewer != null)
     {
@@ -478,66 +470,63 @@ public class OneToManyBlock
 
   protected void configureDropSupport(final TableViewer viewer)
   {
-    viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
-        new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DropTargetAdapter()
+    viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY, new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DropTargetAdapter()
+    {
+      @Override
+      public void dragEnter(DropTargetEvent event)
+      {
+        if (!canDrop(event))
         {
-          @Override
-          public void dragEnter(DropTargetEvent event)
-          {
-            if (!canDrop(event))
-            {
-              // Reject this drop
-              event.detail = DND.DROP_NONE;
-            }
-            else if ((event.operations | DND.DROP_COPY) != 0)
-            {
-              event.detail = DND.DROP_COPY;
-            }
-          }
+          // Reject this drop
+          event.detail = DND.DROP_NONE;
+        }
+        else if ((event.operations | DND.DROP_COPY) != 0)
+        {
+          event.detail = DND.DROP_COPY;
+        }
+      }
 
-          private boolean canDrop(DropTargetEvent event)
-          {
-            boolean result = false;
+      private boolean canDrop(DropTargetEvent event)
+      {
+        boolean result = false;
 
-            if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType))
-            {
-              result = canPresentAll(LocalSelectionTransfer.getTransfer().getSelection());
-            }
+        if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType))
+        {
+          result = canPresentAll(LocalSelectionTransfer.getTransfer().getSelection());
+        }
 
-            return result;
-          }
+        return result;
+      }
 
-          @Override
-          public void dropAccept(DropTargetEvent event)
-          {
-            if (!canDrop(event))
-            {
-              // Reject this drop
-              event.detail = DND.DROP_NONE;
-            }
-            else if ((event.operations | DND.DROP_COPY) != 0)
-            {
-              event.detail = DND.DROP_COPY;
-            }
-          }
+      @Override
+      public void dropAccept(DropTargetEvent event)
+      {
+        if (!canDrop(event))
+        {
+          // Reject this drop
+          event.detail = DND.DROP_NONE;
+        }
+        else if ((event.operations | DND.DROP_COPY) != 0)
+        {
+          event.detail = DND.DROP_COPY;
+        }
+      }
 
-          @Override
-          public void drop(DropTargetEvent event)
+      @Override
+      public void drop(DropTargetEvent event)
+      {
+        if (canDrop(event))
+        {
+          IStructuredSelection selection = (IStructuredSelection)LocalSelectionTransfer.getTransfer().getSelection();
+          Command command = AddCommand.create(domain, input.getValue(), getConfiguration().getModelReference(), selection.toList());
+          if (execute(command))
           {
-            if (canDrop(event))
-            {
-              IStructuredSelection selection = (IStructuredSelection)LocalSelectionTransfer.getTransfer()
-                  .getSelection();
-              Command command = AddCommand.create(domain, input.getValue(), getConfiguration().getModelReference(),
-                  selection.toList());
-              if (execute(command))
-              {
-                viewer.setSelection(selection);
-                viewer.getControl().setFocus();
-              }
-            }
+            viewer.setSelection(selection);
+            viewer.getControl().setFocus();
           }
-        });
+        }
+      }
+    });
   }
 
   protected void hookUnsupportedModelContentValidation(IObservableList<Object> observableList)
@@ -566,8 +555,7 @@ public class OneToManyBlock
     {
       if (!supportedContentFilter.select(element))
       {
-        configuration.getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_3, null,
-            IStatus.WARNING, viewer.getControl());
+        configuration.getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_3, null, IStatus.WARNING, viewer.getControl());
         return;
       }
     }
@@ -608,8 +596,7 @@ public class OneToManyBlock
 
     public OneToManyConfiguration(IManagedForm managedForm, EReference reference)
     {
-      this(managedForm, reference, reference.getEReferenceType(),
-          SecurityUIUtil.getSupportedElementFilter(reference.getEReferenceType()));
+      this(managedForm, reference, reference.getEReferenceType(), SecurityUIUtil.getSupportedElementFilter(reference.getEReferenceType()));
     }
 
     public OneToManyConfiguration(IManagedForm managedForm, EReference reference, EClass itemType)
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
index f420cb6715..6ad01d1acd 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
@@ -36,8 +36,7 @@ import org.eclipse.ui.forms.IManagedForm;
  */
 public class OneToManyTableBlock extends OneToManyBlock
 {
-  public OneToManyTableBlock(DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory,
-      ITableConfiguration tableConfig)
+  public OneToManyTableBlock(DataBindingContext context, EditingDomain domain, AdapterFactory adapterFactory, ITableConfiguration tableConfig)
   {
     super(context, domain, adapterFactory, tableConfig);
   }
@@ -70,8 +69,8 @@ public class OneToManyTableBlock extends OneToManyBlock
     {
       TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT);
       column.getColumn().setText(columnTitles[i]);
-      layout.setColumnData(column.getColumn(), new ColumnWeightData(tableConfig.getColumnWeight(i),
-          tableConfig.getColumnMinimumSize(i), tableConfig.isColumnResizable(i)));
+      layout.setColumnData(column.getColumn(),
+          new ColumnWeightData(tableConfig.getColumnWeight(i), tableConfig.getColumnMinimumSize(i), tableConfig.isColumnResizable(i)));
 
       final int columnIndex = i;
 
diff --git a/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
index 303d2d75e1..ff3d8e623b 100644
--- a/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PermissionFilter.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PermissionFilter.java
index abc7c8122a..b4cccc8eb7 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PermissionFilter.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PermissionFilter.java
@@ -30,8 +30,7 @@ import org.eclipse.emf.cdo.security.impl.PermissionImpl.CommitImpactContext;
  */
 public interface PermissionFilter extends CDOObject
 {
-  boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception;
+  boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception;
 
   boolean isImpacted(CommitImpactContext context);
 
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/AndFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/AndFilterImpl.java
index 5683734320..674b11c581 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/AndFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/AndFilterImpl.java
@@ -51,8 +51,7 @@ public class AndFilterImpl extends CombinedFilterImpl implements AndFilter
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     ++level;
     for (PermissionFilter operand : getOperands())
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassFilterImpl.java
index 41bb98c1eb..c8bc2f89e2 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassFilterImpl.java
@@ -98,8 +98,7 @@ public class ClassFilterImpl extends PermissionFilterImpl implements ClassFilter
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     EClass actualClass = revision.getEClass();
     EClass applicableClass = getApplicableClass();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
index fa55e9025a..430442f657 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
@@ -75,8 +75,7 @@ public class ClassPermissionImpl extends PermissionImpl implements ClassPermissi
     eSet(SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, newApplicableClass);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
   {
     EClass actualClass = revision.getEClass();
     EClass applicableClass = getApplicableClass();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
index 979fc7dfb8..81b387a23e 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
@@ -73,8 +73,7 @@ public class FilterPermissionImpl extends PermissionImpl implements FilterPermis
     return (EList<PermissionFilter>)eGet(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, true);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/LinkedFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/LinkedFilterImpl.java
index 5ab4dbb91a..fbc0560c5f 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/LinkedFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/LinkedFilterImpl.java
@@ -78,8 +78,7 @@ public class LinkedFilterImpl extends PermissionFilterImpl implements LinkedFilt
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     PermissionFilter filter = getFilter();
     return filter.isApplicable(revision, revisionProvider, securityContext, level + 1);
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/NotFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/NotFilterImpl.java
index f725b7bfab..80bbbacf63 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/NotFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/NotFilterImpl.java
@@ -51,8 +51,7 @@ public class NotFilterImpl extends CombinedFilterImpl implements NotFilter
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     PermissionFilter operand = getOperands().get(0);
     return !operand.isApplicable(revision, revisionProvider, securityContext, level + 1);
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java
index 4b3c22e4d8..d49c51ddaa 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java
@@ -59,8 +59,7 @@ public abstract class ObjectFilterImpl extends PermissionFilterImpl implements O
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     CDOView view = getView(revisionProvider);
     CDOID id = revision.getID();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
index 830224b885..7564fba7f6 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
@@ -62,8 +62,7 @@ public abstract class ObjectPermissionImpl extends PermissionImpl implements Obj
   /**
    * @ADDED
    */
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
   {
     CDOView view = getView(revisionProvider);
     CDOID id = revision.getID();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/OrFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/OrFilterImpl.java
index 412a6f8288..31692deb96 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/OrFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/OrFilterImpl.java
@@ -51,8 +51,7 @@ public class OrFilterImpl extends CombinedFilterImpl implements OrFilter
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     ++level;
     for (PermissionFilter operand : getOperands())
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageFilterImpl.java
index 52a293b9c9..0041e05e59 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageFilterImpl.java
@@ -78,8 +78,7 @@ public class PackageFilterImpl extends PermissionFilterImpl implements PackageFi
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     EPackage actualPackage = revision.getEClass().getEPackage();
     EPackage applicablePackage = getApplicablePackage();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
index c1a874368c..3b98948a60 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
@@ -76,8 +76,7 @@ public class PackagePermissionImpl extends PermissionImpl implements PackagePerm
     eSet(SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, newApplicablePackage);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
   {
     EPackage actualPackage = revision.getEClass().getEPackage();
     EPackage applicablePackage = getApplicablePackage();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionFilterImpl.java
index 5ec6306cff..15dc2af6f8 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionFilterImpl.java
@@ -69,8 +69,7 @@ public abstract class PermissionFilterImpl extends CDOObjectImpl implements Perm
     return 0;
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext, int level) throws Exception
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     String msg = StringUtil.NL;
     boolean tracing = TRACER.isEnabled();
@@ -104,8 +103,7 @@ public abstract class PermissionFilterImpl extends CDOObjectImpl implements Perm
     return result;
   }
 
-  protected abstract boolean filter(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext, int level) throws Exception;
+  protected abstract boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception;
 
   /**
    * @since 4.3
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceFilterImpl.java
index c466b72790..01279ab3f7 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceFilterImpl.java
@@ -327,8 +327,7 @@ public class ResourceFilterImpl extends PermissionFilterImpl implements Resource
   }
 
   @Override
-  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-      int level) throws Exception
+  protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
   {
     if (!preChecks(revision, revisionProvider))
     {
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
index 1d9eeee8e7..70ed1691d3 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
@@ -84,8 +84,7 @@ public class ResourcePermissionImpl extends PermissionImpl implements ResourcePe
     eSet(SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, newPattern);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
   {
     if (pattern == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
index df66956fbd..798e9a6413 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
@@ -69,8 +69,7 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
   {
     try
     {
-      SecurityFactory theSecurityFactory = (SecurityFactory)EPackage.Registry.INSTANCE
-          .getEFactory(SecurityPackage.eNS_URI);
+      SecurityFactory theSecurityFactory = (SecurityFactory)EPackage.Registry.INSTANCE.getEFactory(SecurityPackage.eNS_URI);
       if (theSecurityFactory != null)
       {
         return theSecurityFactory;
@@ -578,8 +577,7 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
     PatternStyle result = PatternStyle.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$
+      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;
   }
@@ -615,8 +613,7 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
     Access result = Access.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$
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
index 68efc25cdc..1389bef63c 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
@@ -314,9 +314,8 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     }
 
     // Obtain or create and register package
-    SecurityPackageImpl theSecurityPackage = (SecurityPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof SecurityPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new SecurityPackageImpl());
+    SecurityPackageImpl theSecurityPackage = (SecurityPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SecurityPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SecurityPackageImpl());
 
     isInited = true;
 
@@ -1431,8 +1430,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     // Obtain other dependent packages
     EtypesPackage theEtypesPackage = (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI);
     EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-    ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE
-        .getEPackage(ExpressionsPackage.eNS_URI);
+    ExpressionsPackage theExpressionsPackage = (ExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionsPackage.eNS_URI);
 
     // Create type parameters
 
@@ -1474,38 +1472,29 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
 
     initEClass(realmEClass, Realm.class, "Realm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(getRealm_Items(), getSecurityItem(), null, "items", null, 0, -1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_AllUsers(), getUser(), null, "allUsers", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, Realm.class, //$NON-NLS-1$
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEAttribute(getRealm_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getRealm_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, Realm.class, //$NON-NLS-1$
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_DefaultUserDirectory(), getDirectory(), null, "defaultUserDirectory", null, 0, 1, //$NON-NLS-1$
-        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_DefaultGroupDirectory(), getDirectory(), null, "defaultGroupDirectory", null, 0, 1, //$NON-NLS-1$
-        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRealm_DefaultRoleDirectory(), getDirectory(), null, "defaultRoleDirectory", null, 0, 1, //$NON-NLS-1$
-        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(directoryEClass, Directory.class, "Directory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(getDirectory_Items(), getSecurityItem(), null, "items", null, 0, -1, Directory.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getDirectory_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Directory.class, //$NON-NLS-1$
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1513,43 +1502,35 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     initEAttribute(getRole_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Role.class, !IS_TRANSIENT, //$NON-NLS-1$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRole_Permissions(), getPermission(), getPermission_Role(), "permissions", null, 0, -1, //$NON-NLS-1$
-        Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getRole_Assignees(), getAssignee(), getAssignee_Roles(), "assignees", null, 0, -1, //$NON-NLS-1$
-        Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(assigneeEClass, Assignee.class, "Assignee", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(getAssignee_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Assignee.class, !IS_TRANSIENT, //$NON-NLS-1$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAssignee_Roles(), getRole(), getRole_Assignees(), "roles", null, 0, -1, Assignee.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(getGroup_Users(), getUser(), getUser_Groups(), "users", null, 0, -1, Group.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getGroup_InheritedGroups(), getGroup(), getGroup_InheritingGroups(), "inheritedGroups", //$NON-NLS-1$
-        null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEReference(getGroup_InheritingGroups(), getGroup(), getGroup_InheritedGroups(), "inheritingGroups", //$NON-NLS-1$
-        null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEReference(getGroup_AllInheritedGroups(), getGroup(), null, "allInheritedGroups", null, 0, -1, Group.class, //$NON-NLS-1$
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getGroup_AllInheritingGroups(), getGroup(), null, "allInheritingGroups", null, 0, -1, //$NON-NLS-1$
-        Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+        Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getGroup_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Group.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(getUser_Groups(), getGroup(), getGroup_Users(), "groups", null, 0, -1, User.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUser_Label(), theEcorePackage.getEString(), "label", null, 0, 1, User.class, IS_TRANSIENT, //$NON-NLS-1$
         IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEAttribute(getUser_FirstName(), theEcorePackage.getEString(), "firstName", null, 0, 1, User.class, //$NON-NLS-1$
@@ -1559,59 +1540,50 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     initEAttribute(getUser_Email(), theEcorePackage.getEString(), "email", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUser_DefaultAccessOverride(), getAccessObject(), "defaultAccessOverride", null, 0, 1, //$NON-NLS-1$
-        User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUser_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, User.class, //$NON-NLS-1$
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEAttribute(getUser_Locked(), theEcorePackage.getEBoolean(), "locked", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getUser_Password(), getUserPassword(), null, "password", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getUser_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getUser_AllRoles(), getRole(), null, "allRoles", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getUser_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, User.class, //$NON-NLS-1$
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getUser_UnassignedRoles(), getRole(), null, "unassignedRoles", null, 0, -1, User.class, //$NON-NLS-1$
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(userPasswordEClass, UserPassword.class, "UserPassword", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getUserPassword_Encrypted(), theEcorePackage.getEString(), "encrypted", null, 0, 1, //$NON-NLS-1$
-        UserPassword.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        UserPassword.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(permissionEClass, Permission.class, "Permission", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getPermission_Role(), getRole(), getRole_Permissions(), "role", null, 1, 1, //$NON-NLS-1$
-        Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getPermission_Access(), getAccess(), "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, //$NON-NLS-1$//$NON-NLS-2$
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(classPermissionEClass, ClassPermission.class, "ClassPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getClassPermission_ApplicableClass(), theEcorePackage.getEClass(), null, "applicableClass", null, 1, //$NON-NLS-1$
-        1, ClassPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        1, ClassPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(packagePermissionEClass, PackagePermission.class, "PackagePermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getPackagePermission_ApplicablePackage(), theEcorePackage.getEPackage(), null, "applicablePackage", //$NON-NLS-1$
-        null, 1, 1, PackagePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        null, 1, 1, PackagePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(resourcePermissionEClass, ResourcePermission.class, "ResourcePermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getResourcePermission_Pattern(), theEcorePackage.getEString(), "pattern", null, 0, 1, //$NON-NLS-1$
-        ResourcePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourcePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(objectPermissionEClass, ObjectPermission.class, "ObjectPermission", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
@@ -1619,8 +1591,8 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     initEClass(filterPermissionEClass, FilterPermission.class, "FilterPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getFilterPermission_Filters(), getPermissionFilter(), null, "filters", null, 1, -1, //$NON-NLS-1$
-        FilterPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        FilterPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(permissionFilterEClass, PermissionFilter.class, "PermissionFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
@@ -1628,52 +1600,41 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     initEClass(linkedFilterEClass, LinkedFilter.class, "LinkedFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getLinkedFilter_Filter(), getPermissionFilter(), null, "filter", null, 1, 1, LinkedFilter.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(packageFilterEClass, PackageFilter.class, "PackageFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getPackageFilter_ApplicablePackage(), theEcorePackage.getEPackage(), null, "applicablePackage", null, //$NON-NLS-1$
-        1, 1, PackageFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        1, 1, PackageFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(classFilterEClass, ClassFilter.class, "ClassFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getClassFilter_ApplicableClass(), theEcorePackage.getEClass(), null, "applicableClass", null, 1, 1, //$NON-NLS-1$
-        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getClassFilter_SubTypes(), theEcorePackage.getEBoolean(), "subTypes", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(resourceFilterEClass, ResourceFilter.class, "ResourceFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getResourceFilter_Path(), theEcorePackage.getEString(), "path", null, 0, 1, ResourceFilter.class, //$NON-NLS-1$
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_PatternStyle(), getPatternStyle(), "patternStyle", "TREE", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_Folders(), theEcorePackage.getEBoolean(), "folders", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_TextResources(), theEcorePackage.getEBoolean(), "textResources", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_BinaryResources(), theEcorePackage.getEBoolean(), "binaryResources", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_ModelResources(), theEcorePackage.getEBoolean(), "modelResources", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_ModelObjects(), theEcorePackage.getEBoolean(), "modelObjects", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_IncludeParents(), theEcorePackage.getEBoolean(), "includeParents", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getResourceFilter_IncludeRoot(), theEcorePackage.getEBoolean(), "includeRoot", "true", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
-        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(objectFilterEClass, ObjectFilter.class, "ObjectFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
@@ -1681,14 +1642,14 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     initEClass(expressionFilterEClass, ExpressionFilter.class, "ExpressionFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getExpressionFilter_Expression(), theExpressionsPackage.getExpression(), null, "expression", null, 1, //$NON-NLS-1$
-        1, ExpressionFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        1, ExpressionFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(combinedFilterEClass, CombinedFilter.class, "CombinedFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getCombinedFilter_Operands(), getPermissionFilter(), null, "operands", null, 1, -1, //$NON-NLS-1$
-        CombinedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        CombinedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(notFilterEClass, NotFilter.class, "NotFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
index 37c0ab8cb8..37b0bc8375 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
@@ -201,8 +201,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateSecurityElement(SecurityElement securityElement, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateSecurityElement(SecurityElement securityElement, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(securityElement, diagnostics, context);
   }
@@ -212,8 +211,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateSecurityItem(SecurityItem securityItem, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateSecurityItem(SecurityItem securityItem, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(securityItem, diagnostics, context);
   }
@@ -287,8 +285,7 @@ public class SecurityValidator extends EObjectValidator
 
       for (Permission permission : user.getAllPermissions())
       {
-        if (permission.getAccess() == Access.WRITE
-            && permission.isApplicable(realmRevision, revisionProvider, securityContext))
+        if (permission.getAccess() == Access.WRITE && permission.isApplicable(realmRevision, revisionProvider, securityContext))
         {
           // Constraint is satisfied: this user can write the realm
           return true;
@@ -428,9 +425,8 @@ public class SecurityValidator extends EObjectValidator
         // Detected a cycle
         if (diagnostics != null)
         {
-          diagnostics
-              .add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0, "_UI_Group_acyclicInheritance_diagnostic", //$NON-NLS-1$
-                  new Object[] { group.getId() }, new Object[] { group }, context));
+          diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0, "_UI_Group_acyclicInheritance_diagnostic", //$NON-NLS-1$
+              new Object[] { group.getId() }, new Object[] { group }, context));
         }
 
         return false;
@@ -455,8 +451,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateUserPasswordGen(UserPassword userPassword, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateUserPasswordGen(UserPassword userPassword, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(userPassword, diagnostics, context);
   }
@@ -465,8 +460,7 @@ public class SecurityValidator extends EObjectValidator
    * No user, not even the Administrator, is permitted to read the properties of a
    * {@link UserPassword}, so this validation is a no-op.
    */
-  public boolean validateUserPassword(UserPassword userPassword, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateUserPassword(UserPassword userPassword, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return true;
   }
@@ -486,8 +480,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateClassPermission(ClassPermission classPermission, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateClassPermission(ClassPermission classPermission, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(classPermission, diagnostics, context);
   }
@@ -497,8 +490,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validatePackagePermission(PackagePermission packagePermission, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validatePackagePermission(PackagePermission packagePermission, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(packagePermission, diagnostics, context);
   }
@@ -508,8 +500,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateResourcePermission(ResourcePermission resourcePermission, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateResourcePermission(ResourcePermission resourcePermission, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(resourcePermission, diagnostics, context);
   }
@@ -519,8 +510,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateObjectPermission(ObjectPermission objectPermission, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateObjectPermission(ObjectPermission objectPermission, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(objectPermission, diagnostics, context);
   }
@@ -530,8 +520,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateFilterPermission(FilterPermission filterPermission, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateFilterPermission(FilterPermission filterPermission, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(filterPermission, diagnostics, context);
   }
@@ -541,8 +530,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validatePermissionFilter(PermissionFilter permissionFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validatePermissionFilter(PermissionFilter permissionFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(permissionFilter, diagnostics, context);
   }
@@ -552,8 +540,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateLinkedFilter(LinkedFilter linkedFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateLinkedFilter(LinkedFilter linkedFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(linkedFilter, diagnostics, context);
   }
@@ -563,8 +550,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validatePackageFilter(PackageFilter packageFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validatePackageFilter(PackageFilter packageFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(packageFilter, diagnostics, context);
   }
@@ -584,8 +570,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateResourceFilter(ResourceFilter resourceFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateResourceFilter(ResourceFilter resourceFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(resourceFilter, diagnostics, context);
   }
@@ -595,8 +580,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateObjectFilter(ObjectFilter objectFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateObjectFilter(ObjectFilter objectFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(objectFilter, diagnostics, context);
   }
@@ -606,8 +590,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateExpressionFilter(ExpressionFilter expressionFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateExpressionFilter(ExpressionFilter expressionFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(expressionFilter, diagnostics, context);
   }
@@ -617,8 +600,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validateCombinedFilter(CombinedFilter combinedFilter, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validateCombinedFilter(CombinedFilter combinedFilter, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return validate_EveryDefaultConstraint(combinedFilter, diagnostics, context);
   }
@@ -658,8 +640,7 @@ public class SecurityValidator extends EObjectValidator
    * <!-- end-user-doc -->
    * @generated
    */
-  public boolean validatePatternStyle(PatternStyle patternStyle, DiagnosticChain diagnostics,
-      Map<Object, Object> context)
+  public boolean validatePatternStyle(PatternStyle patternStyle, DiagnosticChain diagnostics, Map<Object, Object> context)
   {
     return true;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
index 3fb115e703..52fbefd774 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
@@ -200,12 +200,10 @@ public class CDOAdminServer extends AbstractCDOAdmin
     if (authProtocol instanceof CDOAdminServerProtocol)
     {
       CDOAdminServerProtocol protocol = (CDOAdminServerProtocol)authProtocol;
-      String message = MessageFormat
-          .format("The repository \"{0}\" has connected users. Proceed with deletion anyways?", delegate.getName());
+      String message = MessageFormat.format("The repository \"{0}\" has connected users. Proceed with deletion anyways?", delegate.getName());
       try
       {
-        if (protocol.sendConfirmationRequest("Repository In Use", message, Confirmation.NO, Confirmation.YES,
-            Confirmation.NO) != Confirmation.YES)
+        if (protocol.sendConfirmationRequest("Repository In Use", message, Confirmation.NO, Confirmation.YES, Confirmation.NO) != Confirmation.YES)
         {
           return false;
         }
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
index 08e1d534f5..82557ca45f 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
@@ -79,11 +79,9 @@ import java.util.Map;
  *
  * @author Christian W. Damus (CEA LIST)
  */
-public class DefaultCDORepositoryConfigurationManager extends Lifecycle
-    implements InternalCDORepositoryConfigurationManager, ContainerAware
+public class DefaultCDORepositoryConfigurationManager extends Lifecycle implements InternalCDORepositoryConfigurationManager, ContainerAware
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG,
-      DefaultCDORepositoryConfigurationManager.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, DefaultCDORepositoryConfigurationManager.class);
 
   private IManagedContainer container = IPluginContainer.INSTANCE;
 
@@ -344,8 +342,7 @@ public class DefaultCDORepositoryConfigurationManager extends Lifecycle
 
     IExtensionRegistry registry = Platform.getExtensionRegistry();
     @SuppressWarnings("restriction")
-    IConfigurationElement[] elements = registry
-        .getConfigurationElementsFor(org.eclipse.emf.cdo.internal.server.bundle.OM.BUNDLE_ID, IAppExtension.EXT_POINT);
+    IConfigurationElement[] elements = registry.getConfigurationElementsFor(org.eclipse.emf.cdo.internal.server.bundle.OM.BUNDLE_ID, IAppExtension.EXT_POINT);
     for (final IConfigurationElement element : elements)
     {
       if ("appExtension".equals(element.getName())) //$NON-NLS-1$
@@ -391,8 +388,7 @@ public class DefaultCDORepositoryConfigurationManager extends Lifecycle
     }
   }
 
-  private RepositoryConfiguration createConfiguration(final String repositoryName, final Document configuration)
-      throws Exception
+  private RepositoryConfiguration createConfiguration(final String repositoryName, final Document configuration) throws Exception
   {
     modify(new CatalogOperation<RepositoryConfiguration>()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
index 62fd905cad..30df325d55 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
@@ -93,9 +93,8 @@ public class CatalogPackageImpl extends EPackageImpl implements CatalogPackage
     }
 
     // Obtain or create and register package
-    CatalogPackageImpl theCatalogPackage = (CatalogPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof CatalogPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new CatalogPackageImpl());
+    CatalogPackageImpl theCatalogPackage = (CatalogPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CatalogPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CatalogPackageImpl());
 
     isInited = true;
 
@@ -256,24 +255,19 @@ public class CatalogPackageImpl extends EPackageImpl implements CatalogPackage
     // Add supertypes to classes
 
     // Initialize classes, features, and operations; add parameters
-    initEClass(repositoryCatalogEClass, RepositoryCatalog.class, "RepositoryCatalog", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRepositoryCatalog_Repositories(), getRepositoryConfiguration(), null, "repositories", null, 0, -1,
-        RepositoryCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(repositoryCatalogEClass, RepositoryCatalog.class, "RepositoryCatalog", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRepositoryCatalog_Repositories(), getRepositoryConfiguration(), null, "repositories", null, 0, -1, RepositoryCatalog.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    EOperation op = initEOperation(getRepositoryCatalog__GetRepository__String(), getRepositoryConfiguration(),
-        "getRepository", 0, 1, IS_UNIQUE, IS_ORDERED);
+    EOperation op = initEOperation(getRepositoryCatalog__GetRepository__String(), getRepositoryConfiguration(), "getRepository", 0, 1, IS_UNIQUE, IS_ORDERED);
     addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(repositoryConfigurationEClass, RepositoryConfiguration.class, "RepositoryConfiguration", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRepositoryConfiguration_Name(), ecorePackage.getEString(), "name", null, 1, 1,
-        RepositoryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getRepositoryConfiguration_ConfigXML(), theEtypesPackage.getClob(), "configXML", null, 1, 1,
-        RepositoryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(repositoryConfigurationEClass, RepositoryConfiguration.class, "RepositoryConfiguration", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRepositoryConfiguration_Name(), ecorePackage.getEString(), "name", null, 1, 1, RepositoryConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRepositoryConfiguration_ConfigXML(), theEtypesPackage.getClob(), "configXML", null, 1, 1, RepositoryConfiguration.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/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
index c3027820a7..18e254e57d 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
@@ -110,21 +110,19 @@ public class CDOAdminServerProtocol extends SignalProtocol<CDOAdminServer> imple
 
   public Response sendAuthenticationChallenge(Challenge challenge) throws Exception
   {
-    return new AuthenticationRequest(this, CDOAdminProtocolConstants.SIGNAL_AUTHENTICATION, challenge)
-        .send(negotiationTimeout, new Monitor());
+    return new AuthenticationRequest(this, CDOAdminProtocolConstants.SIGNAL_AUTHENTICATION, challenge).send(negotiationTimeout, new Monitor());
   }
 
-  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation)
-      throws Exception
+  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation) throws Exception
   {
     throw new UnsupportedOperationException("sendCredentialsChallenge"); //$NON-NLS-1$
   }
 
-  public Confirmation sendConfirmationRequest(String subject, String message, Confirmation suggestion,
-      Confirmation acceptable, Confirmation... more) throws Exception
+  public Confirmation sendConfirmationRequest(String subject, String message, Confirmation suggestion, Confirmation acceptable, Confirmation... more)
+      throws Exception
   {
-    return new ConfirmationRequest(this, CDOAdminProtocolConstants.SIGNAL_CONFIRMATION,
-        new ConfirmationPrompt(subject, message, suggestion, acceptable, more)).send(negotiationTimeout);
+    return new ConfirmationRequest(this, CDOAdminProtocolConstants.SIGNAL_CONFIRMATION, new ConfirmationPrompt(subject, message, suggestion, acceptable, more))
+        .send(negotiationTimeout);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryReplicationPogressedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryReplicationPogressedRequest.java
index 0dd44382fc..fba0ec285b 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryReplicationPogressedRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryReplicationPogressedRequest.java
@@ -26,8 +26,7 @@ public class RepositoryReplicationPogressedRequest extends Request
 
   private double work;
 
-  public RepositoryReplicationPogressedRequest(CDOAdminServerProtocol serverProtocol, String name, double totalWork,
-      double work)
+  public RepositoryReplicationPogressedRequest(CDOAdminServerProtocol serverProtocol, String name, double totalWork, double work)
   {
     super(serverProtocol, CDOAdminProtocolConstants.SIGNAL_REPOSITORY_REPLICATION_PROGRESSED);
     this.name = name;
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java
index 6314a90d6b..62aa8b26ea 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java
@@ -27,8 +27,7 @@ public class RepositoryStateChangedRequest extends Request
 
   private State newState;
 
-  public RepositoryStateChangedRequest(CDOAdminServerProtocol serverProtocol, String name, State oldState,
-      State newState)
+  public RepositoryStateChangedRequest(CDOAdminServerProtocol serverProtocol, String name, State oldState, State newState)
   {
     super(serverProtocol, CDOAdminProtocolConstants.SIGNAL_REPOSITORY_STATE_CHANGED);
     this.name = name;
diff --git a/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
index a457b2522c..d823ddec8a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
@@ -84,8 +84,7 @@ public final class CDODBUtil
   /**
    * @since 2.0
    */
-  public static IDBStore createStore(IMappingStrategy mappingStrategy, IDBAdapter dbAdapter,
-      IDBConnectionProvider dbConnectionProvider)
+  public static IDBStore createStore(IMappingStrategy mappingStrategy, IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider)
   {
     return createStore(mappingStrategy, dbAdapter, dbConnectionProvider, null);
   }
@@ -93,8 +92,8 @@ public final class CDODBUtil
   /**
    * @since 4.2
    */
-  public static IDBStore createStore(IMappingStrategy mappingStrategy, IDBAdapter dbAdapter,
-      IDBConnectionProvider dbConnectionProvider, Map<String, String> properties)
+  public static IDBStore createStore(IMappingStrategy mappingStrategy, IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider,
+      Map<String, String> properties)
   {
     DBStore store = new DBStore();
     store.setMappingStrategy(mappingStrategy);
@@ -123,8 +122,7 @@ public final class CDODBUtil
   /**
    * @since 4.1
    */
-  public static IMappingStrategy createHorizontalMappingStrategy(boolean auditing, boolean branching,
-      boolean withRanges)
+  public static IMappingStrategy createHorizontalMappingStrategy(boolean auditing, boolean branching, boolean withRanges)
   {
     if (branching)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IIDHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IIDHandler.java
index b5939663b6..d1fbf45e90 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IIDHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IIDHandler.java
@@ -92,9 +92,7 @@ public interface IIDHandler extends Comparator<CDOID>
 
   public String unmapURI(IDBStoreAccessor accessor, CDOID id);
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException;
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException;
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor fork)
-      throws IOException;
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor fork) throws IOException;
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java
index 198bd1d318..3a1ba472c6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMetaDataManager.java
@@ -102,13 +102,12 @@ public interface IMetaDataManager
   /**
    * @since 3.0
    */
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException;
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException;
 
   /**
    * @since 4.0
    */
-  public Collection<InternalCDOPackageUnit> rawImport(Connection connection, CDODataInput in, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor) throws IOException;
+  public Collection<InternalCDOPackageUnit> rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor)
+      throws IOException;
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
index b90b1cab5d..b40de921bd 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
@@ -100,8 +100,7 @@ public abstract class AbstractTypeMapping implements ITypeMapping
     return dbType;
   }
 
-  public final void setValueFromRevision(PreparedStatement stmt, int index, InternalCDORevision revision)
-      throws SQLException
+  public final void setValueFromRevision(PreparedStatement stmt, int index, InternalCDORevision revision) throws SQLException
   {
     setValue(stmt, index, getRevisionValue(revision));
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
index 571b8e94af..e4cb658b8a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
@@ -23,8 +23,7 @@ import org.eclipse.net4j.util.factory.ProductCreationException;
  * @author Stefan Winkler
  * @since 4.0
  */
-public abstract class AbstractTypeMappingFactory extends Factory
-    implements org.eclipse.emf.cdo.server.db.mapping.ITypeMapping.Factory
+public abstract class AbstractTypeMappingFactory extends Factory implements org.eclipse.emf.cdo.server.db.mapping.ITypeMapping.Factory
 {
   private ITypeMapping.Descriptor descriptor;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/ColumnTypeModifier.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/ColumnTypeModifier.java
index d916a38c6c..0786cdd11d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/ColumnTypeModifier.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/ColumnTypeModifier.java
@@ -41,8 +41,7 @@ public abstract class ColumnTypeModifier
   /**
    * Can modify the column type of a {@link ITypeMapping type mapping} that is created by the {@link ITypeMapping.Registry type mapping registry}.
    */
-  public abstract DBType modify(ITypeMapping.Provider provider, IMappingStrategy mappingStrategy,
-      EStructuralFeature feature, DBType dbType);
+  public abstract DBType modify(ITypeMapping.Provider provider, IMappingStrategy mappingStrategy, EStructuralFeature feature, DBType dbType);
 
   /**
    * Creates {@link ColumnTypeModifier} instances.
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMapping.java
index 1f49ff8d5d..27b3f87c2c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMapping.java
@@ -108,8 +108,7 @@ public interface IClassMapping
    *          the monitor to indicate progress.
    * @since 4.0
    */
-  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise,
-      OMMonitor monitor);
+  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise, OMMonitor monitor);
 
   /**
    * Detaches (deletes) a CDO object leaving a "ghost" revision behind.
@@ -126,8 +125,7 @@ public interface IClassMapping
    *          the monitor to indicate progress.
    * @since 3.0
    */
-  public void detachObject(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp,
-      OMMonitor monitor);
+  public void detachObject(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor monitor);
 
   /**
    * Create a prepared statement which returns all IDs of instances of the corresponding class.
@@ -160,8 +158,7 @@ public interface IClassMapping
    *           if called on a mapping which does not map an <code>EClass instanceof CDOResourceNode</code>.
    * @since 3.0
    */
-  public PreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name,
-      boolean exactMatch, CDOBranchPoint branchPoint);
+  public PreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name, boolean exactMatch, CDOBranchPoint branchPoint);
 
   /**
    * Passes all revisions of the store to the {@link CDORevisionHandler handler} if <b>all</b> of the following
@@ -176,8 +173,7 @@ public interface IClassMapping
    *      CDORevisionHandler)
    * @since 4.0
    */
-  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler);
+  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
 
   /**
    * Returns a set of CDOIDs that have at least one revision in any of the passed branches and time ranges.
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
index 1c00dc1267..446a6b7adb 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
@@ -38,6 +38,5 @@ public interface IClassMappingDeltaSupport
    * @param monitor
    *          the monitor to report progress.
    */
-  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
-      OMMonitor monitor);
+  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingUnitSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingUnitSupport.java
index 65e8e77d33..cf193dbfde 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingUnitSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingUnitSupport.java
@@ -25,6 +25,5 @@ import java.sql.SQLException;
  */
 public interface IClassMappingUnitSupport extends IClassMapping
 {
-  public void readUnitRevisions(IDBStoreAccessor accessor, CDOBranchPoint branchPoint, CDOID rootID,
-      CDORevisionHandler revisionHandler) throws SQLException;
+  public void readUnitRevisions(IDBStoreAccessor accessor, CDOBranchPoint branchPoint, CDOID rootID, CDORevisionHandler revisionHandler) throws SQLException;
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
index 2032e8306d..6bb9cfe957 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
@@ -108,6 +108,5 @@ public interface IListMapping
    * @see IStoreAccessor#queryXRefs(IStoreAccessor.QueryXRefsContext)
    * @since 4.0
    */
-  public boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString);
+  public boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
index 331a210833..dda252a811 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
@@ -23,6 +23,5 @@ public interface IListMapping2 extends IListMapping
 {
   public void addSimpleChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int index);
 
-  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex,
-      int toIndex);
+  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex, int toIndex);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
index 50f20f4747..300cad62ea 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
@@ -42,6 +42,5 @@ public interface IListMappingDeltaSupport
    *          the {@link CDOListFeatureDelta} which contains the list deltas.
    * @since 4.0
    */
-  public void processDelta(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-      long created, CDOListFeatureDelta delta);
+  public void processDelta(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, long created, CDOListFeatureDelta delta);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingUnitSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingUnitSupport.java
index 9730f3cf87..6c48339a01 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingUnitSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingUnitSupport.java
@@ -27,9 +27,7 @@ import java.sql.SQLException;
  */
 public interface IListMappingUnitSupport extends IListMapping
 {
-  public ResultSet queryUnitEntries(IDBStoreAccessor accessor, IIDHandler idHandler, long timeStamp, CDOID rootID)
-      throws SQLException;
+  public ResultSet queryUnitEntries(IDBStoreAccessor accessor, IIDHandler idHandler, long timeStamp, CDOID rootID) throws SQLException;
 
-  public void readUnitEntries(ResultSet resultSet, IIDHandler idHandler, CDOID id, MoveableList<Object> list)
-      throws SQLException;
+  public void readUnitEntries(ResultSet resultSet, IIDHandler idHandler, CDOID id, MoveableList<Object> list) throws SQLException;
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
index ff4c1ef316..2729797ea7 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.java
@@ -343,8 +343,7 @@ public interface IMappingStrategy
    *
    * @since 4.0
    */
-  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp,
-      boolean exactTime, CDORevisionHandler handler);
+  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
 
   /**
    * Returns a set of CDOIDs that have at least one revision in any of the passed branches and time ranges.
@@ -358,14 +357,13 @@ public interface IMappingStrategy
   /**
    * @since 3.0
    */
-  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int lastReplicatedBranchID, int lastBranchID,
-      long lastReplicatedCommitTime, long lastCommitTime) throws IOException;
+  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int lastReplicatedBranchID, int lastBranchID, long lastReplicatedCommitTime,
+      long lastCommitTime) throws IOException;
 
   /**
    * @since 4.0
    */
-  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException;
+  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException;
 
   /**
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CommitInfoTable.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CommitInfoTable.java
index b42431b0a3..b219011f87 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CommitInfoTable.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CommitInfoTable.java
@@ -78,8 +78,8 @@ public class CommitInfoTable extends Lifecycle
     this.store = store;
   }
 
-  public void writeCommitInfo(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, long previousTimeStamp,
-      String userID, String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
+  public void writeCommitInfo(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
+      CDOBranchPoint mergeSource, OMMonitor monitor)
   {
     IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlInsert, ReuseProbability.HIGH);
 
@@ -117,8 +117,7 @@ public class CommitInfoTable extends Lifecycle
     }
   }
 
-  public void loadCommitInfos(IDBStoreAccessor accessor, CDOBranch branch, long startTime, long endTime,
-      CDOCommitInfoHandler handler)
+  public void loadCommitInfos(IDBStoreAccessor accessor, CDOBranch branch, long startTime, long endTime, CDOCommitInfoHandler handler)
   {
     int count = CDOCommitInfoUtil.decodeCount(endTime);
 
@@ -222,8 +221,7 @@ public class CommitInfoTable extends Lifecycle
           }
         }
 
-        CDOCommitInfo commitInfo = commitInfoManager.createCommitInfo(infoBranch, timeStamp, previousTimeStamp, userID,
-            comment, mergeSource, null);
+        CDOCommitInfo commitInfo = commitInfoManager.createCommitInfo(infoBranch, timeStamp, previousTimeStamp, userID, comment, mergeSource, null);
         handler.handleCommitInfo(commitInfo);
       }
     }
@@ -238,8 +236,7 @@ public class CommitInfoTable extends Lifecycle
     }
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     out.writeBoolean(withMergeSource);
 
@@ -247,14 +244,13 @@ public class CommitInfoTable extends Lifecycle
     DBUtil.serializeTable(out, connection, table, null, where);
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     boolean actualWithMergeSource = in.readBoolean();
     if (actualWithMergeSource != withMergeSource)
     {
-      throw new IllegalStateException("Commit info data mismatch. Expected: " + (withMergeSource ? "with" : "without")
-          + " merge source. Actual: " + (actualWithMergeSource ? "with" : "without") + " merge source.");
+      throw new IllegalStateException("Commit info data mismatch. Expected: " + (withMergeSource ? "with" : "without") + " merge source. Actual: "
+          + (actualWithMergeSource ? "with" : "without") + " merge source.");
     }
 
     DBUtil.deserializeTable(in, connection, table, monitor.fork());
@@ -265,8 +261,7 @@ public class CommitInfoTable extends Lifecycle
     IDBField timeStampField = table.getField(TIMESTAMP);
 
     long lastCommitTime = DBUtil.selectMaximumLong(connection, timeStampField);
-    long lastNonLocalCommitTime = DBUtil.selectMaximumLong(connection, timeStampField,
-        CDOBranch.MAIN_BRANCH_ID + "<=" + BRANCH);
+    long lastNonLocalCommitTime = DBUtil.selectMaximumLong(connection, timeStampField, CDOBranch.MAIN_BRANCH_ID + "<=" + BRANCH);
 
     if (lastNonLocalCommitTime == CDOBranchPoint.UNSPECIFIED_DATE)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
index 0824e7e0b1..995b328e25 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
@@ -89,10 +89,9 @@ public class DBBrowserPage extends AbstractPage
     boolean schema = browser.isParam("schema");
 
     pout.print("<table border=\"0\">\r\n");
-    pout.print("<tr><td><b>Empty tables:</b></td><td><b>"
-        + browser.href(used ? "Hidden" : "Shown", getName(), "used", String.valueOf(!used)) + "</b></td></tr>\r\n");
-    pout.print("<tr><td><b>Row data:</b></td><td><b>"
-        + browser.href(schema ? "Hidden" : "Shown", getName(), "schema", String.valueOf(!schema))
+    pout.print(
+        "<tr><td><b>Empty tables:</b></td><td><b>" + browser.href(used ? "Hidden" : "Shown", getName(), "used", String.valueOf(!used)) + "</b></td></tr>\r\n");
+    pout.print("<tr><td><b>Row data:</b></td><td><b>" + browser.href(schema ? "Hidden" : "Shown", getName(), "schema", String.valueOf(!schema))
         + "</b></td></tr>\r\n");
     pout.print("</table><br>\r\n");
 
@@ -170,8 +169,7 @@ public class DBBrowserPage extends AbstractPage
     }
   }
 
-  protected void executeQuery(CDOServerBrowser browser, PrintStream pout, Connection connection, String table,
-      String sql)
+  protected void executeQuery(CDOServerBrowser browser, PrintStream pout, Connection connection, String table, String sql)
   {
     String order = browser.getParam("order");
     String direction = browser.getParam("direction");
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBRevisionHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBRevisionHandler.java
index cce592156c..841beedcd9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBRevisionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBRevisionHandler.java
@@ -31,8 +31,8 @@ public class DBRevisionHandler implements CDORevisionHandler
   {
     if (revision.getVersion() < CDOBranchVersion.FIRST_VERSION - 1)
     {
-      revision = new DetachedCDORevision(revision.getEClass(), revision.getID(), revision.getBranch(),
-          -revision.getVersion(), revision.getTimeStamp(), revision.getRevised());
+      revision = new DetachedCDORevision(revision.getEClass(), revision.getID(), revision.getBranch(), -revision.getVersion(), revision.getTimeStamp(),
+          revision.getRevised());
     }
 
     return delegate.handleRevision(revision);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 15e383d1f3..83a5676ebf 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -390,10 +390,8 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
   public void setPersistentProperties(Map<String, String> properties)
   {
     IDBConnection connection = database.getConnection();
-    IDBPreparedStatement deleteStmt = connection.prepareStatement(CDODBSchema.SQL_DELETE_PROPERTIES,
-        ReuseProbability.MEDIUM);
-    IDBPreparedStatement insertStmt = connection.prepareStatement(CDODBSchema.SQL_INSERT_PROPERTIES,
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement deleteStmt = connection.prepareStatement(CDODBSchema.SQL_DELETE_PROPERTIES, ReuseProbability.MEDIUM);
+    IDBPreparedStatement insertStmt = connection.prepareStatement(CDODBSchema.SQL_INSERT_PROPERTIES, ReuseProbability.MEDIUM);
     String sql = null;
 
     try
@@ -658,8 +656,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
     }
 
     String schemaName = repository.getName();
-    boolean fixNullableIndexColumns = schemaVersion != FIRST_START
-        && schemaVersion < FIRST_VERSION_WITH_NULLABLE_CHECKS;
+    boolean fixNullableIndexColumns = schemaVersion != FIRST_START && schemaVersion < FIRST_VERSION_WITH_NULLABLE_CHECKS;
 
     database = DBUtil.openDatabase(dbAdapter, dbConnectionProvider, schemaName, fixNullableIndexColumns);
     IDBSchemaTransaction schemaTransaction = database.openSchemaTransaction();
@@ -692,8 +689,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
     }
 
     setRevisionTemporality(mappingStrategy.hasAuditSupport() ? RevisionTemporality.AUDITING : RevisionTemporality.NONE);
-    setRevisionParallelism(
-        mappingStrategy.hasBranchingSupport() ? RevisionParallelism.BRANCHING : RevisionParallelism.NONE);
+    setRevisionParallelism(mappingStrategy.hasBranchingSupport() ? RevisionParallelism.BRANCHING : RevisionParallelism.NONE);
 
     if (schemaVersion == FIRST_START)
     {
@@ -878,8 +874,8 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
                 continue;
               }
 
-              lastNonLocalCommitTime = Math.max(lastNonLocalCommitTime, DBUtil.selectMaximumLong(connection,
-                  branchField, CDOBranch.MAIN_BRANCH_ID + "<=" + IMappingConstants.ATTRIBUTES_BRANCH));
+              lastNonLocalCommitTime = Math.max(lastNonLocalCommitTime,
+                  DBUtil.selectMaximumLong(connection, branchField, CDOBranch.MAIN_BRANCH_ID + "<=" + IMappingConstants.ATTRIBUTES_BRANCH));
             }
 
             lastCommitTime = Math.max(lastCommitTime, DBUtil.selectMaximumLong(connection, createdField));
@@ -942,8 +938,8 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
     try
     {
       statement = connection.createStatement();
-      resultSet = statement.executeQuery("SELECT " + CDODBSchema.PROPERTIES_VALUE + " FROM " + CDODBSchema.PROPERTIES
-          + " WHERE " + CDODBSchema.PROPERTIES_NAME + "='" + PROP_SCHEMA_VERSION + "'");
+      resultSet = statement.executeQuery("SELECT " + CDODBSchema.PROPERTIES_VALUE + " FROM " + CDODBSchema.PROPERTIES + " WHERE " + CDODBSchema.PROPERTIES_NAME
+          + "='" + PROP_SCHEMA_VERSION + "'");
 
       if (resultSet.next())
       {
@@ -1028,8 +1024,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
 
               String from = " FROM " + name + " WHERE " + ATTRIBUTES_VERSION + "<" + CDOBranchVersion.FIRST_VERSION;
 
-              statement.executeUpdate("DELETE FROM " + CDODBSchema.CDO_OBJECTS + " WHERE " + ATTRIBUTES_ID
-                  + " IN (SELECT " + ATTRIBUTES_ID + from + ")");
+              statement.executeUpdate("DELETE FROM " + CDODBSchema.CDO_OBJECTS + " WHERE " + ATTRIBUTES_ID + " IN (SELECT " + ATTRIBUTES_ID + from + ")");
 
               statement.executeUpdate("DELETE" + from);
             }
@@ -1067,8 +1062,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
 
   private static final SchemaMigrator NULLABLE_COLUMNS_MIGRATION = null;
 
-  private static final SchemaMigrator[] SCHEMA_MIGRATORS = { NO_MIGRATION_NEEDED, NON_AUDIT_MIGRATION,
-      LOB_SIZE_MIGRATION, NULLABLE_COLUMNS_MIGRATION };
+  private static final SchemaMigrator[] SCHEMA_MIGRATORS = { NO_MIGRATION_NEEDED, NON_AUDIT_MIGRATION, LOB_SIZE_MIGRATION, NULLABLE_COLUMNS_MIGRATION };
 
   static
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 2b3c84870e..c658103dbc 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -233,8 +233,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     return null;
   }
 
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     if (TRACER.isEnabled())
     {
@@ -255,8 +254,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
         int version = revision.getVersion();
         if (version < CDOBranchVersion.UNSPECIFIED_VERSION)
         {
-          return new DetachedCDORevision(eClass, id, revision.getBranch(), -version, revision.getTimeStamp(),
-              revision.getRevised());
+          return new DetachedCDORevision(eClass, id, revision.getBranch(), -version, revision.getTimeStamp(), revision.getRevised());
         }
 
         return revision;
@@ -267,8 +265,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     return null;
   }
 
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     DBStore store = getStore();
     EClass eClass = getObjectType(id);
@@ -294,8 +291,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       if (success && revision.getVersion() < CDOBranchVersion.FIRST_VERSION - 1)
       {
         // it is detached revision
-        revision = new DetachedCDORevision(eClass, id, revision.getBranch(), -revision.getVersion(),
-            revision.getTimeStamp(), revision.getRevised());
+        revision = new DetachedCDORevision(eClass, id, revision.getBranch(), -revision.getVersion(), revision.getTimeStamp(), revision.getRevised());
 
       }
     }
@@ -486,8 +482,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     IIDHandler idHandler = store.getIDHandler();
 
     // Remember maxID because it may have to be adjusted if the repository is BACKUP or CLONE. See bug 325097.
-    boolean adjustMaxID = !context.getBranchPoint().getBranch().isLocal()
-        && store.getRepository().getIDGenerationLocation() == IDGenerationLocation.STORE;
+    boolean adjustMaxID = !context.getBranchPoint().getBranch().isLocal() && store.getRepository().getIDGenerationLocation() == IDGenerationLocation.STORE;
 
     // Remember CDOIDs of new objects. They are cleared after writeRevisions()
     for (InternalCDORevision revision : context.getNewObjects())
@@ -503,27 +498,24 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
 
   @Deprecated
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, monitor);
   }
 
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+      OMMonitor monitor)
   {
     CommitInfoTable commitInfoTable = getStore().getCommitInfoTable();
     if (commitInfoTable != null)
     {
-      commitInfoTable.writeCommitInfo(this, branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-          monitor);
+      commitInfoTable.writeCommitInfo(this, branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, monitor);
     }
   }
 
   @Override
-  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor)
+  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor)
   {
     IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
 
@@ -550,27 +542,23 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
   {
     CDOID id = delta.getID();
     EClass eClass = getObjectType(id);
-    IClassMappingDeltaSupport mapping = (IClassMappingDeltaSupport)getStore().getMappingStrategy()
-        .getClassMapping(eClass);
+    IClassMappingDeltaSupport mapping = (IClassMappingDeltaSupport)getStore().getMappingStrategy().getClassMapping(eClass);
     mapping.writeRevisionDelta(this, delta, created, monitor);
   }
 
   @Override
-  protected void writeNewObjectRevisions(InternalCommitContext context, InternalCDORevision[] newObjects,
-      CDOBranch branch, OMMonitor monitor)
+  protected void writeNewObjectRevisions(InternalCommitContext context, InternalCDORevision[] newObjects, CDOBranch branch, OMMonitor monitor)
   {
     writeRevisions(context, true, newObjects, branch, monitor);
   }
 
   @Override
-  protected void writeDirtyObjectRevisions(InternalCommitContext context, InternalCDORevision[] dirtyObjects,
-      CDOBranch branch, OMMonitor monitor)
+  protected void writeDirtyObjectRevisions(InternalCommitContext context, InternalCDORevision[] dirtyObjects, CDOBranch branch, OMMonitor monitor)
   {
     writeRevisions(context, false, dirtyObjects, branch, monitor);
   }
 
-  protected void writeRevisions(InternalCommitContext context, boolean attachNewObjects,
-      InternalCDORevision[] revisions, CDOBranch branch, OMMonitor monitor)
+  protected void writeRevisions(InternalCommitContext context, boolean attachNewObjects, InternalCDORevision[] revisions, CDOBranch branch, OMMonitor monitor)
   {
     try
     {
@@ -635,10 +623,8 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
 
         // but for now:
 
-        InternalCDORevision revision = revisionManager.getRevision(id, branch.getHead(), CDORevision.UNCHUNKED,
-            CDORevision.DEPTH_NONE, true);
-        int version = ObjectUtil.equals(branch, revision.getBranch()) ? revision.getVersion() + 1
-            : CDOBranchVersion.FIRST_VERSION;
+        InternalCDORevision revision = revisionManager.getRevision(id, branch.getHead(), CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
+        int version = ObjectUtil.equals(branch, revision.getBranch()) ? revision.getVersion() + 1 : CDOBranchVersion.FIRST_VERSION;
 
         if (TRACER.isEnabled())
         {
@@ -1093,15 +1079,13 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     return mappingStrategy.readChangeSet(this, monitor, segments);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
     mappingStrategy.handleRevisions(this, eClass, branch, timeStamp, exactTime, new DBRevisionHandler(handler));
   }
 
-  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException
   {
     DBStore store = getStore();
     InternalRepository repository = store.getRepository();
@@ -1140,8 +1124,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     mappingStrategy.rawExport(this, out, fromBranchID, toBranchID, fromCommitTime, toCommitTime);
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     DBStore store = getStore();
     IIDHandler idHandler = store.getIDHandler();
@@ -1219,12 +1202,11 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       OM.LOG.error(ex);
     }
 
-    getStore().getMappingStrategy().removeMapping(getConnection(),
-        packageUnits.toArray(new InternalCDOPackageUnit[packageUnits.size()]));
+    getStore().getMappingStrategy().removeMapping(getConnection(), packageUnits.toArray(new InternalCDOPackageUnit[packageUnits.size()]));
   }
 
-  protected void rawImportPackageUnits(CDODataInput in, long fromCommitTime, long toCommitTime,
-      Collection<InternalCDOPackageUnit> packageUnits, OMMonitor monitor) throws IOException
+  protected void rawImportPackageUnits(CDODataInput in, long fromCommitTime, long toCommitTime, Collection<InternalCDOPackageUnit> packageUnits,
+      OMMonitor monitor) throws IOException
   {
     monitor.begin(2);
 
@@ -1258,8 +1240,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
         {
           connection2 = store.getConnection();
 
-          mappingStrategy.createMapping(connection2,
-              packageUnits.toArray(new InternalCDOPackageUnit[packageUnits.size()]), monitor.fork());
+          mappingStrategy.createMapping(connection2, packageUnits.toArray(new InternalCDOPackageUnit[packageUnits.size()]), monitor.fork());
         }
         finally
         {
@@ -1314,14 +1295,12 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     writeClob(id, size, reader);
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, monitor);
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      CDOBranchPoint mergeSource, OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, monitor);
   }
@@ -1367,14 +1346,12 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     }
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return createLockArea(null, userID, branchPoint, readOnly, locks);
   }
 
-  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     DurableLockingManager manager = getStore().getDurableLockingManager();
     return manager.createLockArea(this, durableLockingID, userID, branchPoint, readOnly, locks);
@@ -1434,15 +1411,13 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     unitMappingTable.readUnitRevisions(this, view, rootID, revisionHandler, monitor);
   }
 
-  public Object initUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs,
-      long timeStamp, OMMonitor monitor)
+  public Object initUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs, long timeStamp, OMMonitor monitor)
   {
     UnitMappingTable unitMappingTable = getStore().getUnitMappingTable();
     return unitMappingTable.initUnit(this, timeStamp, view, rootID, revisionHandler, initializedIDs, monitor);
   }
 
-  public void finishUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, long timeStamp,
-      Object initResult, List<CDOID> ids)
+  public void finishUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, long timeStamp, Object initResult, List<CDOID> ids)
   {
     UnitMappingTable unitMappingTable = getStore().getUnitMappingTable();
     unitMappingTable.finishUnit((BatchedStatement)initResult, rootID, ids, timeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java
index f3af2ad1db..3ffa059db1 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java
@@ -74,8 +74,7 @@ public class DBStoreChunkReader extends StoreChunkReader implements IDBStoreChun
 
     if (referenceMapping instanceof IListMapping2)
     {
-      ((IListMapping2)referenceMapping).addRangedChunkWhere(getAccessor(), getRevision().getID(), builder, fromIndex,
-          toIndex);
+      ((IListMapping2)referenceMapping).addRangedChunkWhere(getAccessor(), getRevision().getID(), builder, fromIndex, toIndex);
     }
     else
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
index af871ec9f7..694fdca0a9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
@@ -64,8 +64,7 @@ public class DBStoreFactory implements IStoreFactory
     return store;
   }
 
-  private IMappingStrategy getMappingStrategy(String repositoryName, Map<String, String> repositoryProperties,
-      Element storeConfig)
+  private IMappingStrategy getMappingStrategy(String repositoryName, Map<String, String> repositoryProperties, Element storeConfig)
   {
     NodeList mappingStrategyConfigs = storeConfig.getElementsByTagName("mappingStrategy"); //$NON-NLS-1$
     if (mappingStrategyConfigs.getLength() != 1)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
index 444fd7f1aa..db3d62d958 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
@@ -111,8 +111,8 @@ public class DurableLockingManager extends Lifecycle
     this.store = store;
   }
 
-  public synchronized LockArea createLockArea(DBStoreAccessor accessor, String durableLockingID, String userID,
-      CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
+  public synchronized LockArea createLockArea(DBStoreAccessor accessor, String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
+      Map<CDOID, LockGrade> locks)
   {
     if (durableLockingID == null)
     {
@@ -300,14 +300,12 @@ public class DurableLockingManager extends Lifecycle
     commit(accessor);
   }
 
-  public void lock(DBStoreAccessor accessor, String durableLockingID, LockType type,
-      Collection<? extends Object> objectsToLock)
+  public void lock(DBStoreAccessor accessor, String durableLockingID, LockType type, Collection<? extends Object> objectsToLock)
   {
     changeLocks(accessor, durableLockingID, type, objectsToLock, true);
   }
 
-  public void unlock(DBStoreAccessor accessor, String durableLockingID, LockType type,
-      Collection<? extends Object> objectsToUnlock)
+  public void unlock(DBStoreAccessor accessor, String durableLockingID, LockType type, Collection<? extends Object> objectsToUnlock)
   {
     changeLocks(accessor, durableLockingID, type, objectsToUnlock, false);
   }
@@ -366,16 +364,16 @@ public class DurableLockingManager extends Lifecycle
       });
     }
 
-    sqlInsertLockArea = "INSERT INTO " + LOCK_AREAS + "(" + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + ","
-        + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + "," + LOCK_AREAS_READ_ONLY + ") VALUES (?, ?, ?, ?, ?)";
-    sqlSelectLockArea = "SELECT " + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + ","
-        + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
-    sqlSelectAllLockAreas = "SELECT " + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + ","
-        + LOCK_AREAS_VIEW_TIME + "," + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS;
+    sqlInsertLockArea = "INSERT INTO " + LOCK_AREAS + "(" + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME
+        + "," + LOCK_AREAS_READ_ONLY + ") VALUES (?, ?, ?, ?, ?)";
+    sqlSelectLockArea = "SELECT " + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + "," + LOCK_AREAS_READ_ONLY + " FROM "
+        + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
+    sqlSelectAllLockAreas = "SELECT " + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + ","
+        + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS;
     sqlSelectLockAreas = sqlSelectAllLockAreas + " WHERE " + LOCK_AREAS_USER_ID + " LIKE ?";
     sqlDeleteLockArea = "DELETE FROM " + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
-    sqlDeleteLockAreas = "DELETE FROM " + LOCK_AREAS + " WHERE EXISTS (SELECT * FROM " + LOCKS + " WHERE " + LOCKS + "."
-        + LOCKS_AREA_ID + "=" + LOCK_AREAS + "." + LOCK_AREAS_ID + ")";
+    sqlDeleteLockAreas = "DELETE FROM " + LOCK_AREAS + " WHERE EXISTS (SELECT * FROM " + LOCKS + " WHERE " + LOCKS + "." + LOCKS_AREA_ID + "=" + LOCK_AREAS
+        + "." + LOCK_AREAS_ID + ")";
 
     // Locks
     locksTable = database.getSchema().getTable(LOCKS);
@@ -395,14 +393,10 @@ public class DurableLockingManager extends Lifecycle
       });
     }
 
-    sqlSelectLocks = "SELECT " + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID
-        + "=?";
-    sqlSelectLock = "SELECT " + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=? AND "
-        + LOCKS_OBJECT_ID + "=?";
-    sqlInsertLock = "INSERT INTO " + LOCKS + "(" + LOCKS_AREA_ID + "," + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE
-        + ") VALUES (?, ?, ?)";
-    sqlUpdateLock = "UPDATE " + LOCKS + " SET " + LOCKS_LOCK_GRADE + "=? " + " WHERE " + LOCKS_AREA_ID + "=? AND "
-        + LOCKS_OBJECT_ID + "=?";
+    sqlSelectLocks = "SELECT " + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=?";
+    sqlSelectLock = "SELECT " + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=? AND " + LOCKS_OBJECT_ID + "=?";
+    sqlInsertLock = "INSERT INTO " + LOCKS + "(" + LOCKS_AREA_ID + "," + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE + ") VALUES (?, ?, ?)";
+    sqlUpdateLock = "UPDATE " + LOCKS + " SET " + LOCKS_LOCK_GRADE + "=? " + " WHERE " + LOCKS_AREA_ID + "=? AND " + LOCKS_OBJECT_ID + "=?";
     sqlDeleteLock = "DELETE FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=? AND " + LOCKS_OBJECT_ID + "=?";
     sqlDeleteLocks = "DELETE FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=?";
   }
@@ -425,8 +419,7 @@ public class DurableLockingManager extends Lifecycle
     }
   }
 
-  private LockArea makeLockArea(DBStoreAccessor accessor, String durableLockingID, String userID, int branchID,
-      long timeStamp, boolean readOnly)
+  private LockArea makeLockArea(DBStoreAccessor accessor, String durableLockingID, String userID, int branchID, long timeStamp, boolean readOnly)
   {
     CDOBranchPoint branchPoint = branchManager.getBranch(branchID).getPoint(timeStamp);
     Map<CDOID, LockGrade> lockMap = getLockMap(accessor, durableLockingID);
@@ -465,8 +458,7 @@ public class DurableLockingManager extends Lifecycle
     }
   }
 
-  private void changeLocks(DBStoreAccessor accessor, String durableLockingID, LockType type,
-      Collection<? extends Object> keys, boolean on)
+  private void changeLocks(DBStoreAccessor accessor, String durableLockingID, LockType type, Collection<? extends Object> keys, boolean on)
   {
     if (keys.isEmpty())
     {
@@ -475,11 +467,9 @@ public class DurableLockingManager extends Lifecycle
 
     String sql = on ? sqlInsertLock : sqlDeleteLock;
 
-    IDBPreparedStatement stmtSelect = accessor.getDBConnection().prepareStatement(sqlSelectLock,
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmtSelect = accessor.getDBConnection().prepareStatement(sqlSelectLock, ReuseProbability.MEDIUM);
     IDBPreparedStatement stmtInsertOrDelete = accessor.getDBConnection().prepareStatement(sql, ReuseProbability.MEDIUM);
-    IDBPreparedStatement stmtUpdate = accessor.getDBConnection().prepareStatement(sqlUpdateLock,
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmtUpdate = accessor.getDBConnection().prepareStatement(sqlUpdateLock, ReuseProbability.MEDIUM);
     ResultSet resultSet = null;
 
     try
@@ -536,15 +526,13 @@ public class DurableLockingManager extends Lifecycle
     }
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     DBUtil.serializeTable(out, connection, lockAreasTable, null, null);
     DBUtil.serializeTable(out, connection, locksTable, null, null);
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     monitor.begin(4);
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java
index aaf8426dcb..67cc9e4c31 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java
@@ -165,15 +165,13 @@ public class ExternalReferenceManager extends Lifecycle
     }
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     String where = " WHERE " + EXTERNAL_REFS_COMMITTIME + " BETWEEN " + fromCommitTime + " AND " + toCommitTime;
     DBUtil.serializeTable(out, connection, table, null, where);
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     DBUtil.deserializeTable(in, connection, table, monitor);
   }
@@ -234,8 +232,7 @@ public class ExternalReferenceManager extends Lifecycle
       }
     }
 
-    sqlInsert = "INSERT INTO " + table + "(" + EXTERNAL_REFS_ID + "," + EXTERNAL_REFS_URI + ","
-        + EXTERNAL_REFS_COMMITTIME + ") VALUES (?, ?, ?)";
+    sqlInsert = "INSERT INTO " + table + "(" + EXTERNAL_REFS_ID + "," + EXTERNAL_REFS_URI + "," + EXTERNAL_REFS_COMMITTIME + ") VALUES (?, ?, ?)";
     sqlSelectByURI = "SELECT " + EXTERNAL_REFS_ID + " FROM " + table + " WHERE " + EXTERNAL_REFS_URI + "=?";
     sqlSelectByLongID = "SELECT " + EXTERNAL_REFS_URI + " FROM " + table + " WHERE " + EXTERNAL_REFS_ID + "=?";
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java
index 2b842a360f..3bcb003232 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/IObjectTypeMapper.java
@@ -46,8 +46,7 @@ public interface IObjectTypeMapper
    */
   public CDOID getMaxID(Connection connection, IIDHandler idHandler);
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException;
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException;
 
   public void rawImport(Connection connection, CDODataInput in, OMMonitor monitor) throws IOException;
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/LongIDHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/LongIDHandler.java
index 4d6fa9dc3b..5876d868e8 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/LongIDHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/LongIDHandler.java
@@ -183,8 +183,12 @@ public class LongIDHandler extends Lifecycle implements IIDHandler
       if (commitTime == CDOBranchPoint.INVALID_DATE)
       {
         CommitContext commitContext = StoreThreadLocal.getCommitContext();
-        commitTime = commitContext != null ? commitContext.getBranchPoint().getTimeStamp()
-            : CDOBranchPoint.UNSPECIFIED_DATE; // Happens on rawStore for workspace checkouts
+        commitTime = commitContext != null ? commitContext.getBranchPoint().getTimeStamp() : CDOBranchPoint.UNSPECIFIED_DATE; // Happens
+                                                                                                                              // on
+                                                                                                                              // rawStore
+                                                                                                                              // for
+                                                                                                                              // workspace
+                                                                                                                              // checkouts
       }
 
       value = externalReferenceManager.mapExternalReference((CDOIDExternal)id, commitTime);
@@ -244,14 +248,12 @@ public class LongIDHandler extends Lifecycle implements IIDHandler
     return externalReferenceManager.unmapURI(accessor, value(id));
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     externalReferenceManager.rawExport(connection, out, fromCommitTime, toCommitTime);
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     externalReferenceManager.rawImport(connection, in, fromCommitTime, toCommitTime, monitor);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
index 88f950bae8..325506119c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
@@ -130,8 +130,7 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
 
   public Collection<InternalCDOPackageUnit> readPackageUnits(Connection connection)
   {
-    return readPackageUnits(connection, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE,
-        new Monitor());
+    return readPackageUnits(connection, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, new Monitor());
   }
 
   public final void writePackageUnits(Connection connection, InternalCDOPackageUnit[] packageUnits, OMMonitor monitor)
@@ -147,8 +146,7 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
     }
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     // Export package units
     String where = " WHERE p_u." + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.CORE_PACKAGE_URI + //
@@ -158,13 +156,12 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
     DBUtil.serializeTable(out, connection, CDODBSchema.PACKAGE_UNITS, "p_u", where);
 
     // Export package infos
-    String join = ", " + CDODBSchema.PACKAGE_UNITS + " p_u" + where + " AND p_i." + CDODBSchema.PACKAGE_INFOS_UNIT
-        + "=p_u." + CDODBSchema.PACKAGE_UNITS_ID;
+    String join = ", " + CDODBSchema.PACKAGE_UNITS + " p_u" + where + " AND p_i." + CDODBSchema.PACKAGE_INFOS_UNIT + "=p_u." + CDODBSchema.PACKAGE_UNITS_ID;
     DBUtil.serializeTable(out, connection, CDODBSchema.PACKAGE_INFOS, "p_i", join);
   }
 
-  public Collection<InternalCDOPackageUnit> rawImport(Connection connection, CDODataInput in, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor) throws IOException
+  public Collection<InternalCDOPackageUnit> rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor)
+      throws IOException
   {
     monitor.begin(3);
 
@@ -239,8 +236,8 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
     try
     {
       String sql = "INSERT INTO " + CDODBSchema.PACKAGE_UNITS + " (" + CDODBSchema.PACKAGE_UNITS_ID + ", " //$NON-NLS-1$ //$NON-NLS-2$
-          + CDODBSchema.PACKAGE_UNITS_ORIGINAL_TYPE + ", " + CDODBSchema.PACKAGE_UNITS_TIME_STAMP + ", "
-          + CDODBSchema.PACKAGE_UNITS_PACKAGE_DATA + ") VALUES (?, ?, ?, ?)";
+          + CDODBSchema.PACKAGE_UNITS_ORIGINAL_TYPE + ", " + CDODBSchema.PACKAGE_UNITS_TIME_STAMP + ", " + CDODBSchema.PACKAGE_UNITS_PACKAGE_DATA
+          + ") VALUES (?, ?, ?, ?)";
       DBUtil.trace(sql);
 
       IDBPreparedStatement stmt = connection.prepareStatement(sql, ReuseProbability.MEDIUM);
@@ -351,8 +348,7 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
     }
   }
 
-  private Collection<InternalCDOPackageUnit> readPackageUnits(Connection connection, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor)
+  private Collection<InternalCDOPackageUnit> readPackageUnits(Connection connection, long fromCommitTime, long toCommitTime, OMMonitor monitor)
   {
     final Map<String, InternalCDOPackageUnit> packageUnits = new HashMap<String, InternalCDOPackageUnit>();
     IDBRowHandler unitRowHandler = new IDBRowHandler()
@@ -374,14 +370,13 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
     String where = null;
     if (fromCommitTime != CDOBranchPoint.UNSPECIFIED_DATE)
     {
-      where = CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.CORE_PACKAGE_URI + "' AND "
-          + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.RESOURCE_PACKAGE_URI + "' AND "
-          + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.TYPES_PACKAGE_URI + "' AND "
+      where = CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.CORE_PACKAGE_URI + "' AND " + CDODBSchema.PACKAGE_UNITS_ID + "<>'"
+          + CDOModelConstants.RESOURCE_PACKAGE_URI + "' AND " + CDODBSchema.PACKAGE_UNITS_ID + "<>'" + CDOModelConstants.TYPES_PACKAGE_URI + "' AND "
           + CDODBSchema.PACKAGE_UNITS_TIME_STAMP + " BETWEEN " + fromCommitTime + " AND " + toCommitTime;
     }
 
-    DBUtil.select(connection, unitRowHandler, where, CDODBSchema.PACKAGE_UNITS_ID,
-        CDODBSchema.PACKAGE_UNITS_ORIGINAL_TYPE, CDODBSchema.PACKAGE_UNITS_TIME_STAMP);
+    DBUtil.select(connection, unitRowHandler, where, CDODBSchema.PACKAGE_UNITS_ID, CDODBSchema.PACKAGE_UNITS_ORIGINAL_TYPE,
+        CDODBSchema.PACKAGE_UNITS_TIME_STAMP);
 
     final Map<String, List<InternalCDOPackageInfo>> packageInfos = new HashMap<String, List<InternalCDOPackageInfo>>();
     IDBRowHandler infoRowHandler = new IDBRowHandler()
@@ -410,8 +405,7 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
 
     try
     {
-      DBUtil.select(connection, infoRowHandler, CDODBSchema.PACKAGE_INFOS_UNIT, CDODBSchema.PACKAGE_INFOS_URI,
-          CDODBSchema.PACKAGE_INFOS_PARENT);
+      DBUtil.select(connection, infoRowHandler, CDODBSchema.PACKAGE_INFOS_UNIT, CDODBSchema.PACKAGE_INFOS_URI, CDODBSchema.PACKAGE_INFOS_PARENT);
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
index 59b49a2ca5..8b368a16ea 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
@@ -103,8 +103,8 @@ public class SQLQueryHandler implements IQueryHandler
     boolean mapQuery = false;
 
     IIDHandler idHandler = accessor.getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
-        ResultSet.CONCUR_READ_ONLY, ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+        ReuseProbability.MEDIUM);
     ResultSet resultSet = null;
 
     try
@@ -122,8 +122,7 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + FIRST_RESULT + " must be an integer but it is a " + o
-                  + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException("Parameter " + FIRST_RESULT + " must be an integer but it is a " + o + " class " + o.getClass().getName(), ex);
             }
           }
         }
@@ -138,8 +137,8 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + QUERY_STATEMENT + " must be an boolean but it is a " + o
-                  + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException("Parameter " + QUERY_STATEMENT + " must be an boolean but it is a " + o + " class " + o.getClass().getName(),
+                  ex);
             }
           }
         }
@@ -154,8 +153,8 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + CDO_OBJECT_QUERY + " must be a boolean but it is a " + o
-                  + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException("Parameter " + CDO_OBJECT_QUERY + " must be a boolean but it is a " + o + " class " + o.getClass().getName(),
+                  ex);
             }
           }
         }
@@ -170,9 +169,7 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException(
-                  "Parameter " + MAP_QUERY + " must be a boolean but it is a " + o + " class " + o.getClass().getName(),
-                  ex);
+              throw new IllegalArgumentException("Parameter " + MAP_QUERY + " must be a boolean but it is a " + o + " class " + o.getClass().getName(), ex);
             }
           }
         }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/StringIDHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/StringIDHandler.java
index ec9a5e79e2..e08e2e6a96 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/StringIDHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/StringIDHandler.java
@@ -198,14 +198,12 @@ public class StringIDHandler extends Lifecycle implements IIDHandler
     return value(id);
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     // Do nothing
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     // Do nothing
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/UUIDHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/UUIDHandler.java
index 041636e66d..62090bd387 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/UUIDHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/UUIDHandler.java
@@ -187,14 +187,12 @@ public class UUIDHandler extends Lifecycle implements IIDHandler
     return CDOIDUtil.getString(id);
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     // Do nothing
   }
 
-  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(Connection connection, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     // Do nothing
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
index 5762203925..fa26cae563 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java
@@ -208,8 +208,7 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp
 
   // -- object id related methods ----------------------------------------
 
-  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp,
-      boolean exactTime, CDORevisionHandler handler)
+  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     if (eClass == null)
     {
@@ -437,8 +436,7 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp
       return CDO_SET_PREFIX + name;
     }
 
-    return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getUniqueID(feature),
-        getMaxFieldNameLength());
+    return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getUniqueID(feature), getMaxFieldNameLength());
   }
 
   private String getName(String name, String suffix, int maxLength)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
index c88acdcd63..0f841b3201 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
@@ -62,8 +62,7 @@ public class CoreTypeMappings
    */
   public static class TMEnum extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(
-        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Enum", EcorePackage.eINSTANCE.getEEnum(), DBType.INTEGER));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Enum", EcorePackage.eINSTANCE.getEEnum(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -117,11 +116,11 @@ public class CoreTypeMappings
    */
   public static class TMString extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".StringVarchar", EcorePackage.eINSTANCE.getEString(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".StringVarchar", EcorePackage.eINSTANCE.getEString(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".StringLongVarchar", EcorePackage.eINSTANCE.getEString(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".StringLongVarchar", EcorePackage.eINSTANCE.getEString(), DBType.LONGVARCHAR));
 
     public static final Factory FACTORY_CLOB = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".StringClob", EcorePackage.eINSTANCE.getEString(), DBType.CLOB));
@@ -158,8 +157,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY_VARCHAR = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".BlobStream", EtypesPackage.eINSTANCE.getBlob(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".BlobStreamLongVarchar", EtypesPackage.eINSTANCE.getBlob(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BlobStreamLongVarchar", EtypesPackage.eINSTANCE.getBlob(), DBType.LONGVARCHAR));
 
     @Override
     protected void doSetValue(PreparedStatement stmt, int index, Object value) throws SQLException
@@ -210,8 +209,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY_VARCHAR = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".ClobStream", EtypesPackage.eINSTANCE.getClob(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".ClobStreamLongVarchar", EtypesPackage.eINSTANCE.getClob(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ClobStreamLongVarchar", EtypesPackage.eINSTANCE.getClob(), DBType.LONGVARCHAR));
 
     @Override
     protected void doSetValue(PreparedStatement stmt, int index, Object value) throws SQLException
@@ -262,8 +261,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Short", EcorePackage.eINSTANCE.getEShort(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".ShortObject", EcorePackage.eINSTANCE.getEShortObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ShortObject", EcorePackage.eINSTANCE.getEShortObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -344,11 +343,10 @@ public class CoreTypeMappings
    */
   public static class TMLong extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(
-        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Long", EcorePackage.eINSTANCE.getELong(), DBType.BIGINT));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Long", EcorePackage.eINSTANCE.getELong(), DBType.BIGINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".LongObject",
-        EcorePackage.eINSTANCE.getELongObject(), DBType.BIGINT));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".LongObject", EcorePackage.eINSTANCE.getELongObject(), DBType.BIGINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -382,8 +380,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Integer", EcorePackage.eINSTANCE.getEInt(), DBType.INTEGER));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".IntegerObject", EcorePackage.eINSTANCE.getEIntegerObject(), DBType.INTEGER));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".IntegerObject", EcorePackage.eINSTANCE.getEIntegerObject(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -414,11 +412,10 @@ public class CoreTypeMappings
    */
   public static class TMFloat extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(
-        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Float", EcorePackage.eINSTANCE.getEFloat(), DBType.FLOAT));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Float", EcorePackage.eINSTANCE.getEFloat(), DBType.FLOAT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".FloatObject", EcorePackage.eINSTANCE.getEFloatObject(), DBType.FLOAT));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".FloatObject", EcorePackage.eINSTANCE.getEFloatObject(), DBType.FLOAT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -452,8 +449,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Double", EcorePackage.eINSTANCE.getEDouble(), DBType.DOUBLE));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".DoubleObject", EcorePackage.eINSTANCE.getEDoubleObject(), DBType.DOUBLE));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".DoubleObject", EcorePackage.eINSTANCE.getEDoubleObject(), DBType.DOUBLE));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -484,8 +481,8 @@ public class CoreTypeMappings
    */
   public static class TMDate2Timestamp extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Timestamp",
-        EcorePackage.eINSTANCE.getEDate(), DBType.TIMESTAMP));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Timestamp", EcorePackage.eINSTANCE.getEDate(), DBType.TIMESTAMP));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -522,8 +519,7 @@ public class CoreTypeMappings
    */
   public static class TMDate2Date extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(
-        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Date", EcorePackage.eINSTANCE.getEDate(), DBType.DATE));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Date", EcorePackage.eINSTANCE.getEDate(), DBType.DATE));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -554,8 +550,7 @@ public class CoreTypeMappings
    */
   public static class TMDate2Time extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(
-        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Time", EcorePackage.eINSTANCE.getEDate(), DBType.TIME));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Time", EcorePackage.eINSTANCE.getEDate(), DBType.TIME));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -589,8 +584,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character", EcorePackage.eINSTANCE.getEChar(), DBType.CHAR));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".CharacterObject", EcorePackage.eINSTANCE.getECharacterObject(), DBType.CHAR));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".CharacterObject", EcorePackage.eINSTANCE.getECharacterObject(), DBType.CHAR));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -639,11 +634,11 @@ public class CoreTypeMappings
    */
   public static class TMCharacter2Integer extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character2Integer",
-        EcorePackage.eINSTANCE.getEChar(), DBType.INTEGER));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character2Integer", EcorePackage.eINSTANCE.getEChar(), DBType.INTEGER));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".CharacterObject2Integer", EcorePackage.eINSTANCE.getECharacterObject(), DBType.INTEGER));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".CharacterObject2Integer", EcorePackage.eINSTANCE.getECharacterObject(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -689,8 +684,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Byte", EcorePackage.eINSTANCE.getEByte(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteObject",
-        EcorePackage.eINSTANCE.getEByteObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteObject", EcorePackage.eINSTANCE.getEByteObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -721,8 +716,8 @@ public class CoreTypeMappings
    */
   public static class TMBytes extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteArray",
-        EcorePackage.eINSTANCE.getEByteArray(), DBType.BLOB));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteArray", EcorePackage.eINSTANCE.getEByteArray(), DBType.BLOB));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -753,8 +748,8 @@ public class CoreTypeMappings
    */
   public static class TMBytesVarbinary extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".ByteArrayVarbinary", EcorePackage.eINSTANCE.getEByteArray(), DBType.VARBINARY));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteArrayVarbinary", EcorePackage.eINSTANCE.getEByteArray(), DBType.VARBINARY));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -788,14 +783,14 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(
         TypeMappingUtil.createDescriptor(ID_PREFIX + ".Boolean", EcorePackage.eINSTANCE.getEBoolean(), DBType.BOOLEAN));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".BooleanObject", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.BOOLEAN));
+    public static final Factory FACTORY_OBJECT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BooleanObject", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.BOOLEAN));
 
-    public static final Factory FACTORY_SMALLINT = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".Boolean_SMALLINT", EcorePackage.eINSTANCE.getEBoolean(), DBType.SMALLINT));
+    public static final Factory FACTORY_SMALLINT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Boolean_SMALLINT", EcorePackage.eINSTANCE.getEBoolean(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT_SMALLINT = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".BooleanObject_SMALLINT", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT_SMALLINT = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BooleanObject_SMALLINT", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -826,11 +821,11 @@ public class CoreTypeMappings
    */
   public static class TMBigInteger extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigInteger",
-        EcorePackage.eINSTANCE.getEBigInteger(), DBType.VARCHAR));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigInteger", EcorePackage.eINSTANCE.getEBigInteger(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".BigIntegerLongVarChar", EcorePackage.eINSTANCE.getEBigInteger(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigIntegerLongVarChar", EcorePackage.eINSTANCE.getEBigInteger(), DBType.LONGVARCHAR));
 
     @Override
     protected Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -874,11 +869,11 @@ public class CoreTypeMappings
    */
   public static class TMBigDecimal extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigDecimal",
-        EcorePackage.eINSTANCE.getEBigDecimal(), DBType.VARCHAR));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigDecimal", EcorePackage.eINSTANCE.getEBigDecimal(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".BigDecimalLongVarchar", EcorePackage.eINSTANCE.getEBigDecimal(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigDecimalLongVarchar", EcorePackage.eINSTANCE.getEBigDecimal(), DBType.LONGVARCHAR));
 
     @Override
     protected Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -922,8 +917,8 @@ public class CoreTypeMappings
    */
   public static class TMJavaClass extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".JavaClassVarchar", EcorePackage.eINSTANCE.getEJavaClass(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".JavaClassVarchar", EcorePackage.eINSTANCE.getEJavaClass(), DBType.VARCHAR));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -954,8 +949,8 @@ public class CoreTypeMappings
    */
   public static class TMJavaObject extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".JavaObjectBlob",
-        EcorePackage.eINSTANCE.getEJavaObject(), DBType.BLOB));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".JavaObjectBlob", EcorePackage.eINSTANCE.getEJavaObject(), DBType.BLOB));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -986,14 +981,14 @@ public class CoreTypeMappings
    */
   public static class TMCustom extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".CustomVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".CustomVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
-        .createDescriptor(ID_PREFIX + ".CustomLongVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".CustomLongVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.LONGVARCHAR));
 
-    public static final Factory FACTORY_CLOB = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".CustomClob",
-        EcorePackage.eINSTANCE.getEDataType(), DBType.CLOB));
+    public static final Factory FACTORY_CLOB = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".CustomClob", EcorePackage.eINSTANCE.getEDataType(), DBType.CLOB));
 
     @Override
     protected Object getResultSetValue(ResultSet resultSet) throws SQLException
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
index 1116d42499..ee15e965c5 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
@@ -108,8 +108,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
     registerColumnTypeModifier("postgresql", new ColumnTypeModifier()
     {
       @Override
-      public DBType modify(Provider provider, IMappingStrategy mappingStrategy, EStructuralFeature feature,
-          DBType dbType)
+      public DBType modify(Provider provider, IMappingStrategy mappingStrategy, EStructuralFeature feature, DBType dbType)
       {
         EClassifier classifier = feature.getEType();
         if (classifier == EcorePackage.eINSTANCE.getEChar())
@@ -307,8 +306,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
       {
         EClassifier type = getEType(feature);
         throw new IllegalStateException(MessageFormat.format(Messages.getString("TypeMappingRegistry.1"),
-            feature.getEContainingClass().getName() + "." + feature.getName(),
-            type.getEPackage().getName() + "." + type.getName(), dbType.getKeyword()));
+            feature.getEContainingClass().getName() + "." + feature.getName(), type.getEPackage().getName() + "." + type.getName(), dbType.getKeyword()));
       }
 
       IFactory factory = getContainer().getFactory(ITypeMapping.Factory.PRODUCT_GROUP, descriptor.getFactoryType());
@@ -359,8 +357,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
       dbType = DBType.getTypeByKeyword(typeKeyword);
       if (dbType == null)
       {
-        throw new IllegalArgumentException(
-            "Unsupported columnType (" + typeKeyword + ") annotation of feature " + feature.getName());
+        throw new IllegalArgumentException("Unsupported columnType (" + typeKeyword + ") annotation of feature " + feature.getName());
       }
     }
     else
@@ -391,8 +388,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
 
     try
     {
-      columnTypeModifier = (ColumnTypeModifier)IPluginContainer.INSTANCE
-          .getElement(ColumnTypeModifier.Factory.PRODUCT_GROUP, factoryType, null);
+      columnTypeModifier = (ColumnTypeModifier)IPluginContainer.INSTANCE.getElement(ColumnTypeModifier.Factory.PRODUCT_GROUP, factoryType, null);
     }
     catch (FactoryNotFoundException ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
index ecd8776752..4b9a3c31a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
@@ -68,8 +68,7 @@ public class TypeMappingUtil
 
     if (!matcher.matches())
     {
-      throw new FactoryTypeParserException(
-          MessageFormat.format(Messages.getString("FactoryTypeParserException.1"), factoryType));
+      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.1"), factoryType));
     }
 
     String id = matcher.group(1);
@@ -80,22 +79,19 @@ public class TypeMappingUtil
     EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(packageUri);
     if (ePackage == null)
     {
-      throw new FactoryTypeParserException(
-          MessageFormat.format(Messages.getString("FactoryTypeParserException.2"), packageUri, factoryType));
+      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.2"), packageUri, factoryType));
     }
 
     EClassifier eClassifier = ePackage.getEClassifier(classifierName);
     if (eClassifier == null)
     {
-      throw new FactoryTypeParserException(
-          MessageFormat.format(Messages.getString("FactoryTypeParserException.3"), classifierName, factoryType));
+      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.3"), classifierName, factoryType));
     }
 
     DBType dbType = DBType.getTypeByKeyword(typeKeyword);
     if (dbType == null)
     {
-      throw new FactoryTypeParserException(
-          MessageFormat.format(Messages.getString("FactoryTypeParserException.4"), dbType, factoryType));
+      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.4"), dbType, factoryType));
     }
 
     return new TypeMappingDescriptor(id, factoryType, eClassifier, dbType);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractBasicListTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractBasicListTableMapping.java
index a5672188b8..d872901630 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractBasicListTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractBasicListTableMapping.java
@@ -31,8 +31,7 @@ public abstract class AbstractBasicListTableMapping implements IListMapping3, IM
 
   private EStructuralFeature feature;
 
-  public AbstractBasicListTableMapping(IMappingStrategy mappingStrategy, EClass containingClass,
-      EStructuralFeature feature)
+  public AbstractBasicListTableMapping(IMappingStrategy mappingStrategy, EClass containingClass, EStructuralFeature feature)
   {
     this.mappingStrategy = mappingStrategy;
     this.containingClass = containingClass;
@@ -61,8 +60,7 @@ public abstract class AbstractBasicListTableMapping implements IListMapping3, IM
     builder.append(index);
   }
 
-  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex,
-      int toIndex)
+  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex, int toIndex)
   {
     builder.append(LIST_IDX);
     builder.append(" BETWEEN "); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
index d1e66300c2..ff69901e7a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
@@ -313,8 +313,8 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
 
     if (TRACER.isEnabled())
     {
-      TRACER.format("Reading list values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(),
-          getFeature().getName(), revision.getID(), revision.getVersion());
+      TRACER.format("Reading list values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(), getFeature().getName(), revision.getID(),
+          revision.getVersion());
     }
 
     String sql = sqlSelectChunksPrefix + sqlOrderByIndex;
@@ -360,8 +360,8 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
 
     if (TRACER.isEnabled())
     {
-      TRACER.format("Reading list values done for feature {0}.{1} of {2}v{3}", getContainingClass().getName(),
-          getFeature().getName(), revision.getID(), revision.getVersion());
+      TRACER.format("Reading list values done for feature {0}.{1} of {2}v{3}", getContainingClass().getName(), getFeature().getName(), revision.getID(),
+          revision.getVersion());
     }
   }
 
@@ -381,8 +381,8 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format("Reading list chunk values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(),
-          getFeature().getName(), chunkReader.getRevision().getID(), chunkReader.getRevision().getVersion());
+      TRACER.format("Reading list chunk values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(), getFeature().getName(),
+          chunkReader.getRevision().getID(), chunkReader.getRevision().getVersion());
     }
 
     StringBuilder builder = new StringBuilder(sqlSelectChunksPrefix);
@@ -422,8 +422,7 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
 
           if (TRACER.isEnabled())
           {
-            TRACER.format("Current chunk no. {0} is [start = {1}, size = {2}]", chunkIndex - 1, chunk.getStartIndex(),
-                chunkSize);
+            TRACER.format("Current chunk no. {0} is [start = {1}, size = {2}]", chunkIndex - 1, chunk.getStartIndex(), chunkSize);
           }
         }
 
@@ -447,8 +446,7 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
 
       if (TRACER.isEnabled())
       {
-        TRACER.format("Reading list chunk values done for feature {0}.{1} of {2}", getContainingClass().getName(),
-            getFeature(), chunkReader.getRevision());
+        TRACER.format("Reading list chunk values done for feature {0}.{1} of {2}", getContainingClass().getName(), getFeature(), chunkReader.getRevision());
       }
     }
     catch (SQLException ex)
@@ -580,8 +578,7 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
     return metaDataManager.getMetaID(feature, timeStamp);
   }
 
-  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
     /*
      * must never be called (a feature map is not associated with an EReference feature, so XRefs are nor supported
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
index 3c73413a1e..8cce38f001 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
@@ -289,8 +289,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
    * @return <code>true</code> if the revision has been read successfully.<br>
    *         <code>false</code> if the revision does not exist in the DB.
    */
-  protected final boolean readValuesFromStatement(PreparedStatement stmt, InternalCDORevision revision,
-      IDBStoreAccessor accessor)
+  protected final boolean readValuesFromStatement(PreparedStatement stmt, InternalCDORevision revision, IDBStoreAccessor accessor)
   {
     ResultSet resultSet = null;
 
@@ -333,8 +332,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
    * @return <code>true</code> if the revision has been read successfully.<br>
    *         <code>false</code> if the revision does not exist in the DB.
    */
-  protected final boolean readValuesFromResultSet(ResultSet resultSet, IIDHandler idHandler,
-      InternalCDORevision revision, boolean forUnit)
+  protected final boolean readValuesFromResultSet(ResultSet resultSet, IIDHandler idHandler, InternalCDORevision revision, boolean forUnit)
   {
     try
     {
@@ -514,14 +512,12 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
     }
   }
 
-  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise,
-      OMMonitor monitor)
+  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise, OMMonitor monitor)
   {
     // If the repository's root resource ID is not yet set, then this must be the initial initRootResource()
     // commit. The duplicate check is certainly not needed in this case, and it appears that Mysql has problems
     // with it (Table definition has changed, please retry transaction), see bug 482886.
-    boolean duplicateResourcesCheckNeeded = revision.isResourceNode()
-        && mappingStrategy.getStore().getRepository().getRootResourceID() != null;
+    boolean duplicateResourcesCheckNeeded = revision.isResourceNode() && mappingStrategy.getStore().getRepository().getRootResourceID() != null;
 
     monitor.begin(duplicateResourcesCheckNeeded ? 10 : 9);
     Async async = null;
@@ -612,8 +608,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
     }
   }
 
-  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     // branch parameter is ignored, because either it is null or main branch.
     // this does not make any difference for non-branching store.
@@ -683,8 +678,8 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
 
         if (version >= CDOBranchVersion.FIRST_VERSION)
         {
-          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id,
-              branchManager.getMainBranch().getVersion(version), CDORevision.UNCHUNKED, true);
+          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id, branchManager.getMainBranch().getVersion(version),
+              CDORevision.UNCHUNKED, true);
 
           if (!handler.handleRevision(revision))
           {
@@ -773,8 +768,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
     }
   }
 
-  public void detachObject(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp,
-      OMMonitor monitor)
+  public void detachObject(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor monitor)
   {
     Async async = null;
     monitor.begin(1 + listMappings.size());
@@ -852,8 +846,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
     }
   }
 
-  protected abstract void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version,
-      OMMonitor fork);
+  protected abstract void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version, OMMonitor fork);
 
   public final boolean queryXRefs(IDBStoreAccessor accessor, QueryXRefsContext context, String idString)
   {
@@ -892,8 +885,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
     return true;
   }
 
-  protected final boolean queryScalarXRefs(IDBStoreAccessor accessor, List<EReference> scalarRefs,
-      QueryXRefsContext context, String idString)
+  protected final boolean queryScalarXRefs(IDBStoreAccessor accessor, List<EReference> scalarRefs, QueryXRefsContext context, String idString)
   {
     String tableName = table.getName();
     String where = getListXRefsWhere(context);
@@ -969,8 +961,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
 
   protected abstract String getListXRefsWhere(QueryXRefsContext context);
 
-  protected abstract void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch,
-      long timeStamp, OMMonitor fork);
+  protected abstract void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor fork);
 
   protected abstract void reviseOldRevision(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, long timeStamp);
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java
index 8e3d98a136..1e914d1ff7 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java
@@ -171,8 +171,8 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
     }
   }
 
-  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int fromBranchID, int toBranchID,
-      long fromCommitTime, long toCommitTime) throws IOException
+  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
+      throws IOException
   {
     StringBuilder builder = new StringBuilder();
     builder.append(" WHERE a_t."); //$NON-NLS-1$
@@ -205,8 +205,7 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
     objectTypeMapper.rawExport(connection, out, fromCommitTime, toCommitTime);
   }
 
-  protected void rawExportList(CDODataOutput out, IDBConnection connection, IListMapping listMapping,
-      IDBTable attrTable, String attrSuffix) throws IOException
+  protected void rawExportList(CDODataOutput out, IDBConnection connection, IListMapping listMapping, IDBTable attrTable, String attrSuffix) throws IOException
   {
     for (IDBTable table : listMapping.getDBTables())
     {
@@ -226,8 +225,7 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
     return getListJoin(attrTable, listTable);
   }
 
-  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     int size = in.readInt();
     if (size == 0)
@@ -310,8 +308,7 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
     }
   }
 
-  protected void rawImportUnreviseNewRevisions(IDBConnection connection, IDBTable table, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor)
+  protected void rawImportUnreviseNewRevisions(IDBConnection connection, IDBTable table, long fromCommitTime, long toCommitTime, OMMonitor monitor)
   {
     throw new UnsupportedOperationException("Must be overridden");
   }
@@ -321,8 +318,7 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
     throw new UnsupportedOperationException("Must be overridden");
   }
 
-  protected void rawImportList(CDODataInput in, IDBConnection connection, IListMapping listMapping, OMMonitor monitor)
-      throws IOException
+  protected void rawImportList(CDODataInput in, IDBConnection connection, IListMapping listMapping, OMMonitor monitor) throws IOException
   {
     Collection<IDBTable> tables = listMapping.getDBTables();
     int size = tables.size();
@@ -487,8 +483,8 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS
 
     final String prefix = "SELECT MIN(t." + ATTRIBUTES_ID + ") FROM " + CDODBSchema.CDO_OBJECTS + " o, ";
 
-    final String suffix = " t WHERE t." + ATTRIBUTES_BRANCH + "<0 AND t." + ATTRIBUTES_ID + "=o." + ATTRIBUTES_ID
-        + " AND t." + ATTRIBUTES_CREATED + "=o." + ATTRIBUTES_CREATED;
+    final String suffix = " t WHERE t." + ATTRIBUTES_BRANCH + "<0 AND t." + ATTRIBUTES_ID + "=o." + ATTRIBUTES_ID + " AND t." + ATTRIBUTES_CREATED + "=o."
+        + ATTRIBUTES_CREATED;
 
     getStore().visitAllTables(connection, new IDBStore.TableVisitor()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java
index f3aba7f88f..9bb39a2e4f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java
@@ -405,8 +405,8 @@ public abstract class AbstractListTableMapping extends AbstractBasicListTableMap
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format("Writing value for feature {0}.{1} index {2} of {3}v{4} : {5}", getContainingClass().getName(),
-          getFeature().getName(), idx, revision.getID(), revision.getVersion(), value);
+      TRACER.format("Writing value for feature {0}.{1} index {2} of {3}v{4} : {5}", getContainingClass().getName(), getFeature().getName(), idx,
+          revision.getID(), revision.getVersion(), value);
     }
 
     IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlInsertEntry, ReuseProbability.HIGH);
@@ -429,8 +429,7 @@ public abstract class AbstractListTableMapping extends AbstractBasicListTableMap
     }
   }
 
-  public boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
     String tableName = table.getName();
     String listJoin = getMappingStrategy().getListJoin("a_t", "l_t");
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
index b7efd3104c..83578ca65e 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
@@ -85,8 +85,7 @@ import java.util.Map;
  * @author Lothar Werzinger
  * @since 3.0
  */
-public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping
-    implements IListMappingDeltaSupport
+public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping implements IListMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, AuditFeatureMapTableMappingWithRanges.class);
 
@@ -136,8 +135,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
 
   private String sqlDeleteList;
 
-  public AuditFeatureMapTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass,
-      EStructuralFeature feature)
+  public AuditFeatureMapTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass, EStructuralFeature feature)
   {
     super(mappingStrategy, eClass, feature);
     initDBTypes();
@@ -646,8 +644,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
   public void clearList(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmtDeleteTemp = accessor.getDBConnection().prepareStatement(sqlDeleteList,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmtDeleteTemp = accessor.getDBConnection().prepareStatement(sqlDeleteList, ReuseProbability.HIGH);
     IDBPreparedStatement stmtClear = accessor.getDBConnection().prepareStatement(sqlClearList, ReuseProbability.HIGH);
 
     try
@@ -693,8 +690,8 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
     CDOBranch main = getMappingStrategy().getStore().getRepository().getBranchManager().getMainBranch();
 
     // get revision from cache to find out version number
-    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id,
-        main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id, main.getHead(),
+        /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     // set cdo_revision_removed for all list items (so we have no NULL values)
     clearList(accessor, id, revision.getVersion(), FINAL_VERSION);
@@ -706,12 +703,12 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
     throw new UnsupportedOperationException("Raw deletion does not work in range-based mappings");
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion,
-      final int newVersion, long created, CDOListFeatureDelta delta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion, final int newVersion, long created,
+      CDOListFeatureDelta delta)
   {
     IRepository repo = accessor.getStore().getRepository();
-    InternalCDORevision originalRevision = (InternalCDORevision)repo.getRevisionManager().getRevision(id,
-        repo.getBranchManager().getMainBranch().getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    InternalCDORevision originalRevision = (InternalCDORevision)repo.getRevisionManager().getRevision(id, repo.getBranchManager().getMainBranch().getHead(),
+        /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     int oldListSize = originalRevision.getList(getFeature()).size();
 
@@ -751,8 +748,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
 
     private long timestamp;
 
-    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int oldVersion,
-        int newVersion, long timestamp)
+    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int oldVersion, int newVersion, long timestamp)
     {
       this.accessor = accessor;
       this.originalRevision = originalRevision;
@@ -886,8 +882,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
       throw new ImplementationError("Should not be called"); //$NON-NLS-1$
     }
 
-    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex,
-        int endIndex)
+    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -954,8 +949,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
       }
     }
 
-    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex,
-        int endIndex)
+    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1190,8 +1184,7 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
     }
   }
 
-  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
     // must never be called (a feature map is not associated with an EReference feature, so XRefs are nor supported
     // here)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
index d01923dbe2..a3d6b6720b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
@@ -78,8 +78,7 @@ import java.util.List;
  * @author Stefan Winkler
  * @author Lothar Werzinger
  */
-public class AuditListTableMappingWithRanges extends AbstractBasicListTableMapping
-    implements IListMappingDeltaSupport, IListMappingUnitSupport
+public class AuditListTableMappingWithRanges extends AbstractBasicListTableMapping implements IListMappingDeltaSupport, IListMappingUnitSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, AuditListTableMappingWithRanges.class);
 
@@ -90,8 +89,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
 
   private static final String SQL_ORDER_BY_INDEX = " ORDER BY " + LIST_IDX;
 
-  private static final boolean CHECK_UNIT_ENTRIES = Boolean
-      .getBoolean("org.eclipse.emf.cdo.server.db.checkUnitEntries");
+  private static final boolean CHECK_UNIT_ENTRIES = Boolean.getBoolean("org.eclipse.emf.cdo.server.db.checkUnitEntries");
 
   /**
    * The table of this mapping.
@@ -149,8 +147,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       table.addField(LIST_IDX, DBType.INTEGER, true);
 
       // TODO think about indexes
-      table.addIndex(Type.NON_UNIQUE, LIST_REVISION_ID, LIST_REVISION_VERSION_ADDED, LIST_REVISION_VERSION_REMOVED,
-          LIST_IDX);
+      table.addIndex(Type.NON_UNIQUE, LIST_REVISION_ID, LIST_REVISION_VERSION_ADDED, LIST_REVISION_VERSION_REMOVED, LIST_IDX);
 
       typeMapping.createDBField(table, LIST_VALUE);
     }
@@ -295,8 +292,8 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
           " AND " + ATTRIBUTES_CREATED + "<=?" + //
           " AND (" + ATTRIBUTES_REVISED + "=0 OR " + ATTRIBUTES_REVISED + ">=?)" + //
           " AND cdo_list." + LIST_REVISION_VERSION_ADDED + "<=" + ATTRIBUTES_VERSION + //
-          " AND (cdo_list." + LIST_REVISION_VERSION_REMOVED + " IS NULL OR cdo_list." + LIST_REVISION_VERSION_REMOVED
-          + ">" + ATTRIBUTES_VERSION + ") ORDER BY cdo_list." + LIST_REVISION_ID + ", cdo_list." + LIST_IDX;
+          " AND (cdo_list." + LIST_REVISION_VERSION_REMOVED + " IS NULL OR cdo_list." + LIST_REVISION_VERSION_REMOVED + ">" + ATTRIBUTES_VERSION
+          + ") ORDER BY cdo_list." + LIST_REVISION_ID + ", cdo_list." + LIST_IDX;
     }
   }
 
@@ -364,8 +361,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       if (TRACER.isEnabled())
       {
         TRACER.format("Reading {4} list values done for feature {0}.{1} of {2}v{3}", //$NON-NLS-1$
-            getContainingClass().getName(), getFeature().getName(), revision.getID(), revision.getVersion(),
-            list.size());
+            getContainingClass().getName(), getFeature().getName(), revision.getID(), revision.getVersion(), list.size());
       }
     }
     catch (SQLException ex)
@@ -451,8 +447,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       if (TRACER.isEnabled())
       {
         TRACER.format("Reading list chunk values done for feature() {0}.{1} of {2}v{3}", //$NON-NLS-1$
-            getContainingClass().getName(), getFeature().getName(), chunkReader.getRevision().getID(),
-            chunkReader.getRevision().getVersion());
+            getContainingClass().getName(), getFeature().getName(), chunkReader.getRevision().getID(), chunkReader.getRevision().getVersion());
       }
     }
     catch (SQLException ex)
@@ -487,8 +482,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     if (TRACER.isEnabled())
     {
       TRACER.format("Writing value for feature {0}.{1} index {2} of {3}v{4} : {5}", //$NON-NLS-1$
-          getContainingClass().getName(), getFeature().getName(), index, revision.getID(), revision.getVersion(),
-          value);
+          getContainingClass().getName(), getFeature().getName(), index, revision.getID(), revision.getVersion(), value);
     }
 
     addEntry(accessor, revision.getID(), revision.getVersion(), index, value);
@@ -505,8 +499,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
   public void clearList(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmtDeleteTemp = accessor.getDBConnection().prepareStatement(sqlDeleteList,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmtDeleteTemp = accessor.getDBConnection().prepareStatement(sqlDeleteList, ReuseProbability.HIGH);
     IDBPreparedStatement stmtClear = accessor.getDBConnection().prepareStatement(sqlClearList, ReuseProbability.HIGH);
 
     try
@@ -552,8 +545,8 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     CDOBranch main = getMappingStrategy().getStore().getRepository().getBranchManager().getMainBranch();
 
     // get revision from cache to find out version number
-    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id,
-        main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id, main.getHead(),
+        /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     // set cdo_revision_removed for all list items (so we have no NULL values)
     clearList(accessor, id, revision.getVersion(), FINAL_VERSION);
@@ -565,19 +558,16 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     throw new UnsupportedOperationException("Raw deletion does not work in range-based mappings");
   }
 
-  public ResultSet queryUnitEntries(IDBStoreAccessor accessor, IIDHandler idHandler, long timeStamp, CDOID rootID)
-      throws SQLException
+  public ResultSet queryUnitEntries(IDBStoreAccessor accessor, IIDHandler idHandler, long timeStamp, CDOID rootID) throws SQLException
   {
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectUnitEntries,
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectUnitEntries, ReuseProbability.MEDIUM);
     idHandler.setCDOID(stmt, 1, rootID);
     stmt.setLong(2, timeStamp);
     stmt.setLong(3, timeStamp);
     return stmt.executeQuery();
   }
 
-  public void readUnitEntries(ResultSet resultSet, IIDHandler idHandler, CDOID id, MoveableList<Object> list)
-      throws SQLException
+  public void readUnitEntries(ResultSet resultSet, IIDHandler idHandler, CDOID id, MoveableList<Object> list) throws SQLException
   {
     int size = list.size();
     for (int i = 0; i < size; i++)
@@ -745,8 +735,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     return result;
   }
 
-  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
 
     String tableName = getTable().getName();
@@ -821,12 +810,12 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     }
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion,
-      final int newVersion, long created, CDOListFeatureDelta delta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion, final int newVersion, long created,
+      CDOListFeatureDelta delta)
   {
     IRepository repo = accessor.getStore().getRepository();
-    InternalCDORevision originalRevision = (InternalCDORevision)repo.getRevisionManager().getRevision(id,
-        repo.getBranchManager().getMainBranch().getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    InternalCDORevision originalRevision = (InternalCDORevision)repo.getRevisionManager().getRevision(id, repo.getBranchManager().getMainBranch().getHead(),
+        /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     int oldListSize = originalRevision.getList(getFeature()).size();
 
@@ -869,8 +858,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
 
     private int lastRemovedIndex;
 
-    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int oldVersion,
-        int newVersion)
+    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int oldVersion, int newVersion)
     {
       this.accessor = accessor;
       id = originalRevision.getID();
@@ -1039,8 +1027,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       }
     }
 
-    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex,
-        int endIndex)
+    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1107,8 +1094,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       }
     }
 
-    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex,
-        int endIndex)
+    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
index 93cda8157d..fe217ca460 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
@@ -83,11 +83,9 @@ import java.util.Map;
  * @author Lothar Werzinger
  * @since 3.0
  */
-public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping
-    implements IListMappingDeltaSupport
+public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping implements IListMappingDeltaSupport
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG,
-      BranchingFeatureMapTableMappingWithRanges.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, BranchingFeatureMapTableMappingWithRanges.class);
 
   /**
    * Used to clean up lists for detached objects.
@@ -133,8 +131,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
 
   private String sqlClearList;
 
-  public BranchingFeatureMapTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass,
-      EStructuralFeature feature)
+  public BranchingFeatureMapTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass, EStructuralFeature feature)
   {
     super(mappingStrategy, eClass, feature);
     initDBTypes();
@@ -572,8 +569,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
               // read missing indexes from missingValueStartIndex to currentIndex
               if (baseReader == null)
               {
-                baseReader = createBaseChunkReader(chunkReader.getAccessor(), chunkReader.getRevision().getID(),
-                    chunkReader.getRevision().getBranch().getID());
+                baseReader = createBaseChunkReader(chunkReader.getAccessor(), chunkReader.getRevision().getID(), chunkReader.getRevision().getBranch().getID());
               }
 
               if (TRACER.isEnabled())
@@ -626,8 +622,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
           // read missing indexes from missingValueStartIndex to last chunk index
           if (baseReader == null)
           {
-            baseReader = createBaseChunkReader(chunkReader.getAccessor(), chunkReader.getRevision().getID(),
-                chunkReader.getRevision().getBranch().getID());
+            baseReader = createBaseChunkReader(chunkReader.getAccessor(), chunkReader.getRevision().getID(), chunkReader.getRevision().getBranch().getID());
           }
           baseReader.addRangedChunk(missingValueStartIndex, chunk.getStartIndex() + chunk.size());
         }
@@ -705,8 +700,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
           getFeature(), idx, revision, value);
     }
 
-    addEntry(accessor, revision.getID(), revision.getBranch().getID(), revision.getVersion(), idx, value,
-        revision.getTimeStamp());
+    addEntry(accessor, revision.getID(), revision.getBranch().getID(), revision.getVersion(), idx, value, revision.getTimeStamp());
   }
 
   /**
@@ -786,8 +780,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
    * @param id
    *          the id of the revision from which to remove all items
    */
-  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-      int lastIndex, long timestamp)
+  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int lastIndex, long timestamp)
   {
     // check for each index if the value exists in the current branch
     for (int i = 0; i <= lastIndex; i++)
@@ -795,8 +788,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
       if (getValue(accessor, id, branchId, i, false) == null)
       {
         // if not, add a historic entry for missing ones.
-        addHistoricEntry(accessor, id, branchId, 0, newVersion, i, getValueFromBase(accessor, id, branchId, i),
-            timestamp);
+        addHistoricEntry(accessor, id, branchId, 0, newVersion, i, getValueFromBase(accessor, id, branchId, i), timestamp);
       }
     }
 
@@ -836,8 +828,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
       TRACER.format("objectDetached {1}", revision); //$NON-NLS-1$
     }
 
-    clearList(accessor, id, branchId, revision.getVersion(), FINAL_VERSION, revision.getList(getFeature()).size() - 1,
-        revised);
+    clearList(accessor, id, branchId, revision.getVersion(), FINAL_VERSION, revision.getList(getFeature()).size() - 1, revised);
   }
 
   @Override
@@ -846,8 +837,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     throw new UnsupportedOperationException("Raw deletion does not work in range-based mappings");
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion,
-      final int newVersion, long created, CDOListFeatureDelta delta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion, final int newVersion, long created,
+      CDOListFeatureDelta delta)
   {
     List<CDOFeatureDelta> listChanges = delta.getListChanges();
     if (listChanges.size() == 0)
@@ -866,8 +857,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
 
     // let the visitor collect the changes
-    ListDeltaVisitor visitor = new ListDeltaVisitor(accessor, originalRevision, branchId, oldVersion, newVersion,
-        created);
+    ListDeltaVisitor visitor = new ListDeltaVisitor(accessor, originalRevision, branchId, oldVersion, newVersion, created);
 
     if (TRACER.isEnabled())
     {
@@ -911,8 +901,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
 
     private long timestamp;
 
-    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int targetBranchID,
-        int oldVersion, int newVersion, long timestamp)
+    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int targetBranchID, int oldVersion, int newVersion, long timestamp)
     {
       this.accessor = accessor;
       this.originalRevision = originalRevision;
@@ -1047,8 +1036,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
       throw new ImplementationError("Should not be called"); //$NON-NLS-1$
     }
 
-    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-        int startIndex, int endIndex)
+    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1130,8 +1118,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
       }
     }
 
-    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-        int startIndex, int endIndex)
+    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1208,8 +1195,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
   }
 
-  private void addEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int version, int index, Object value,
-      long timestamp)
+  private void addEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int version, int index, Object value, long timestamp)
   {
     if (TRACER.isEnabled())
     {
@@ -1263,14 +1249,13 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
   }
 
-  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved,
-      int index, Object value, long timestamp)
+  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved, int index, Object value,
+      long timestamp)
   {
     if (TRACER.isEnabled())
     {
       TRACER.format("Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
-          getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved,
-          value);
+          getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved, value);
     }
 
     FeatureMap.Entry entry = (FeatureMap.Entry)value;
@@ -1320,8 +1305,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
   }
 
-  private void removeEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int index,
-      long timestamp)
+  private void removeEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int index, long timestamp)
   {
     if (TRACER.isEnabled())
     {
@@ -1493,8 +1477,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     return accessor.createChunkReader(baseRevision, getFeature());
   }
 
-  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
     // must never be called (a feature map is not associated with an EReference feature, so XRefs are nor supported
     // here)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
index e4e3946197..6712872391 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
@@ -81,8 +81,7 @@ import java.util.List;
  * @author Stefan Winkler
  * @author Lothar Werzinger
  */
-public class BranchingListTableMappingWithRanges extends AbstractBasicListTableMapping
-    implements IListMappingDeltaSupport
+public class BranchingListTableMappingWithRanges extends AbstractBasicListTableMapping implements IListMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, BranchingListTableMappingWithRanges.class);
 
@@ -118,8 +117,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
 
   private String sqlClearList;
 
-  public BranchingListTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass,
-      EStructuralFeature feature)
+  public BranchingListTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass, EStructuralFeature feature)
   {
     super(mappingStrategy, eClass, feature);
     initTable();
@@ -147,8 +145,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
       table.addField(LIST_IDX, DBType.INTEGER, true);
 
       // TODO think about indexes
-      table.addIndex(Type.NON_UNIQUE, LIST_REVISION_ID, LIST_REVISION_BRANCH, LIST_REVISION_VERSION_ADDED,
-          LIST_REVISION_VERSION_REMOVED, LIST_IDX);
+      table.addIndex(Type.NON_UNIQUE, LIST_REVISION_ID, LIST_REVISION_BRANCH, LIST_REVISION_VERSION_ADDED, LIST_REVISION_VERSION_REMOVED, LIST_IDX);
 
       typeMapping.createDBField(table, LIST_VALUE);
     }
@@ -595,8 +592,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
         {
           if (TRACER.isEnabled())
           {
-            TRACER.format("Copying base chunk reader value {0} at index {1} to current chunk reader at index {2}.",
-                baseChunk.get(i), baseChunk.getStartIndex() + i, thisChunk.getStartIndex() + i + offset);
+            TRACER.format("Copying base chunk reader value {0} at index {1} to current chunk reader at index {2}.", baseChunk.get(i),
+                baseChunk.getStartIndex() + i, thisChunk.getStartIndex() + i + offset);
           }
 
           thisChunk.add(i + offset, baseChunk.get(i));
@@ -647,8 +644,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
    *          the id of the revision from which to remove all items
    * @param lastIndex
    */
-  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-      int lastIndex)
+  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int lastIndex)
   {
     // check for each index if the value exists in the current branch
     for (int i = 0; i <= lastIndex; i++)
@@ -713,8 +709,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
     throw new UnsupportedOperationException("Raw deletion does not work in range-based mappings");
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, final int oldVersion,
-      final int newVersion, long created, CDOListFeatureDelta delta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, final int oldVersion, final int newVersion, long created,
+      CDOListFeatureDelta delta)
   {
     List<CDOFeatureDelta> listChanges = delta.getListChanges();
     if (listChanges.size() == 0)
@@ -781,8 +777,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
 
     private int lastRemovedIndex;
 
-    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int targetBranchID,
-        int oldVersion, int newVersion)
+    public ListDeltaVisitor(IDBStoreAccessor accessor, InternalCDORevision originalRevision, int targetBranchID, int oldVersion, int newVersion)
     {
       this.accessor = accessor;
       id = originalRevision.getID();
@@ -952,8 +947,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
       }
     }
 
-    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-        int startIndex, int endIndex)
+    private void moveOneUp(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1036,8 +1030,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
       }
     }
 
-    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-        int startIndex, int endIndex)
+    private void moveOneDown(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int startIndex, int endIndex)
     {
       IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
       IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlUpdateIndex, ReuseProbability.HIGH);
@@ -1158,14 +1151,12 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
     }
   }
 
-  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved,
-      int index, Object value)
+  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved, int index, Object value)
   {
     if (TRACER.isEnabled())
     {
       TRACER.format("Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
-          getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved,
-          value);
+          getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved, value);
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
@@ -1384,8 +1375,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
     return accessor.createChunkReader(baseRevision, getFeature());
   }
 
-  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere,
-      QueryXRefsContext context, String idString)
+  public final boolean queryXRefs(IDBStoreAccessor accessor, String mainTableName, String mainTableWhere, QueryXRefsContext context, String idString)
   {
 
     String tableName = getTable().getName();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java
index d17ebbe6fd..4af378d9a9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/DelegatingObjectTypeMapper.java
@@ -88,8 +88,7 @@ public abstract class DelegatingObjectTypeMapper extends AbstractObjectTypeMappe
     return delegate.getMaxID(connection, idHandler);
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     delegate.rawExport(connection, out, fromCommitTime, toCommitTime);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
index aedfcefdaf..f6f73b7caa 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
@@ -86,8 +86,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalAuditClassMapping.class);
 
-  private static final ContextTracer TRACER_UNITS = new ContextTracer(OM.DEBUG_UNITS,
-      HorizontalAuditClassMapping.class);
+  private static final ContextTracer TRACER_UNITS = new ContextTracer(OM.DEBUG_UNITS, HorizontalAuditClassMapping.class);
 
   private String sqlInsertAttributes;
 
@@ -333,8 +332,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
   public boolean readRevisionByVersion(IDBStoreAccessor accessor, InternalCDORevision revision, int listChunk)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectAttributesByVersion,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectAttributesByVersion, ReuseProbability.HIGH);
 
     try
     {
@@ -362,8 +360,8 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
     }
   }
 
-  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name,
-      boolean exactMatch, CDOBranchPoint branchPoint)
+  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name, boolean exactMatch,
+      CDOBranchPoint branchPoint)
   {
     EStructuralFeature nameFeature = EresourcePackage.eINSTANCE.getCDOResourceNode_Name();
     long timeStamp = branchPoint.getTimeStamp();
@@ -412,8 +410,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
 
     try
     {
@@ -522,8 +519,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
   }
 
   @Override
-  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp,
-      OMMonitor mon)
+  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor mon)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
     IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlInsertAttributes, ReuseProbability.HIGH);
@@ -579,8 +575,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
   @Override
   protected void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version, OMMonitor fork)
   {
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlRawDeleteAttributes,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlRawDeleteAttributes, ReuseProbability.HIGH);
 
     try
     {
@@ -621,8 +616,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
     }
   }
 
-  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
-      OMMonitor monitor)
+  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor)
   {
     Async async = null;
     monitor.begin();
@@ -681,8 +675,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
     return builder.toString();
   }
 
-  public void readUnitRevisions(IDBStoreAccessor accessor, CDOBranchPoint branchPoint, CDOID rootID,
-      CDORevisionHandler revisionHandler) throws SQLException
+  public void readUnitRevisions(IDBStoreAccessor accessor, CDOBranchPoint branchPoint, CDOID rootID, CDORevisionHandler revisionHandler) throws SQLException
   {
     DBStore store = (DBStore)getMappingStrategy().getStore();
     InternalRepository repository = store.getRepository();
@@ -732,8 +725,8 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
 
       if (start1 != CDOBranchPoint.UNSPECIFIED_DATE)
       {
-        TRACER_UNITS.format("Read {0} revisions of unit {1}: {2} millis + {3} millis", eClass.getName(), rootID,
-            start2 - start1, System.currentTimeMillis() - start2);
+        TRACER_UNITS.format("Read {0} revisions of unit {1}: {2} millis + {3} millis", eClass.getName(), rootID, start2 - start1,
+            System.currentTimeMillis() - start2);
       }
     }
     finally
@@ -771,8 +764,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
 
     private Throwable exception;
 
-    public AsnychronousListFiller(IDBStoreAccessor accessor, long timeStamp, CDOID rootID,
-        CDORevisionHandler revisionHandler)
+    public AsnychronousListFiller(IDBStoreAccessor accessor, long timeStamp, CDOID rootID, CDORevisionHandler revisionHandler)
     {
       this.accessor = accessor;
       this.timeStamp = timeStamp;
@@ -938,8 +930,8 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
         TRACER.format("FeatureDeltaWriter: old version: {0}, new version: {1}", oldVersion, oldVersion + 1); //$NON-NLS-1$
       }
 
-      InternalCDORevision originalRevision = (InternalCDORevision)accessor.getStore().getRepository()
-          .getRevisionManager().getRevisionByVersion(id, delta, 0, true);
+      InternalCDORevision originalRevision = (InternalCDORevision)accessor.getStore().getRepository().getRevisionManager().getRevisionByVersion(id, delta, 0,
+          true);
 
       newRevision = originalRevision.copy();
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
index 56955a5406..61ef33195d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
@@ -76,8 +76,7 @@ import java.util.Set;
  * @author Stefan Winkler
  * @since 3.0
  */
-public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping
-    implements IClassMappingAuditSupport, IClassMappingDeltaSupport
+public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping implements IClassMappingAuditSupport, IClassMappingDeltaSupport
 {
   /**
    * @author Stefan Winkler
@@ -394,8 +393,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
   public boolean readRevisionByVersion(IDBStoreAccessor accessor, InternalCDORevision revision, int listChunk)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectAttributesByVersion,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlSelectAttributesByVersion, ReuseProbability.HIGH);
     boolean success = false;
 
     try
@@ -425,8 +423,8 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     return success;
   }
 
-  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name,
-      boolean exactMatch, CDOBranchPoint branchPoint)
+  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name, boolean exactMatch,
+      CDOBranchPoint branchPoint)
   {
     EStructuralFeature nameFeature = EresourcePackage.eINSTANCE.getCDOResourceNode_Name();
 
@@ -479,8 +477,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
 
     try
     {
@@ -590,8 +587,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
   }
 
   @Override
-  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp,
-      OMMonitor mon)
+  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor mon)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
     IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlInsertAttributes, ReuseProbability.HIGH);
@@ -649,8 +645,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
   protected void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version, OMMonitor fork)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlRawDeleteAttributes,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlRawDeleteAttributes, ReuseProbability.HIGH);
 
     try
     {
@@ -693,8 +688,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
   }
 
   @Override
-  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise,
-      OMMonitor monitor)
+  public void writeRevision(IDBStoreAccessor accessor, InternalCDORevision revision, boolean mapType, boolean revise, OMMonitor monitor)
   {
     Async async = null;
     monitor.begin(10);
@@ -793,8 +787,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
   }
 
   @Override
-  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(IDBStoreAccessor accessor, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     StringBuilder builder = new StringBuilder(sqlSelectForHandle);
     boolean whereAppend = false;
@@ -874,8 +867,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
         {
           int branchID = resultSet.getInt(3);
           CDOBranchVersion branchVersion = branchManager.getBranch(branchID).getVersion(Math.abs(version));
-          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id, branchVersion,
-              CDORevision.UNCHUNKED, true);
+          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id, branchVersion, CDORevision.UNCHUNKED, true);
 
           if (!handler.handleRevision(revision))
           {
@@ -1003,8 +995,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     return builder.toString();
   }
 
-  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
-      OMMonitor monitor)
+  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor)
   {
     monitor.begin();
 
@@ -1042,8 +1033,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     }
   }
 
-  private void doCopyOnBranch(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
-      OMMonitor monitor)
+  private void doCopyOnBranch(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor)
   {
     monitor.begin(2);
     try
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
index 93f4e6e99c..6b8ec94ac9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategy.java
@@ -105,20 +105,18 @@ public class HorizontalBranchingMappingStrategy extends AbstractHorizontalMappin
   @Override
   protected void rawImportReviseOldRevisions(IDBConnection connection, IDBTable table, OMMonitor monitor)
   {
-    String sqlUpdate = "UPDATE " + table + " SET " + ATTRIBUTES_REVISED + "=? WHERE " + ATTRIBUTES_ID + "=? AND "
-        + ATTRIBUTES_BRANCH + "=? AND " + ATTRIBUTES_VERSION + "=?";
+    String sqlUpdate = "UPDATE " + table + " SET " + ATTRIBUTES_REVISED + "=? WHERE " + ATTRIBUTES_ID + "=? AND " + ATTRIBUTES_BRANCH + "=? AND "
+        + ATTRIBUTES_VERSION + "=?";
 
-    String sqlQuery = "SELECT cdo1." + ATTRIBUTES_ID + ", cdo1." + ATTRIBUTES_BRANCH + ", cdo1." + ATTRIBUTES_VERSION
-        + ", cdo2." + ATTRIBUTES_CREATED + " FROM " + table + " cdo1, " + table + " cdo2 WHERE cdo1." + ATTRIBUTES_ID
-        + "=cdo2." + ATTRIBUTES_ID + " AND cdo1." + ATTRIBUTES_BRANCH + "=cdo2." + ATTRIBUTES_BRANCH + " AND (cdo1."
-        + ATTRIBUTES_VERSION + "=cdo2." + ATTRIBUTES_VERSION + "-1 OR (cdo1." + ATTRIBUTES_VERSION + "+cdo2."
-        + ATTRIBUTES_VERSION + "=-1 AND cdo1." + ATTRIBUTES_VERSION + ">cdo2." + ATTRIBUTES_VERSION + ")) AND cdo1."
-        + ATTRIBUTES_REVISED + "=0";
+    String sqlQuery = "SELECT cdo1." + ATTRIBUTES_ID + ", cdo1." + ATTRIBUTES_BRANCH + ", cdo1." + ATTRIBUTES_VERSION + ", cdo2." + ATTRIBUTES_CREATED
+        + " FROM " + table + " cdo1, " + table + " cdo2 WHERE cdo1." + ATTRIBUTES_ID + "=cdo2." + ATTRIBUTES_ID + " AND cdo1." + ATTRIBUTES_BRANCH + "=cdo2."
+        + ATTRIBUTES_BRANCH + " AND (cdo1." + ATTRIBUTES_VERSION + "=cdo2." + ATTRIBUTES_VERSION + "-1 OR (cdo1." + ATTRIBUTES_VERSION + "+cdo2."
+        + ATTRIBUTES_VERSION + "=-1 AND cdo1." + ATTRIBUTES_VERSION + ">cdo2." + ATTRIBUTES_VERSION + ")) AND cdo1." + ATTRIBUTES_REVISED + "=0";
 
     IIDHandler idHandler = getStore().getIDHandler();
     IDBPreparedStatement stmtUpdate = connection.prepareStatement(sqlUpdate, ReuseProbability.MEDIUM);
-    IDBPreparedStatement stmtQuery = connection.prepareStatement(sqlQuery, ResultSet.TYPE_SCROLL_INSENSITIVE,
-        ResultSet.CONCUR_READ_ONLY, ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmtQuery = connection.prepareStatement(sqlQuery, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+        ReuseProbability.MEDIUM);
     ResultSet resultSet = null;
 
     try
@@ -171,12 +169,10 @@ public class HorizontalBranchingMappingStrategy extends AbstractHorizontalMappin
   }
 
   @Override
-  protected void rawImportUnreviseNewRevisions(IDBConnection connection, IDBTable table, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor)
+  protected void rawImportUnreviseNewRevisions(IDBConnection connection, IDBTable table, long fromCommitTime, long toCommitTime, OMMonitor monitor)
   {
-    String sql = "UPDATE " + table + " SET " + ATTRIBUTES_REVISED + "=0 WHERE " + ATTRIBUTES_BRANCH + ">=0 AND "
-        + ATTRIBUTES_CREATED + "<=" + toCommitTime + " AND " + ATTRIBUTES_REVISED + ">" + toCommitTime + " AND "
-        + ATTRIBUTES_VERSION + ">0";
+    String sql = "UPDATE " + table + " SET " + ATTRIBUTES_REVISED + "=0 WHERE " + ATTRIBUTES_BRANCH + ">=0 AND " + ATTRIBUTES_CREATED + "<=" + toCommitTime
+        + " AND " + ATTRIBUTES_REVISED + ">" + toCommitTime + " AND " + ATTRIBUTES_VERSION + ">0";
 
     IDBPreparedStatement stmt = connection.prepareStatement(sql, ReuseProbability.MEDIUM);
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategyWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategyWithRanges.java
index dcd53673b1..23270d73f6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategyWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingMappingStrategyWithRanges.java
@@ -84,8 +84,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
   }
 
   @Override
-  protected void rawExportList(CDODataOutput out, IDBConnection connection, IListMapping listMapping,
-      IDBTable attrTable, String attrSuffix) throws IOException
+  protected void rawExportList(CDODataOutput out, IDBConnection connection, IListMapping listMapping, IDBTable attrTable, String attrSuffix) throws IOException
   {
     super.rawExportList(out, connection, listMapping, attrTable, attrSuffix);
 
@@ -95,8 +94,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
     }
   }
 
-  private void rawExportListPostProcess(CDODataOutput out, IDBConnection connection, IDBTable attrTable,
-      String attrSuffix, IDBTable table) throws IOException
+  private void rawExportListPostProcess(CDODataOutput out, IDBConnection connection, IDBTable attrTable, String attrSuffix, IDBTable table) throws IOException
   {
     StringBuilder builder = new StringBuilder();
     builder.append("SELECT l_t.");
@@ -122,8 +120,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
     String sql = DBUtil.trace(builder.toString());
 
     IIDHandler idHandler = getStore().getIDHandler();
-    IDBPreparedStatement stmt = connection.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE,
-        ResultSet.CONCUR_READ_ONLY, ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = connection.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY, ReuseProbability.MEDIUM);
     ResultSet resultSet = null;
 
     try
@@ -165,8 +162,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
   }
 
   @Override
-  protected void rawImportList(CDODataInput in, IDBConnection connection, IListMapping listMapping, OMMonitor monitor)
-      throws IOException
+  protected void rawImportList(CDODataInput in, IDBConnection connection, IListMapping listMapping, OMMonitor monitor) throws IOException
   {
     Collection<IDBTable> tables = listMapping.getDBTables();
     int size = tables.size();
@@ -192,8 +188,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
     }
   }
 
-  private void rawImportListPostProcess(CDODataInput in, IDBConnection connection, IDBTable table, OMMonitor monitor)
-      throws IOException
+  private void rawImportListPostProcess(CDODataInput in, IDBConnection connection, IDBTable table, OMMonitor monitor) throws IOException
   {
     int size = in.readInt();
     if (size == 0)
@@ -278,8 +273,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
     return modifyListJoin2(attrTable, listTable, join, forRawExport, false);
   }
 
-  private String modifyListJoin2(String attrTable, String listTable, String join, boolean forRawExport,
-      boolean forPostProcess)
+  private String modifyListJoin2(String attrTable, String listTable, String join, boolean forRawExport, boolean forPostProcess)
   {
     join += " AND " + listTable + ".";
 
@@ -343,8 +337,7 @@ public class HorizontalBranchingMappingStrategyWithRanges extends HorizontalBran
 
     private IDBPreparedStatement stmt;
 
-    public void handleRow(ExtendedDataInput in, Connection connection, IDBField[] fields, Object[] values)
-        throws SQLException, IOException
+    public void handleRow(ExtendedDataInput in, Connection connection, IDBField[] fields, Object[] values) throws SQLException, IOException
     {
       int versionAdded = DBUtil.asInt(values[2]);
       if (versionAdded == CDOBranchVersion.FIRST_VERSION)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalMappingStrategy.java
index 3e601ae5e5..cebe25675f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalMappingStrategy.java
@@ -204,8 +204,7 @@ public class HorizontalMappingStrategy extends Lifecycle implements IMappingStra
     delegate.repairAfterCrash(dbAdapter, connection);
   }
 
-  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp,
-      boolean exactTime, CDORevisionHandler handler)
+  public void handleRevisions(IDBStoreAccessor accessor, EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     delegate.handleRevisions(accessor, eClass, branch, timeStamp, exactTime, handler);
   }
@@ -215,14 +214,13 @@ public class HorizontalMappingStrategy extends Lifecycle implements IMappingStra
     return delegate.readChangeSet(accessor, monitor, segments);
   }
 
-  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int lastReplicatedBranchID, int lastBranchID,
-      long lastReplicatedCommitTime, long lastCommitTime) throws IOException
+  public void rawExport(IDBStoreAccessor accessor, CDODataOutput out, int lastReplicatedBranchID, int lastBranchID, long lastReplicatedCommitTime,
+      long lastCommitTime) throws IOException
   {
     delegate.rawExport(accessor, out, lastReplicatedBranchID, lastBranchID, lastReplicatedCommitTime, lastCommitTime);
   }
 
-  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(IDBStoreAccessor accessor, CDODataInput in, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     delegate.rawImport(accessor, in, fromCommitTime, toCommitTime, monitor);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
index fce0989336..73ff927688 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
@@ -282,8 +282,8 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
     return accessor.getDBConnection().prepareStatement(sqlSelectAllObjectIDs, ReuseProbability.HIGH);
   }
 
-  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name,
-      boolean exactMatch, CDOBranchPoint branchPoint)
+  public IDBPreparedStatement createResourceQueryStatement(IDBStoreAccessor accessor, CDOID folderId, String name, boolean exactMatch,
+      CDOBranchPoint branchPoint)
   {
     long timeStamp = branchPoint.getTimeStamp();
     if (timeStamp != CDORevision.UNSPECIFIED_DATE)
@@ -320,8 +320,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
-        ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
 
     try
     {
@@ -361,8 +360,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
     DBStore store = (DBStore)getMappingStrategy().getStore();
     IIDHandler idHandler = store.getIDHandler();
     IDBPreparedStatement stmtVersion = null;
-    IDBPreparedStatement stmtAttributes = accessor.getDBConnection().prepareStatement(sqlSelectCurrentAttributes,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmtAttributes = accessor.getDBConnection().prepareStatement(sqlSelectCurrentAttributes, ReuseProbability.HIGH);
 
     try
     {
@@ -449,8 +447,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
   }
 
   @Override
-  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp,
-      OMMonitor monitor)
+  protected void detachAttributes(IDBStoreAccessor accessor, CDOID id, int version, CDOBranch branch, long timeStamp, OMMonitor monitor)
   {
     rawDelete(accessor, id, version, branch, monitor);
 
@@ -459,8 +456,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
   }
 
   @Override
-  protected void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version,
-      OMMonitor monitor)
+  protected void rawDeleteAttributes(IDBStoreAccessor accessor, CDOID id, CDOBranch branch, int version, OMMonitor monitor)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
     IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlDelete, ReuseProbability.HIGH);
@@ -480,8 +476,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
     }
   }
 
-  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
-      OMMonitor monitor)
+  public void writeRevisionDelta(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor)
   {
     Async async = null;
     monitor.begin();
@@ -719,8 +714,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
       return builder.toString();
     }
 
-    private int setUpdateAttributeValues(List<Pair<ITypeMapping, Object>> attributeChanges, IDBPreparedStatement stmt,
-        int col) throws SQLException
+    private int setUpdateAttributeValues(List<Pair<ITypeMapping, Object>> attributeChanges, IDBPreparedStatement stmt, int col) throws SQLException
     {
       for (Pair<ITypeMapping, Object> change : attributeChanges)
       {
@@ -751,8 +745,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
       return col;
     }
 
-    private int setUpdateListSizeChanges(List<Pair<EStructuralFeature, Integer>> attributeChanges,
-        IDBPreparedStatement stmt, int col) throws SQLException
+    private int setUpdateListSizeChanges(List<Pair<EStructuralFeature, Integer>> attributeChanges, IDBPreparedStatement stmt, int col) throws SQLException
     {
       for (Pair<EStructuralFeature, Integer> change : listSizeChanges)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
index 8c340622a1..546176c59b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
@@ -382,8 +382,8 @@ public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMappi
   private void move1down(IDBStoreAccessor accessor, CDOID id, int index, int upperIndex)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection()
-        .prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveDown : sqlMoveDownWithLimit, ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveDown : sqlMoveDownWithLimit,
+        ReuseProbability.HIGH);
 
     try
     {
@@ -413,8 +413,8 @@ public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMappi
   private void move1up(IDBStoreAccessor accessor, CDOID id, int index, int upperIndex)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection()
-        .prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveUp : sqlMoveUpWithLimit, ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveUp : sqlMoveUpWithLimit,
+        ReuseProbability.HIGH);
 
     try
     {
@@ -512,8 +512,8 @@ public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMappi
     }
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion,
-      final int newVersion, final long created, CDOListFeatureDelta listDelta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, final int branchId, int oldVersion, final int newVersion, final long created,
+      CDOListFeatureDelta listDelta)
   {
     CDOFeatureDeltaVisitor visitor = new CDOFeatureDeltaVisitor()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java
index e1e0f76ce9..6ea798e995 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java
@@ -188,8 +188,7 @@ public class NonAuditListTableMapping extends AbstractListTableMapping implement
   }
 
   @Override
-  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex,
-      int toIndex)
+  public void addRangedChunkWhere(IDBStoreAccessor accessor, CDOID cdoid, StringBuilder builder, int fromIndex, int toIndex)
   {
     int offset = getCurrentIndexOffset(accessor, cdoid);
     super.addRangedChunkWhere(accessor, cdoid, builder, fromIndex + offset, toIndex + offset);
@@ -250,8 +249,7 @@ public class NonAuditListTableMapping extends AbstractListTableMapping implement
   public int getCurrentIndexOffset(IDBStoreAccessor accessor, CDOID id)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlReadCurrentIndexOffset,
-        ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(sqlReadCurrentIndexOffset, ReuseProbability.HIGH);
     ResultSet rset = null;
 
     try
@@ -278,8 +276,8 @@ public class NonAuditListTableMapping extends AbstractListTableMapping implement
     }
   }
 
-  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, int branchId, int oldVersion,
-      final int newVersion, long created, CDOListFeatureDelta delta)
+  public void processDelta(final IDBStoreAccessor accessor, final CDOID id, int branchId, int oldVersion, final int newVersion, long created,
+      CDOListFeatureDelta delta)
   {
     int oldListSize = delta.getOriginSize();
 
@@ -1189,8 +1187,7 @@ public class NonAuditListTableMapping extends AbstractListTableMapping implement
     @Override
     public String toString()
     {
-      return MessageFormat.format(
-          "Manipulation[type={0}, sourceIndex={1}, tempIndex={2}, destinationIndex={3}, value={4}]", formatType(type),
+      return MessageFormat.format("Manipulation[type={0}, sourceIndex={1}, tempIndex={2}, destinationIndex={3}, value={4}]", formatType(type),
           formatIndex(sourceIndex), formatIndex(tempIndex), formatIndex(destinationIndex), formatValue(value));
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeTable.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeTable.java
index d25b197739..b91dca65e4 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeTable.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeTable.java
@@ -197,8 +197,7 @@ public class ObjectTypeTable extends AbstractObjectTypeMapper implements IMappin
     }
   }
 
-  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(Connection connection, CDODataOutput out, long fromCommitTime, long toCommitTime) throws IOException
   {
     String where = " WHERE " + ATTRIBUTES_CREATED + " BETWEEN " + fromCommitTime + " AND " + toCommitTime;
     DBUtil.serializeTable(out, connection, table, null, where);
@@ -242,8 +241,7 @@ public class ObjectTypeTable extends AbstractObjectTypeMapper implements IMappin
     }
 
     sqlSelect = "SELECT " + ATTRIBUTES_CLASS + " FROM " + table + " WHERE " + ATTRIBUTES_ID + "=?";
-    sqlInsert = "INSERT INTO " + table + "(" + ATTRIBUTES_ID + "," + ATTRIBUTES_CLASS + "," + ATTRIBUTES_CREATED
-        + ") VALUES (?, ?, ?)";
+    sqlInsert = "INSERT INTO " + table + "(" + ATTRIBUTES_ID + "," + ATTRIBUTES_CLASS + "," + ATTRIBUTES_CREATED + ") VALUES (?, ?, ?)";
     sqlDelete = "DELETE FROM " + table + " WHERE " + ATTRIBUTES_ID + "=?";
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
index 48735012df..1f2e956bdb 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
@@ -70,15 +70,13 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
 
   private static final String SQL_SELECT_ROOTS = "SELECT DISTINCT " + UNITS_UNIT + " FROM " + UNITS;
 
-  private static final String SQL_INSERT_MAPPINGS = "INSERT INTO " + UNITS + " (" + UNITS_ELEM + ", " + UNITS_UNIT
-      + ") VALUES (?, ?)";
+  private static final String SQL_INSERT_MAPPINGS = "INSERT INTO " + UNITS + " (" + UNITS_ELEM + ", " + UNITS_UNIT + ") VALUES (?, ?)";
 
   // private static final String SQL_SELECT_SIZE = "SELECT COUNT(" + UNITS_ELEM + ") FROM " + UNITS + " WHERE "
   // + UNITS_UNIT + "=?";
 
-  private static final String SQL_SELECT_CLASSES = "SELECT " + ATTRIBUTES_CLASS + ", COUNT(" + UNITS_ELEM + ") FROM "
-      + UNITS + ", " + CDODBSchema.CDO_OBJECTS + " WHERE " + UNITS_ELEM + "=" + ATTRIBUTES_ID + " AND " + UNITS_UNIT
-      + "=? GROUP BY " + ATTRIBUTES_CLASS;
+  private static final String SQL_SELECT_CLASSES = "SELECT " + ATTRIBUTES_CLASS + ", COUNT(" + UNITS_ELEM + ") FROM " + UNITS + ", " + CDODBSchema.CDO_OBJECTS
+      + " WHERE " + UNITS_ELEM + "=" + ATTRIBUTES_ID + " AND " + UNITS_UNIT + "=? GROUP BY " + ATTRIBUTES_CLASS;
 
   private static final int WRITE_UNIT_MAPPING_BATCH_SIZE = 100000;
 
@@ -125,8 +123,7 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
     return rootIDs;
   }
 
-  public void readUnitRevisions(IDBStoreAccessor accessor, IView view, CDOID rootID, CDORevisionHandler revisionHandler,
-      OMMonitor monitor)
+  public void readUnitRevisions(IDBStoreAccessor accessor, IView view, CDOID rootID, CDORevisionHandler revisionHandler, OMMonitor monitor)
   {
     IDBStore store = mappingStrategy.getStore();
     IIDHandler idHandler = store.getIDHandler();
@@ -180,13 +177,12 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
     }
   }
 
-  public BatchedStatement initUnit(IDBStoreAccessor accessor, long timeStamp, IView view, CDOID rootID,
-      CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs, OMMonitor monitor)
+  public BatchedStatement initUnit(IDBStoreAccessor accessor, long timeStamp, IView view, CDOID rootID, CDORevisionHandler revisionHandler,
+      Set<CDOID> initializedIDs, OMMonitor monitor)
   {
     IIDHandler idHandler = mappingStrategy.getStore().getIDHandler();
     IDBConnection connection = accessor.getDBConnection();
-    BatchedStatement stmt = DBUtil.batched(connection.prepareStatement(SQL_INSERT_MAPPINGS, ReuseProbability.HIGH),
-        WRITE_UNIT_MAPPING_BATCH_SIZE);
+    BatchedStatement stmt = DBUtil.batched(connection.prepareStatement(SQL_INSERT_MAPPINGS, ReuseProbability.HIGH), WRITE_UNIT_MAPPING_BATCH_SIZE);
 
     try
     {
@@ -205,9 +201,8 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
     }
   }
 
-  private void initUnit(BatchedStatement stmt, IView view, CDOID rootID, CDORevisionHandler revisionHandler,
-      Set<CDOID> initializedIDs, long timeStamp, IIDHandler idHandler, CDORevision revision, OMMonitor monitor)
-      throws SQLException
+  private void initUnit(BatchedStatement stmt, IView view, CDOID rootID, CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs, long timeStamp,
+      IIDHandler idHandler, CDORevision revision, OMMonitor monitor) throws SQLException
   {
     revisionHandler.handleRevision(revision);
 
@@ -262,8 +257,7 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
   {
     IIDHandler idHandler = mappingStrategy.getStore().getIDHandler();
     IDBConnection connection = accessor.getDBConnection();
-    BatchedStatement stmt = DBUtil.batched(connection.prepareStatement(SQL_INSERT_MAPPINGS, ReuseProbability.HIGH),
-        WRITE_UNIT_MAPPING_BATCH_SIZE);
+    BatchedStatement stmt = DBUtil.batched(connection.prepareStatement(SQL_INSERT_MAPPINGS, ReuseProbability.HIGH), WRITE_UNIT_MAPPING_BATCH_SIZE);
 
     try
     {
@@ -284,8 +278,7 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
     }
   }
 
-  private void writeUnitMapping(BatchedStatement stmt, CDOID rootID, long timeStamp, IIDHandler idHandler, CDOID id)
-      throws SQLException
+  private void writeUnitMapping(BatchedStatement stmt, CDOID rootID, long timeStamp, IIDHandler idHandler, CDOID id) throws SQLException
   {
     idHandler.setCDOID(stmt, 1, id);
     idHandler.setCDOID(stmt, 2, rootID);
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.db4o/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OCommitInfo.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OCommitInfo.java
index 01c1a74948..942720caed 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OCommitInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OCommitInfo.java
@@ -51,12 +51,10 @@ public class DB4OCommitInfo
     return timeStamp;
   }
 
-  public void handle(InternalCDOBranchManager branchManager, InternalCDOCommitInfoManager manager,
-      CDOCommitInfoHandler handler)
+  public void handle(InternalCDOBranchManager branchManager, InternalCDOCommitInfoManager manager, CDOCommitInfoHandler handler)
   {
     InternalCDOBranch branch = branchManager.getBranch(branchID);
-    CDOCommitInfo commitInfo = manager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null,
-        null);
+    CDOCommitInfo commitInfo = manager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, null);
     handler.handleCommitInfo(commitInfo);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java
index 84af5f02d1..9c34e5531c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ODurableLockingManager.java
@@ -38,8 +38,7 @@ public class DB4ODurableLockingManager extends Lifecycle
   {
   }
 
-  public LockArea createLockArea(DB4OStoreAccessor accessor, String userID, CDOBranchPoint branchPoint,
-      boolean readOnly, Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(DB4OStoreAccessor accessor, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     String durableLockingID = getNextDurableLockingID(accessor);
     LockArea lockArea = CDOLockUtil.createLockArea(durableLockingID, userID, branchPoint, readOnly, locks);
@@ -61,8 +60,7 @@ public class DB4ODurableLockingManager extends Lifecycle
     return DB4OLockArea.getLockArea(accessor.getStore(), primitive);
   }
 
-  private DB4OLockArea getPrimitiveLockArea(DB4OStoreAccessor accessor, String durableLockingID)
-      throws LockAreaNotFoundException
+  private DB4OLockArea getPrimitiveLockArea(DB4OStoreAccessor accessor, String durableLockingID) throws LockAreaNotFoundException
   {
     ObjectContainer container = accessor.getObjectContainer();
     Query query = container.query();
@@ -113,8 +111,7 @@ public class DB4ODurableLockingManager extends Lifecycle
     container.commit();
   }
 
-  public void lock(DB4OStoreAccessor accessor, String durableLockingID, LockType type,
-      Collection<? extends Object> objectsToLock)
+  public void lock(DB4OStoreAccessor accessor, String durableLockingID, LockType type, Collection<? extends Object> objectsToLock)
   {
     // TODO (CD) Refactor? Next chunk of code copied verbatim from MEMStore.lock
     LockArea area = getLockArea(accessor, durableLockingID);
@@ -140,8 +137,7 @@ public class DB4ODurableLockingManager extends Lifecycle
     storeLockArea(accessor, area);
   }
 
-  public void unlock(DB4OStoreAccessor accessor, String durableLockingID, LockType type,
-      Collection<? extends Object> objectsToUnlock)
+  public void unlock(DB4OStoreAccessor accessor, String durableLockingID, LockType type, Collection<? extends Object> objectsToUnlock)
   {
     // TODO (CD) Refactor? Next chunk of code copied verbatim from MEMStore.lock
     LockArea area = getLockArea(accessor, durableLockingID);
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java
index 6a3aecd7fe..3e40d6244d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OLockArea.java
@@ -82,8 +82,7 @@ public class DB4OLockArea
       lockMap.put(cdoid, lockGrade);
     }
 
-    LockArea lockArea = CDOLockUtil.createLockArea(primitive.id, primitive.userID, branchpoint, primitive.readOnly,
-        lockMap);
+    LockArea lockArea = CDOLockUtil.createLockArea(primitive.id, primitive.userID, branchpoint, primitive.readOnly, lockMap);
     map.put(lockArea, primitive);
     return lockArea;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OPackageUnit.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OPackageUnit.java
index 220a2fa48b..c273e6e44d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OPackageUnit.java
@@ -42,8 +42,7 @@ public class DB4OPackageUnit
 
   private List<Pair<String, String>> packageInfos;
 
-  public DB4OPackageUnit(String id, Integer ordinalType, Long timeStamp, List<Byte> ePackageBytes,
-      List<Pair<String, String>> packageInfos)
+  public DB4OPackageUnit(String id, Integer ordinalType, Long timeStamp, List<Byte> ePackageBytes, List<Pair<String, String>> packageInfos)
   {
     setId(id);
     setOrdinalType(ordinalType);
@@ -94,9 +93,8 @@ public class DB4OPackageUnit
 
   public static DB4OPackageUnit getPrimitivePackageUnit(IStore store, InternalCDOPackageUnit packageUnit)
   {
-    return new DB4OPackageUnit(new String(packageUnit.getID()), new Integer(packageUnit.getOriginalType().ordinal()),
-        new Long(packageUnit.getTimeStamp()), getEPackageBytes(store, packageUnit),
-        getPackageInfosAsPair(packageUnit.getPackageInfos()));
+    return new DB4OPackageUnit(new String(packageUnit.getID()), new Integer(packageUnit.getOriginalType().ordinal()), new Long(packageUnit.getTimeStamp()),
+        getEPackageBytes(store, packageUnit), getPackageInfosAsPair(packageUnit.getPackageInfos()));
   }
 
   public static InternalCDOPackageUnit getPackageUnit(DB4OPackageUnit packageUnit)
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ORevision.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ORevision.java
index 70cf392464..a10fa25027 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ORevision.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4ORevision.java
@@ -73,8 +73,8 @@ public class DB4ORevision
 
   private boolean isResourceFolder;
 
-  public DB4ORevision(String packageURI, String className, long id, int version, long resourceID, Object containerID,
-      int containingFeatureID, List<Object> values, long timestamp, boolean isResource, boolean isResourceFolder)
+  public DB4ORevision(String packageURI, String className, long id, int version, long resourceID, Object containerID, int containingFeatureID,
+      List<Object> values, long timestamp, boolean isResource, boolean isResourceFolder)
   {
     setPackageURI(packageURI);
     setClassName(className);
@@ -258,8 +258,7 @@ public class DB4ORevision
           {
             if (!(listElement instanceof CDOID))
             {
-              throw new IllegalStateException("CDOList should contain only CDOID instances but received "
-                  + listElement.getClass().getName() + " instead");
+              throw new IllegalStateException("CDOList should contain only CDOID instances but received " + listElement.getClass().getName() + " instead");
             }
 
             list.add(getDB4OID((CDOID)listElement));
@@ -284,8 +283,7 @@ public class DB4ORevision
       }
     }
 
-    return new DB4ORevision(packageURI, className, id, version, resourceID, containerID, containingFeatureID, values,
-        timeStamp, isResource, isResourceFolder);
+    return new DB4ORevision(packageURI, className, id, version, resourceID, containerID, containingFeatureID, values, timeStamp, isResource, isResourceFolder);
   }
 
   public static InternalCDORevision getCDORevision(IStore store, DB4ORevision primitiveRevision)
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
index 6fe2d6850b..dad79ceb92 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
@@ -115,8 +115,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
 
   public EPackage[] loadPackageUnit(InternalCDOPackageUnit packageUnit)
   {
-    DB4OPackageUnit db4OPackageUnit = getPrimitivePackageUnitMap()
-        .get(packageUnit.getTopLevelPackageInfo().getPackageURI());
+    DB4OPackageUnit db4OPackageUnit = getPrimitivePackageUnitMap().get(packageUnit.getTopLevelPackageInfo().getPackageURI());
     return EMFUtil.getAllPackages(db4OPackageUnit.getEPackage());
   }
 
@@ -178,8 +177,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     return map;
   }
 
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     DB4ORevision lastRevision = DB4OStore.getRevision(getObjectContainer(), id);
     if (lastRevision == null)
@@ -198,8 +196,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     final boolean exactMatch = context.exactMatch();
     // RootResource may not be initialized, as there may be queries during IStore activation
     CDOID rootResourceID = getStore().getRepository().getRootResourceID();
-    final Object rootResourceLongID = rootResourceID != null
-        ? DB4ORevision.getDB4OID(getStore().getRepository().getRootResourceID()) : null;
+    final Object rootResourceLongID = rootResourceID != null ? DB4ORevision.getDB4OID(getStore().getRepository().getRootResourceID()) : null;
 
     ObjectSet<DB4ORevision> revisionObjectSet = getObjectContainer().query(new Predicate<DB4ORevision>()
     {
@@ -302,8 +299,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     getObjectContainer().rollback();
   }
 
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     DB4ORevision revision = DB4OStore.getRevision(getObjectContainer(), id);
     if (revision == null || revision.getVersion() != branchVersion.getVersion())
@@ -314,8 +310,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     return DB4ORevision.getCDORevision(getStore(), revision);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     Query query = getObjectContainer().query();
     query.constrain(DB4ORevision.class);
@@ -538,8 +533,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     throw new UnsupportedOperationException();
   }
 
-  public void loadCommitInfos(final CDOBranch branch, final long startTime, final long endTime,
-      CDOCommitInfoHandler handler)
+  public void loadCommitInfos(final CDOBranch branch, final long startTime, final long endTime, CDOCommitInfoHandler handler)
   {
     if (endTime < CDOBranchPoint.UNSPECIFIED_DATE)
     {
@@ -621,8 +615,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
 
   @SuppressWarnings("deprecation")
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     DB4OCommitInfo commitInfo = new DB4OCommitInfo(branch.getID(), timeStamp, previousTimeStamp, userID, comment);
     writeObject(commitInfo, monitor);
@@ -709,8 +702,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
   }
 
   @Override
-  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor)
+  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor)
   {
     for (InternalCDORevisionDelta revisionDelta : revisionDeltas)
     {
@@ -721,8 +713,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
   protected void writeRevisionDelta(InternalCDORevisionDelta revisionDelta, CDOBranch branch, long created)
   {
     CDOID id = revisionDelta.getID();
-    InternalCDORevision revision = DB4ORevision.getCDORevision(getStore(),
-        DB4OStore.getRevision(getObjectContainer(), id));
+    InternalCDORevision revision = DB4ORevision.getCDORevision(getStore(), DB4OStore.getRevision(getObjectContainer(), id));
     InternalCDORevision newRevision = revision.copy();
     newRevision.adjustForCommit(branch, created);
 
@@ -784,15 +775,13 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     }
   }
 
-  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException
   {
     // TODO: Implement DB4OStoreAccessor.rawExport(CDODataOutput, int, int, long, long)
     throw new UnsupportedOperationException();
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     // TODO: Implement DB4OStoreAccessor.rawImport(CDODataInput, int, int, long, long, OMMonitor)
     throw new UnsupportedOperationException();
@@ -820,8 +809,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     throw new UnsupportedOperationException();
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, monitor);
   }
@@ -836,8 +824,7 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     doCommit(monitor);
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     DB4ODurableLockingManager manager = getStore().getDurableLockingManager();
     return manager.createLockArea(this, userID, branchPoint, readOnly, locks);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs
index 667c5d77db..0ce9f5f611 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs
@@ -367,7 +367,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
index 92def4f894..0642fb1fb0 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true
-Bundle-Version: 4.2.200.qualifier
+Bundle-Version: 4.2.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -27,8 +27,8 @@ Import-Package: org.eclipse.emf.cdo.security;version="[4.0.0,5.0.0)",
  org.eclipse.emf.teneo.hibernate.mapper;version="[2.0.1,3.0.0)",
  org.eclipse.emf.teneo.simpledom;version="[2.0.1,3.0.0)",
  org.eclipse.emf.teneo.util;version="[2.0.1,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.200"
+Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.300";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.300";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.300"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
index 5e789a5893..230865f1d4 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
@@ -104,8 +104,7 @@ public class TeneoHibernateMappingProvider extends HibernateMappingProvider
     properties.putAll(storeProperties);
     properties.putAll(mappingProviderProperties);
 
-    PackageRegistryProvider.getInstance()
-        .setThreadPackageRegistry(getHibernateStore().getRepository().getPackageRegistry());
+    PackageRegistryProvider.getInstance().setThreadPackageRegistry(getHibernateStore().getRepository().getPackageRegistry());
 
     // translate the list of EPackages to an array
     boolean hasXMLTypePackage = false;
@@ -192,8 +191,7 @@ public class TeneoHibernateMappingProvider extends HibernateMappingProvider
 
         final EAnnotation eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
         eAnnotation.setSource(Constants.ANNOTATION_SOURCE_TENEO_JPA);
-        final String typeAnnotation = "@Type(type=\"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.XMLUserType$"
-            + eDataType.getName() + "\")";
+        final String typeAnnotation = "@Type(type=\"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.XMLUserType$" + eDataType.getName() + "\")";
         eAnnotation.getDetails().put("value", typeAnnotation);
         eDataType.getEAnnotations().add(eAnnotation);
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
index 354384848a..8582774f4d 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
@@ -72,8 +72,7 @@ public class TeneoHibernateMappingProviderFactory implements IHibernateMappingPr
       final String valueAttrValue = extensionElement.getAttribute(VALUE_ATTR);
       if (nameAttrValue == null || valueAttrValue == null)
       {
-        throw new IllegalArgumentException(
-            "Extension element has incorrect format, both the name and value attribute should be present"); //$NON-NLS-1$
+        throw new IllegalArgumentException("Extension element has incorrect format, both the name and value attribute should be present"); //$NON-NLS-1$
       }
 
       mappingProvider.putExtension(nameAttrValue, valueAttrValue);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
index 89be9ed13e..ed52b2d887 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
@@ -38,14 +38,11 @@ public class CDOEFeatureAnnotator extends EFeatureAnnotator
     if (aStructuralFeature instanceof PAnnotatedEReference)
     {
       final PAnnotatedEReference paReference = (PAnnotatedEReference)aStructuralFeature;
-      final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType()
-          .getEPackage() == EcorePackage.eINSTANCE;
+      final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType().getEPackage() == EcorePackage.eINSTANCE;
 
       // these are done with a <any ..> mapping
-      final boolean refersToEObject = paReference.getModelEReference().getEReferenceType() == EcorePackage.eINSTANCE
-          .getEObject();
-      final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass()
-          .getEPackage() == EcorePackage.eINSTANCE;
+      final boolean refersToEObject = paReference.getModelEReference().getEReferenceType() == EcorePackage.eINSTANCE.getEObject();
+      final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass().getEPackage() == EcorePackage.eINSTANCE;
       if (refersToEcoreModelElement && !isPartOfEcoreModel && !refersToEObject)
       {
         paReference.setExternal(PannotationFactory.eINSTANCE.createExternal());
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
index a2ad2ada31..22344ce4fc 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
@@ -75,8 +75,7 @@ public class CDOMappingGenerator
     }
   }
 
-  protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass,
-      ExtensionManager extensionManager)
+  protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass, ExtensionManager extensionManager)
   {
     if (extensions.containsKey(extensionClass.getName()))
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
index 805cd8fbdd..091ddbdcc2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
@@ -378,7 +378,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java
index b96c6b7b35..3b0cfd2f99 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java
@@ -37,8 +37,7 @@ public final class CDOHibernateUtil
   /**
    * @since 4.1
    */
-  public static void setMappingProviderFactoryInstance(
-      IHibernateMappingProvider.Factory theMappingProviderFactoryInstance)
+  public static void setMappingProviderFactoryInstance(IHibernateMappingProvider.Factory theMappingProviderFactoryInstance)
   {
     HibernateUtil.setMappingProviderFactoryInstance(theMappingProviderFactoryInstance);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
index 2e41a5e59f..f52f9aee79 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
@@ -55,8 +55,7 @@ public class CDOAuditHandler extends AuditHandler
     final InternalCDORevision cdoRevision = (InternalCDORevision)object;
 
     teneoAuditEntry.setTeneo_container_feature_id(cdoRevision.getContainingFeatureID());
-    teneoAuditEntry
-        .setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString((CDOID)cdoRevision.getContainerID()));
+    teneoAuditEntry.setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString((CDOID)cdoRevision.getContainerID()));
   }
 
   @Override
@@ -114,8 +113,7 @@ public class CDOAuditHandler extends AuditHandler
 
   @SuppressWarnings("unchecked")
   @Override
-  public void copyContentToAuditEntry(Session session, Object object, TeneoAuditEntry auditEntry,
-      boolean copyCollections)
+  public void copyContentToAuditEntry(Session session, Object object, TeneoAuditEntry auditEntry, boolean copyCollections)
   {
     final InternalCDORevision source = (InternalCDORevision)object;
     final EClass sourceEClass = source.getEClass();
@@ -135,11 +133,9 @@ public class CDOAuditHandler extends AuditHandler
 
       // initialize with new arrays always to prevent hibernate from complaining if the
       // same array is re-used accross entities
-      if (targetEFeature.getEType().getInstanceClass() != null
-          && targetEFeature.getEType().getInstanceClass().isArray())
+      if (targetEFeature.getEType().getInstanceClass() != null && targetEFeature.getEType().getInstanceClass().isArray())
       {
-        auditEntry.eSet(targetEFeature,
-            Array.newInstance(targetEFeature.getEType().getInstanceClass().getComponentType(), 0));
+        auditEntry.eSet(targetEFeature, Array.newInstance(targetEFeature.getEType().getInstanceClass().getComponentType(), 0));
       }
 
       final EStructuralFeature sourceEFeature = sourceEClass.getEStructuralFeature(targetEFeature.getName());
@@ -173,8 +169,7 @@ public class CDOAuditHandler extends AuditHandler
             {
               for (Object value : (Collection<?>)source.getList(sourceEFeature))
               {
-                ((Collection<Object>)auditEntry.eGet(targetEFeature))
-                    .add(convertValue(sourceEFeature, targetEFeature, value));
+                ((Collection<Object>)auditEntry.eGet(targetEFeature)).add(convertValue(sourceEFeature, targetEFeature, value));
               }
             }
           }
@@ -187,8 +182,7 @@ public class CDOAuditHandler extends AuditHandler
             }
             else
             {
-              auditEntry.eSet(targetEFeature,
-                  convertValue(sourceEFeature, targetEFeature, source.getValue(sourceEFeature)));
+              auditEntry.eSet(targetEFeature, convertValue(sourceEFeature, targetEFeature, source.getValue(sourceEFeature)));
             }
           }
         }
@@ -202,14 +196,13 @@ public class CDOAuditHandler extends AuditHandler
     return createEReferenceAttribute((EReference)sourceEFeature);
   }
 
-  protected void convertEMap(Session session, InternalCDORevision source, EReference sourceEReference,
-      TeneoAuditEntry auditEntry, EReference targetEReference)
+  protected void convertEMap(Session session, InternalCDORevision source, EReference sourceEReference, TeneoAuditEntry auditEntry, EReference targetEReference)
   {
     throw new IllegalStateException("Error case: The system should not use this method when doing auditing in CDO");
   }
 
-  protected void convertFeatureMap(Session session, InternalCDORevision source, EStructuralFeature sourceEFeature,
-      TeneoAuditEntry auditEntry, EStructuralFeature targetEFeature)
+  protected void convertFeatureMap(Session session, InternalCDORevision source, EStructuralFeature sourceEFeature, TeneoAuditEntry auditEntry,
+      EStructuralFeature targetEFeature)
   {
     super.convertFeatureMap(session, source.getList(sourceEFeature), sourceEFeature, auditEntry, targetEFeature);
   }
@@ -249,8 +242,7 @@ public class CDOAuditHandler extends AuditHandler
         cnt++;
         if (cnt > 1000)
         {
-          throw new IllegalStateException(
-              "Cycle detected in id mappings " + newID + " maps to " + commitContext.getIDMappings().get(newID));
+          throw new IllegalStateException("Cycle detected in id mappings " + newID + " maps to " + commitContext.getIDMappings().get(newID));
         }
       }
       cdoID = newID;
@@ -340,8 +332,7 @@ public class CDOAuditHandler extends AuditHandler
 
   private boolean isTeneoAnnotated(EAttribute eAttribute)
   {
-    return eAttribute.getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA) != null
-        || eAttribute.getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA) != null
+    return eAttribute.getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA) != null || eAttribute.getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA) != null
         || eAttribute.getEAttributeType().getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA_AUDITING) != null
         || eAttribute.getEAttributeType().getEAnnotation(Constants.ANNOTATION_SOURCE_TENEO_JPA) != null;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
index 1d40a635d0..7970014551 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
@@ -26,8 +26,6 @@ public class CDOHibernateBranchPointImpl extends CDOBranchPointImpl
 
   public CDOHibernateBranchPointImpl(long timeStamp)
   {
-    super(
-        HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager().getMainBranch(),
-        timeStamp);
+    super(HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager().getMainBranch(), timeStamp);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
index 6078a422f6..5334e661de 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
@@ -45,8 +45,7 @@ public class FileHibernateMappingProviderFactory implements IHibernateMappingPro
     NodeList mappingFileConfigs = config.getElementsByTagName(FILE_ELEMENT_TAG_NAME);
     if (mappingFileConfigs.getLength() != 1)
     {
-      throw new IllegalArgumentException(
-          "Zero or More than one mapping file location specified, only one location is supported."); //$NON-NLS-1$
+      throw new IllegalArgumentException("Zero or More than one mapping file location specified, only one location is supported."); //$NON-NLS-1$
     }
 
     final Element mappingFile = (Element)mappingFileConfigs.item(0);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
index 18aea6497a..474d8ac317 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
@@ -115,18 +115,15 @@ public class HibernateAuditHandler
     final InternalCDORevision revision;
     if (teneoAuditEntry.getTeneo_audit_kind() == TeneoAuditKind.DELETE)
     {
-      revision = new DetachedCDORevision(domainEClass, cdoID,
-          hibernateStore.getRepository().getBranchManager().getMainBranch(),
-          new Long(teneoAuditEntry.getTeneo_object_version()).intValue(), teneoAuditEntry.getTeneo_start(),
-          CDOBranchPoint.UNSPECIFIED_DATE);
+      revision = new DetachedCDORevision(domainEClass, cdoID, hibernateStore.getRepository().getBranchManager().getMainBranch(),
+          new Long(teneoAuditEntry.getTeneo_object_version()).intValue(), teneoAuditEntry.getTeneo_start(), CDOBranchPoint.UNSPECIFIED_DATE);
       revision.setRevised(CDOBranchPoint.UNSPECIFIED_DATE);
     }
     else
     {
       revision = hibernateStore.createRevision(domainEClass, cdoID);
       revision.setVersion(new Long(teneoAuditEntry.getTeneo_object_version()).intValue());
-      revision.setBranchPoint(
-          storeAccessor.getStore().getMainBranchHead().getBranch().getPoint(teneoAuditEntry.getTeneo_start()));
+      revision.setBranchPoint(storeAccessor.getStore().getMainBranchHead().getBranch().getPoint(teneoAuditEntry.getTeneo_start()));
       if (teneoAuditEntry.getTeneo_end() > 0)
       {
         revision.setRevised(teneoAuditEntry.getTeneo_end());
@@ -201,8 +198,7 @@ public class HibernateAuditHandler
     }
     if (targetEFeature instanceof EReference)
     {
-      final CDOID cdoID = value instanceof CDOID ? (CDOID)value
-          : HibernateUtil.getInstance().convertStringToCDOID((String)value);
+      final CDOID cdoID = value instanceof CDOID ? (CDOID)value : HibernateUtil.getInstance().convertStringToCDOID((String)value);
       return cdoID;
     }
     if (value instanceof Enumerator)
@@ -237,8 +233,7 @@ public class HibernateAuditHandler
       idStr = auditHandler.idToString(EresourcePackage.eINSTANCE.getCDOResourceFolder(), CDOIDUtil.getLong(folderId));
     }
 
-    final String qryStr = "select e from " + entityName + " e where e.folder"
-        + (idStr == null ? " is null " : "=:folder")
+    final String qryStr = "select e from " + entityName + " e where e.folder" + (idStr == null ? " is null " : "=:folder")
         + " and (e.teneo_end=-1 or e.teneo_end>:end) and e.teneo_start<=:start";
     final Query qry = session.createQuery(qryStr);
     if (idStr != null)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
index 33c689963e..16609406dc 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
@@ -68,8 +68,7 @@ public class HibernatePackageHandler extends Lifecycle
 
   // made static and synchronized because apparently there can be multiple package handlers
   // in some test cases: TestExternalReferenceTest.testOneXMIResourceManyViewsOnOneResourceSet
-  private static synchronized boolean writePackageUnits(InternalCDOPackageUnit[] packageUnits,
-      SessionFactory sessionFactory, EPackage.Registry registry)
+  private static synchronized boolean writePackageUnits(InternalCDOPackageUnit[] packageUnits, SessionFactory sessionFactory, EPackage.Registry registry)
   {
     if (TRACER.isEnabled())
     {
@@ -357,8 +356,7 @@ public class HibernatePackageHandler extends Lifecycle
 
       // prevent the drop at session factory close...
       // the drop is done by the de-activate
-      if (configuration.getProperty(Environment.HBM2DDL_AUTO) != null
-          && configuration.getProperty(Environment.HBM2DDL_AUTO).startsWith(HBM2DLL_CREATE))
+      if (configuration.getProperty(Environment.HBM2DDL_AUTO) != null && configuration.getProperty(Environment.HBM2DDL_AUTO).startsWith(HBM2DLL_CREATE))
       {
         doDropSchema = true;
         // note that the value create also re-creates the db and drops the old one
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
index ff5c9f24f8..45d01b8f28 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
@@ -82,8 +82,7 @@ public class HibernateQueryHandler implements IQueryHandler
           }
           catch (ClassCastException e)
           {
-            throw new IllegalArgumentException(
-                "Parameter " + IHibernateStore.CACHE_RESULTS + " must be a boolean. errorMessage " + e.getMessage()); //$NON-NLS-1$
+            throw new IllegalArgumentException("Parameter " + IHibernateStore.CACHE_RESULTS + " must be a boolean. errorMessage " + e.getMessage()); //$NON-NLS-1$
           }
         }
         else if (key.compareToIgnoreCase(IHibernateStore.FIRST_RESULT) == 0)
@@ -217,8 +216,7 @@ public class HibernateQueryHandler implements IQueryHandler
           final CDORevision previousVersion = getPreviousRevision(internalCDORevision);
           if (previousVersion != null)
           {
-            internalCDORevision.setBranchPoint(hibernateStoreAccessor.getStore().getMainBranchHead().getBranch()
-                .getPoint(1 + previousVersion.getRevised()));
+            internalCDORevision.setBranchPoint(hibernateStoreAccessor.getStore().getMainBranchHead().getBranch().getPoint(1 + previousVersion.getRevised()));
           }
         }
       }
@@ -230,17 +228,15 @@ public class HibernateQueryHandler implements IQueryHandler
 
   private CDORevision getPreviousRevision(InternalCDORevision internalCDORevision)
   {
-    final InternalCDORevisionManager cdoRevisionManager = hibernateStoreAccessor.getStore().getRepository()
-        .getRevisionManager();
+    final InternalCDORevisionManager cdoRevisionManager = hibernateStoreAccessor.getStore().getRepository().getRevisionManager();
 
-    final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl(
-        hibernateStoreAccessor.getStore().getMainBranchHead().getBranch(), internalCDORevision.getVersion() - 1);
+    final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl(hibernateStoreAccessor.getStore().getMainBranchHead().getBranch(),
+        internalCDORevision.getVersion() - 1);
     if (cdoRevisionManager.containsRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion))
     {
       return cdoRevisionManager.getRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion, -1, true);
     }
-    return hibernateStoreAccessor.readRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion, -1,
-        cdoRevisionManager);
+    return hibernateStoreAccessor.readRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion, -1, cdoRevisionManager);
   }
 
   private void addToRevisionCache(CDORevision revision)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index bd47766f2c..baaf703ddc 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -142,8 +142,7 @@ public class HibernateStore extends Store implements IHibernateStore
 
   public HibernateStore(IHibernateMappingProvider mappingProvider, Properties properties)
   {
-    super(TYPE, OBJECT_ID_TYPES, set(ChangeFormat.REVISION),
-        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING), set(RevisionParallelism.NONE));
+    super(TYPE, OBJECT_ID_TYPES, set(ChangeFormat.REVISION), set(RevisionTemporality.NONE, RevisionTemporality.AUDITING), set(RevisionParallelism.NONE));
     this.mappingProvider = mappingProvider;
     packageHandler = new HibernatePackageHandler(this);
     this.properties = properties;
@@ -226,8 +225,7 @@ public class HibernateStore extends Store implements IHibernateStore
 
   private boolean isAuditEPackage(EPackage ePackage)
   {
-    return TeneoauditingPackage.eNS_URI.equals(ePackage.getNsURI())
-        || ePackage.getEAnnotation(Constants.ANNOTATION_SOURCE_AUDITING) != null;
+    return TeneoauditingPackage.eNS_URI.equals(ePackage.getNsURI()) || ePackage.getEAnnotation(Constants.ANNOTATION_SOURCE_AUDITING) != null;
   }
 
   public String getEntityName(EClass eClass)
@@ -611,12 +609,9 @@ public class HibernateStore extends Store implements IHibernateStore
       cdoDataStore.setResetConfigurationOnInitialization(false);
       cdoDataStore.setName("cdo");
       cdoDataStore.setPackageRegistry(getRepository().getPackageRegistry());
-      cdoDataStore.getExtensionManager().registerExtension(EMFInterceptor.class.getName(),
-          CDOInterceptor.class.getName());
-      cdoDataStore.getExtensionManager().registerExtension(AuditHandler.class.getName(),
-          CDOAuditHandler.class.getName());
-      cdoDataStore.getExtensionManager().registerExtension(AuditProcessHandler.class.getName(),
-          CDOAuditProcessHandler.class.getName());
+      cdoDataStore.getExtensionManager().registerExtension(EMFInterceptor.class.getName(), CDOInterceptor.class.getName());
+      cdoDataStore.getExtensionManager().registerExtension(AuditHandler.class.getName(), CDOAuditHandler.class.getName());
+      cdoDataStore.getExtensionManager().registerExtension(AuditProcessHandler.class.getName(), CDOAuditProcessHandler.class.getName());
 
       // don't do any persistence xml mapping in this datastore
       // make a local copy as it is adapted in the next if-statement
@@ -740,12 +735,10 @@ public class HibernateStore extends Store implements IHibernateStore
     {
       if (!CDOModelUtil.isSystemPackage(ePackage) && !isAuditEPackage(ePackage))
       {
-        epacks.add(dataStore.getAuditHandler().createAuditingEPackage(dataStore, ePackage,
-            getRepository().getPackageRegistry(), po));
+        epacks.add(dataStore.getAuditHandler().createAuditingEPackage(dataStore, ePackage, getRepository().getPackageRegistry(), po));
       }
     }
-    epacks.add(dataStore.getAuditHandler().createAuditingEPackage(dataStore,
-        getRepository().getPackageRegistry().getEPackage(EresourcePackage.eNS_URI),
+    epacks.add(dataStore.getAuditHandler().createAuditingEPackage(dataStore, getRepository().getPackageRegistry().getEPackage(EresourcePackage.eNS_URI),
         getRepository().getPackageRegistry(), po));
 
     epacks.add(TeneoauditingPackage.eINSTANCE);
@@ -770,10 +763,9 @@ public class HibernateStore extends Store implements IHibernateStore
     {
       props.setProperty(PersistenceOptions.PERSISTENCE_XML, PersistenceOptions.AUDITING_PERSISTENCE_XML);
     }
-    final PersistenceOptions po = dataStore.getExtensionManager().getExtension(PersistenceOptions.class,
-        new Object[] { props });
-    PAnnotatedModel paModel = dataStore.getExtensionManager().getExtension(PersistenceMappingBuilder.class)
-        .buildMapping(auditEPackages, po, dataStore.getExtensionManager(), dataStore.getPackageRegistry());
+    final PersistenceOptions po = dataStore.getExtensionManager().getExtension(PersistenceOptions.class, new Object[] { props });
+    PAnnotatedModel paModel = dataStore.getExtensionManager().getExtension(PersistenceMappingBuilder.class).buildMapping(auditEPackages, po,
+        dataStore.getExtensionManager(), dataStore.getPackageRegistry());
     final HibernateMappingGenerator hmg = dataStore.getExtensionManager().getExtension(HibernateMappingGenerator.class);
     hmg.setPersistenceOptions(po);
     final String hbm = hmg.generateToString(paModel);
@@ -848,10 +840,8 @@ public class HibernateStore extends Store implements IHibernateStore
 
         if (HibernateThreadContext.isCommitContextSet())
         {
-          AuditProcessHandler
-              .setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext().getUserID());
-          AuditProcessHandler
-              .setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext().getCommitComment());
+          AuditProcessHandler.setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext().getUserID());
+          AuditProcessHandler.setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext().getCommitComment());
         }
         super.doAuditWorkInSession(session, auditWorks);
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
index 8bfbd30cf9..94f7418b20 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
@@ -368,8 +368,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
    *          the revision cache, the read revision is added to the cache
    * @return the read revision
    */
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     if (!HibernateUtil.getInstance().isStoreCreatedID(id))
     {
@@ -380,8 +379,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     {
       if (getStore().isAuditing() && getStore().getHibernateAuditHandler().getCDOAuditHandler().isAudited(id))
       {
-        InternalCDORevision revision = getStore().getHibernateAuditHandler().readRevision(getHibernateSession(), id,
-            branchPoint.getTimeStamp());
+        InternalCDORevision revision = getStore().getHibernateAuditHandler().readRevision(getHibernateSession(), id, branchPoint.getTimeStamp());
         // found one, use it
         if (revision != null)
         {
@@ -477,8 +475,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       }
     }
 
-    final String qryStr = "select e from TeneoAuditCommitInfo e where e.commitTime>=:startTime and e.commitTime<=:endTime order by e.commitTime "
-        + direction;
+    final String qryStr = "select e from TeneoAuditCommitInfo e where e.commitTime>=:startTime and e.commitTime<=:endTime order by e.commitTime " + direction;
     final Query qry = session.createQuery(qryStr);
     if (count > 0)
     {
@@ -489,9 +486,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     for (Object o : qry.list())
     {
       final TeneoAuditCommitInfo teneoCommitInfo = (TeneoAuditCommitInfo)o;
-      final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo(
-          getStore().getRepository().getBranchManager().getMainBranch(), teneoCommitInfo.getCommitTime(),
-          teneoCommitInfo.getCommitTime() - 1, teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null, null);
+      final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo(getStore().getRepository().getBranchManager().getMainBranch(),
+          teneoCommitInfo.getCommitTime(), teneoCommitInfo.getCommitTime() - 1, teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null, null);
       handler.handleCommitInfo(cdoCommitInfo);
     }
   }
@@ -503,8 +499,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   }
 
   // should only return revisions of the eclass itself and not of its subclasses.
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
 
     if (eClass != null)
@@ -521,8 +516,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       for (EPackage ePackage : getStore().getPackageHandler().getEPackages())
       {
         // an auditing epackage
-        if (ePackage == TeneoauditingPackage.eINSTANCE
-            || ePackage.getEAnnotation(Constants.ANNOTATION_SOURCE_AUDITING) != null)
+        if (ePackage == TeneoauditingPackage.eINSTANCE || ePackage.getEAnnotation(Constants.ANNOTATION_SOURCE_AUDITING) != null)
         {
           continue;
         }
@@ -583,14 +577,12 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   /**
    * @see #readRevision(CDOID, CDOBranchPoint, int, CDORevisionCacheAdder)
    */
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     InternalCDORevision revision = null;
     if (getStore().getHibernateAuditHandler().getCDOAuditHandler().isAudited(id))
     {
-      revision = getStore().getHibernateAuditHandler().readRevisionByVersion(getHibernateSession(), id,
-          branchVersion.getVersion());
+      revision = getStore().getHibernateAuditHandler().readRevisionByVersion(getHibernateSession(), id, branchVersion.getVersion());
     }
     else
     {
@@ -677,8 +669,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
         }
 
         final String revisionName = (String)value;
-        final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil.equals(revisionName, name)
-            : revisionName.startsWith(name);
+        final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil.equals(revisionName, name) : revisionName.startsWith(name);
 
         if (match && !context.addResource(HibernateUtil.getInstance().getCDOID(revision)))
         {
@@ -724,8 +715,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
           final String hql;
           if (eref.isMany())
           {
-            hql = "select ref from " + sourceEntityName + " as ref, " + targetEntityName
-                + " as refTo where refTo = :to and refTo in elements(ref." + eref.getName() + ")";
+            hql = "select ref from " + sourceEntityName + " as ref, " + targetEntityName + " as refTo where refTo = :to and refTo in elements(ref."
+                + eref.getName() + ")";
           }
           else
           {
@@ -805,8 +796,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       // TODO Can this happen? When?
       // the folder id is always a long
       final Long idValue = CDOIDUtil.getLong(id);
-      return CDOIDUtil.createLongWithClassifier(idValue,
-          new CDOClassifierRef(EresourcePackage.eINSTANCE.getCDOResourceNode()));
+      return CDOIDUtil.createLongWithClassifier(idValue, new CDOClassifierRef(EresourcePackage.eINSTANCE.getCDOResourceNode()));
     }
 
     return null;
@@ -872,8 +862,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     try
     {
       // start with fresh hibernate session to prevent side effects
-      final Session session = context instanceof HibernateRawCommitContext ? getHibernateSession()
-          : getNewHibernateSession(false);
+      final Session session = context instanceof HibernateRawCommitContext ? getHibernateSession() : getNewHibernateSession(false);
       session.setDefaultReadOnly(false);
 
       // decrement version, hibernate will increment it
@@ -937,8 +926,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
           {
             if (cdoRevision.getVersion() != revision.getVersion())
             {
-              throw new IllegalStateException(
-                  "Revision " + cdoRevision + " was already updated by another transaction");
+              throw new IllegalStateException("Revision " + cdoRevision + " was already updated by another transaction");
             }
             existingRevisions.put(revision.getID(), cdoRevision);
           }
@@ -1150,8 +1138,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
 
   @SuppressWarnings("deprecation")
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     // is done in dowrite
   }
@@ -1176,8 +1163,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
   }
 
   @Override
-  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor)
+  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor)
   {
     // TODO: implement HibernateStoreAccessor.writeRevisionDeltas(revisionDeltas, branch, created, monitor)
     throw new UnsupportedOperationException();
@@ -1332,15 +1318,13 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     return lob;
   }
 
-  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException
   {
     // we won't export any store specific stuff...
     // throw new UnsupportedOperationException();
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     throw new UnsupportedOperationException();
   }
@@ -1381,8 +1365,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     writeClob(id, size, reader);
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     // TODO: support export and import and auditing
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
index 61f8723b2d..3077336727 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
@@ -70,8 +70,7 @@ public class HibernateStoreChunkReader extends StoreChunkReader implements IHibe
     if (value instanceof PersistentCollection)
     {
       final PersistentCollection persistentCollection = (PersistentCollection)value;
-      persister = (QueryableCollection)((SessionFactoryImplementor)session.getSessionFactory())
-          .getCollectionPersister(persistentCollection.getRole());
+      persister = (QueryableCollection)((SessionFactoryImplementor)session.getSessionFactory()).getCollectionPersister(persistentCollection.getRole());
       entry = ((SessionImplementor)session).getPersistenceContext().getCollectionEntry(persistentCollection);
 
       useExtraLazyMode = !persister.getElementType().isEntityType();
@@ -113,8 +112,7 @@ public class HibernateStoreChunkReader extends StoreChunkReader implements IHibe
         {
           for (int i = startIndex; i < startIndex + maxElements; i++)
           {
-            final Object object = persister.getElementByIndex(entry.getLoadedKey(), i, (SessionImplementor)session,
-                latestRevision);
+            final Object object = persister.getElementByIndex(entry.getLoadedKey(), i, (SessionImplementor)session, latestRevision);
             // could happen if the index > size)
             if (object == null)
             {
@@ -164,8 +162,7 @@ public class HibernateStoreChunkReader extends StoreChunkReader implements IHibe
 
     if (store.isAuditing() && store.getHibernateAuditHandler().getCDOAuditHandler().isAudited(id))
     {
-      InternalCDORevision revision = store.getHibernateAuditHandler().readRevision(session, id,
-          getRevision().getTimeStamp());
+      InternalCDORevision revision = store.getHibernateAuditHandler().readRevision(session, id, getRevision().getTimeStamp());
       // found one, use it
       if (revision != null)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
index 476b38a474..6c965182cd 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
@@ -53,8 +53,7 @@ public class HibernateStoreFactory implements IStoreFactory
     for (int i = 0; i < propertyNodes.getLength(); i++)
     {
       final Element propertyElement = (Element)propertyNodes.item(i);
-      properties.setProperty(propertyElement.getAttribute(NAME_ATTRIBUTE),
-          propertyElement.getAttribute(VALUE_ATTRIBUTE));
+      properties.setProperty(propertyElement.getAttribute(NAME_ATTRIBUTE), propertyElement.getAttribute(VALUE_ATTRIBUTE));
     }
 
     return HibernateUtil.getInstance().createStore(mappingProvider, properties);
@@ -70,8 +69,7 @@ public class HibernateStoreFactory implements IStoreFactory
 
     Element mappingProviderConfig = (Element)mappingProviderConfigs.item(0);
     String mappingProviderType = mappingProviderConfig.getAttribute(TYPE_ATTRIBUTE);
-    IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance()
-        .createMappingProviderFactory(mappingProviderType);
+    IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance().createMappingProviderFactory(mappingProviderType);
     if (factory == null)
     {
       throw new IllegalArgumentException("Unknown mapping provider type: " + mappingProviderType); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index a7f1181fde..03c47966a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -88,8 +88,7 @@ public class HibernateUtil
     return mappingProviderFactoryInstance;
   }
 
-  public static void setMappingProviderFactoryInstance(
-      IHibernateMappingProvider.Factory theMappingProviderFactoryInstance)
+  public static void setMappingProviderFactoryInstance(IHibernateMappingProvider.Factory theMappingProviderFactoryInstance)
   {
     mappingProviderFactoryInstance = theMappingProviderFactoryInstance;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOCustomTypeUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOCustomTypeUserType.java
index 92e44a0834..22fe9c2d3a 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOCustomTypeUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOCustomTypeUserType.java
@@ -69,8 +69,7 @@ public class CDOCustomTypeUserType implements UserType, ParameterizedType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     try
     {
@@ -88,8 +87,7 @@ public class CDOCustomTypeUserType implements UserType, ParameterizedType
     }
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
index d6f187c173..ddf19ffcbc 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
@@ -40,8 +40,7 @@ public class CDOENumIntegerType extends CDOENumStringType
    * @see org.hibernate.usertype.UserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object)
    */
   @Override
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws HibernateException, SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws HibernateException, SQLException
   {
     final int value = rs.getInt(names[0]);
     if (rs.wasNull())
@@ -66,8 +65,7 @@ public class CDOENumIntegerType extends CDOENumStringType
    * @see org.hibernate.usertype.UserType#nullSafeSet(java.sql.PreparedStatement, java.lang.Object, int)
    */
   @Override
-  public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor)
-      throws HibernateException, SQLException
+  public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor) throws HibernateException, SQLException
   {
     if (value == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
index a1327f72e0..c7b6a2f800 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
@@ -144,8 +144,7 @@ public class CDOENumStringType implements UserType, ParameterizedType
    * (non-Javadoc)
    * @see org.hibernate.usertype.UserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object)
    */
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws HibernateException, SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws HibernateException, SQLException
   {
     final String literal = rs.getString(names[0]);
     if (rs.wasNull())
@@ -174,8 +173,7 @@ public class CDOENumStringType implements UserType, ParameterizedType
    * (non-Javadoc)
    * @see org.hibernate.usertype.UserType#nullSafeSet(java.sql.PreparedStatement, java.lang.Object, int)
    */
-  public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor)
-      throws HibernateException, SQLException
+  public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor sessionImplementor) throws HibernateException, SQLException
   {
     if (value == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDAnyUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDAnyUserType.java
index 55bdf9ac58..94b7d0ca63 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDAnyUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDAnyUserType.java
@@ -89,8 +89,7 @@ public class CDOIDAnyUserType implements UserType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     final String value = StandardBasicTypes.STRING.nullSafeGet(rs, names[1], sessionImplementor);
     if (rs.wasNull())
@@ -101,8 +100,7 @@ public class CDOIDAnyUserType implements UserType
     return deserializeId(entityName, value);
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     final String entityName;
     final CDOID localValue;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
index 1d779c56e6..93e5ce9c13 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
@@ -75,8 +75,7 @@ public class CDOIDExternalUserType implements UserType, ParameterizedType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet resultSet, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet resultSet, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     final String data = resultSet.getString(names[0]);
     if (data == null)
@@ -87,8 +86,7 @@ public class CDOIDExternalUserType implements UserType, ParameterizedType
     return CDOIDUtil.createExternal(data);
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     if (value == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
index 7e1eb37797..9e5df0bac9 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
@@ -73,8 +73,7 @@ public class CDOIDUserType implements UserType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     final String value = StandardBasicTypes.STRING.nullSafeGet(rs, names[0], sessionImplementor);
     if (rs.wasNull())
@@ -85,8 +84,7 @@ public class CDOIDUserType implements UserType
     return HibernateUtil.getInstance().convertStringToCDOID(value);
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     if (value == null || value instanceof CDOID && ((CDOID)value).isNull())
     {
@@ -107,8 +105,7 @@ public class CDOIDUserType implements UserType
       value = HibernateUtil.getInstance().getCDOIDHibernate((CDORevision)value);
     }
 
-    final String strValue = value instanceof String ? (String)value
-        : HibernateUtil.getInstance().convertCDOIDToString((CDOID)value);
+    final String strValue = value instanceof String ? (String)value : HibernateUtil.getInstance().convertCDOIDToString((CDOID)value);
     if (strValue == null)
     {
       statement.setNull(index, Types.VARCHAR);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
index fa29ed292b..ec3b4dff15 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
@@ -64,8 +64,7 @@ public class CDOInterceptor extends EMFInterceptor
   }
 
   @Override
-  public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState,
-      String[] propertyNames, Type[] types)
+  public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types)
   {
     return false;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOLobUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOLobUserType.java
index c8fd602f9b..d47d6a7987 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOLobUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOLobUserType.java
@@ -76,8 +76,7 @@ public abstract class CDOLobUserType implements UserType, ParameterizedType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     try
     {
@@ -95,8 +94,7 @@ public abstract class CDOLobUserType implements UserType, ParameterizedType
     }
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
index 27101e9dfa..3440dbe023 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
@@ -49,8 +49,7 @@ public class CDOManyAttributeGetter extends CDOPropertyGetter
   public Object get(Object target) throws HibernateException
   {
     // Check if there is already a persistentcollection
-    PersistentCollection collection = PersistableListHolder.getInstance().getListMapping(target,
-        getEStructuralFeature());
+    PersistentCollection collection = PersistableListHolder.getInstance().getListMapping(target, getEStructuralFeature());
     if (collection != null)
     {
       return collection;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
index f65f20da91..827432bbf5 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
@@ -49,8 +49,7 @@ public class CDOManyReferenceGetter extends CDOPropertyGetter
   public Object get(Object target) throws HibernateException
   {
     // Check if there is already a persistentcollection
-    PersistentCollection collection = PersistableListHolder.getInstance().getListMapping(target,
-        getEStructuralFeature());
+    PersistentCollection collection = PersistableListHolder.getInstance().getListMapping(target, getEStructuralFeature());
     if (collection != null)
     {
       return collection;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOMergeEventListener.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOMergeEventListener.java
index a9e0b64dc3..f7b933c73a 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOMergeEventListener.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOMergeEventListener.java
@@ -25,8 +25,7 @@ public class CDOMergeEventListener extends DefaultMergeEventListener
 
   @SuppressWarnings("rawtypes")
   @Override
-  protected void copyValues(final EntityPersister persister, final Object entity, final Object target,
-      final SessionImplementor source, final Map copyCache)
+  protected void copyValues(final EntityPersister persister, final Object entity, final Object target, final SessionImplementor source, final Map copyCache)
   {
     if (entity != target)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
index eddcfefdf2..ac04bb0777 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
@@ -39,9 +39,8 @@ public abstract class CDOPropertyHandler
     feature = tuplizer.getEClass().getEStructuralFeature(propertyName);
     if (getTracer().isEnabled())
     {
-      getTracer()
-          .trace("Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-              + propertyName);
+      getTracer().trace("Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+          + propertyName);
     }
 
     if (feature == null)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
index d18e0e9215..496218b311 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
@@ -50,8 +50,7 @@ public class CDOPropertySetter extends CDOPropertyHandler implements Setter
     if (eFeature instanceof EAttribute)
     {
       final EAttribute eAttribute = (EAttribute)eFeature;
-      if (eAttribute.getEAttributeType().getInstanceClass() != null
-          && byte[].class.isAssignableFrom(eAttribute.getEAttributeType().getInstanceClass()))
+      if (eAttribute.getEAttributeType().getInstanceClass() != null && byte[].class.isAssignableFrom(eAttribute.getEAttributeType().getInstanceClass()))
       {
         convertByteArray = true;
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java
index 1ae44957f0..bb17c71c16 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java
@@ -32,8 +32,8 @@ public class CDORevisionProxyFactory implements ProxyFactory
   }
 
   @SuppressWarnings("rawtypes")
-  public void postInstantiate(String entityName, Class persistentClass, Set interfaces, Method getIdentifierMethod,
-      Method setIdentifierMethod, CompositeType componentIdType) throws HibernateException
+  public void postInstantiate(String entityName, Class persistentClass, Set interfaces, Method getIdentifierMethod, Method setIdentifierMethod,
+      CompositeType componentIdType) throws HibernateException
   {
     this.entityName = entityName;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
index 4e15ca1298..596f5e5274 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
@@ -223,8 +223,7 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
     else
     {
       EStructuralFeature feature = getEClass().getEStructuralFeature(mappedProperty.getName());
-      if (feature instanceof EReference && feature.isMany()
-          && HibernateUtil.getInstance().isCDOResourceContents(feature))
+      if (feature instanceof EReference && feature.isMany() && HibernateUtil.getInstance().isCDOResourceContents(feature))
       {
         getter = new CDOManyAttributeGetter(this, mappedProperty.getName());
       }
@@ -290,8 +289,7 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
     else
     {
       EStructuralFeature feature = getEClass().getEStructuralFeature(mappedProperty.getName());
-      if (feature instanceof EReference && feature.isMany()
-          && HibernateUtil.getInstance().isCDOResourceContents(feature))
+      if (feature instanceof EReference && feature.isMany() && HibernateUtil.getInstance().isCDOResourceContents(feature))
       {
         setter = new CDOManyAttributeSetter(this, mappedProperty.getName());
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java
index 425cefbb61..4fc54c9b18 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java
@@ -70,8 +70,7 @@ public class CDOTypeUserType implements UserType
     return x.equals(y);
   }
 
-  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner)
-      throws SQLException
+  public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessionImplementor, Object owner) throws SQLException
   {
     Integer value = StandardBasicTypes.INTEGER.nullSafeGet(rs, names[0], sessionImplementor);
     if (rs.wasNull())
@@ -87,8 +86,7 @@ public class CDOTypeUserType implements UserType
     return CDOModelUtil.getType((byte)(int)value);
   }
 
-  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor)
-      throws SQLException
+  public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor sessionImplementor) throws SQLException
   {
     if (value != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
index d06abafaef..e0daf29328 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
@@ -131,8 +131,7 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso
     }
     if (ePackage == null)
     {
-      throw new IllegalArgumentException(
-          "EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$
+      throw new IllegalArgumentException("EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     final EClass eClass = (EClass)ePackage.getEClassifier(eClassName);
@@ -158,7 +157,6 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso
   {
     final EStructuralFeature eFeature = fmEntry.getEStructuralFeature();
     final EClass eClass = eFeature.getEContainingClass();
-    return eClass.getEPackage().getNsURI() + EFEATURE_SEPARATOR + eClass.getName() + EFEATURE_SEPARATOR
-        + eFeature.getName();
+    return eClass.getEPackage().getNsURI() + EFEATURE_SEPARATOR + eClass.getName() + EFEATURE_SEPARATOR + eFeature.getName();
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java
index 6c1af25c1b..134e4d6960 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java
@@ -197,8 +197,7 @@ public class WrappedHibernateList implements InternalCDOList
   public List<Object> getDelegate()
   {
     // if we got disconnected then internally use a new autoexpanding list
-    if (delegate instanceof AbstractPersistentCollection && !((AbstractPersistentCollection)delegate).wasInitialized()
-        && !isConnectedToSession())
+    if (delegate instanceof AbstractPersistentCollection && !((AbstractPersistentCollection)delegate).wasInitialized() && !isConnectedToSession())
     {
       delegate = new UninitializedCollection<Object>()
       {
@@ -244,8 +243,7 @@ public class WrappedHibernateList implements InternalCDOList
   {
     final AbstractPersistentCollection persistentCollection = (AbstractPersistentCollection)delegate;
     final SessionImplementor session = persistentCollection.getSession();
-    return session != null && session.isOpen()
-        && session.getPersistenceContext().containsCollection(persistentCollection);
+    return session != null && session.isOpen() && session.getPersistenceContext().containsCollection(persistentCollection);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
index 03c5936c98..78a42b9809 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
@@ -151,8 +151,7 @@ public class XMLUserType implements UserType
     return "String"; //$NON-NLS-1$
   }
 
-  public Object nullSafeGet(ResultSet arg0, java.lang.String[] arg1, SessionImplementor sessionImplementor, Object arg2)
-      throws HibernateException, SQLException
+  public Object nullSafeGet(ResultSet arg0, java.lang.String[] arg1, SessionImplementor sessionImplementor, Object arg2) throws HibernateException, SQLException
   {
     final Object value = arg0.getObject(arg1[0]);
     if (arg0.wasNull())
@@ -163,8 +162,7 @@ public class XMLUserType implements UserType
     return convertToString(value);
   }
 
-  public void nullSafeSet(PreparedStatement arg0, Object arg1, int arg2, SessionImplementor sessionImplementor)
-      throws HibernateException, SQLException
+  public void nullSafeSet(PreparedStatement arg0, Object arg1, int arg2, SessionImplementor sessionImplementor) throws HibernateException, SQLException
   {
     if (arg1 == null)
     {
@@ -274,15 +272,13 @@ public class XMLUserType implements UserType
       {
         return super.convertToString(value);
       }
-      return super.convertToString(
-          HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, false));
+      return super.convertToString(HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, false));
     }
 
     @Override
     protected Object convertToObject(java.lang.String value)
     {
-      return new java.sql.Date(
-          ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
+      return new java.sql.Date(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
     }
 
     @Override
@@ -301,15 +297,13 @@ public class XMLUserType implements UserType
       {
         return super.convertToString(value);
       }
-      return super.convertToString(
-          HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true));
+      return super.convertToString(HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true));
     }
 
     @Override
     protected Object convertToObject(java.lang.String value)
     {
-      return new java.sql.Timestamp(
-          ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
+      return new java.sql.Timestamp(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
index 1175651377..bf1175e149 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
@@ -70,8 +70,7 @@ import java.io.IOException;
 /**
  * @author Eike Stepper
  */
-public class LissomeFileHandle extends DataInputOutputFile
-    implements CDODataInput, CDODataOutput, LissomeFile.RevisionProvider
+public class LissomeFileHandle extends DataInputOutputFile implements CDODataInput, CDODataOutput, LissomeFile.RevisionProvider
 {
   private LissomeFile file;
 
@@ -442,8 +441,7 @@ public class LissomeFileHandle extends DataInputOutputFile
     return new CDODataOutputImpl(extendedDataOutput)
     {
       @Override
-      public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext)
-          throws IOException
+      public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException
       {
         boolean detached = revision instanceof DetachedCDORevision;
         writeBoolean(detached);
@@ -603,8 +601,7 @@ public class LissomeFileHandle extends DataInputOutputFile
     out().writeCDORevision(revision, referenceChunk);
   }
 
-  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext)
-      throws IOException
+  public void writeCDORevision(CDORevision revision, int referenceChunk, CDOBranchPoint securityContext) throws IOException
   {
     out().writeCDORevision(revision, referenceChunk, securityContext);
   }
@@ -614,8 +611,7 @@ public class LissomeFileHandle extends DataInputOutputFile
     out().writeCDORevisable(revisable);
   }
 
-  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk)
-      throws IOException
+  public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk) throws IOException
   {
     out().writeCDOList(owner, feature, list, referenceChunk);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
index 0785cb0978..67181d5e61 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
@@ -64,8 +64,8 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class LissomeStore extends Store implements ILissomeStore, CDOAllRevisionsProvider, IDBConnectionProvider,
-    NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
+public class LissomeStore extends Store
+    implements ILissomeStore, CDOAllRevisionsProvider, IDBConnectionProvider, NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
 {
   public static final String TYPE = "lissome"; //$NON-NLS-1$
 
@@ -293,23 +293,22 @@ public class LissomeStore extends Store implements ILissomeStore, CDOAllRevision
 
     try
     {
-      accessor.handleRevisions(null, null, CDOBranchPoint.UNSPECIFIED_DATE, true,
-          new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+      accessor.handleRevisions(null, null, CDOBranchPoint.UNSPECIFIED_DATE, true, new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+      {
+        public boolean handleRevision(CDORevision revision)
+        {
+          CDOBranch branch = revision.getBranch();
+          List<CDORevision> list = result.get(branch);
+          if (list == null)
           {
-            public boolean handleRevision(CDORevision revision)
-            {
-              CDOBranch branch = revision.getBranch();
-              List<CDORevision> list = result.get(branch);
-              if (list == null)
-              {
-                list = new ArrayList<CDORevision>();
-                result.put(branch, list);
-              }
-
-              list.add(revision);
-              return true;
-            }
-          }));
+            list = new ArrayList<CDORevision>();
+            result.put(branch, list);
+          }
+
+          list.add(revision);
+          return true;
+        }
+      }));
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
index 60e3e8c7e3..a0be492702 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreReader.java
@@ -140,8 +140,7 @@ public class LissomeStoreReader extends StoreAccessorBase implements ILissomeSto
     return journal.loadPackageUnit(packageUnit);
   }
 
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     Optimizer optimizer = getStore().getOptimizer();
     InternalCDORevision revision = optimizer.readRevision(id, branchPoint);
@@ -164,8 +163,7 @@ public class LissomeStoreReader extends StoreAccessorBase implements ILissomeSto
     return readRevision(info);
   }
 
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     RevisionInfo info = indexReader.readRevisionByVersion(id, branchVersion);
     return readRevision(info);
@@ -217,8 +215,7 @@ public class LissomeStoreReader extends StoreAccessorBase implements ILissomeSto
     }
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      final CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, final CDORevisionHandler handler)
   {
     indexReader.handleRevisions(eClass, branch, timeStamp, exactTime, new RevisionInfo.Handler()
     {
@@ -424,15 +421,13 @@ public class LissomeStoreReader extends StoreAccessorBase implements ILissomeSto
     return Pair.create(branchID, branchInfo.getBaseTimeStamp());
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks) throws LockAreaAlreadyExistsException
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks) throws LockAreaAlreadyExistsException
   {
     // Implemented in LissomeStoreWriter
     throw new UnsupportedOperationException();
   }
 
-  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     // Implemented in LissomeStoreWriter
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreWriter.java
index fec0b3c377..570ecd1aaa 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreWriter.java
@@ -38,8 +38,7 @@ public class LissomeStoreWriter extends LissomeStoreReader
 
   @Deprecated
   @Override
-  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     // TODO: implement LissomeStoreWriter.createLockArea(durableLockingID, userID, branchPoint, readOnly, locks)
     throw new UnsupportedOperationException();
@@ -79,8 +78,7 @@ public class LissomeStoreWriter extends LissomeStoreReader
 
   @Deprecated
   @Override
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks) throws LockAreaAlreadyExistsException
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks) throws LockAreaAlreadyExistsException
   {
     // TODO: implement LissomeStoreWriter.createLockArea(userID, branchPoint, readOnly, locks)
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
index acd7f570c4..6c5f98577c 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexReader.java
@@ -277,8 +277,7 @@ public class IndexReader implements IDBConnectionProvider
     }
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      RevisionInfo.Handler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, RevisionInfo.Handler handler)
   {
     if (TRACER.isEnabled())
     {
@@ -294,8 +293,7 @@ public class IndexReader implements IDBConnectionProvider
       boolean withTime = timeStamp != CDOBranchPoint.INVALID_DATE;
       boolean historical = timeStamp != CDOBranchPoint.UNSPECIFIED_DATE;
 
-      int stmtIndex = (withClass ? 0 : 1) + (withBranch ? 0 : 2) + (withTime ? 0 : 4) + (exactTime ? 0 : 8)
-          + (historical ? 0 : 16);
+      int stmtIndex = (withClass ? 0 : 1) + (withBranch ? 0 : 2) + (withTime ? 0 : 4) + (exactTime ? 0 : 8) + (historical ? 0 : 16);
 
       PreparedStatement stmt = handleRevisionsStatements[stmtIndex];
       if (stmt == null)
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
index 1d2b3f1fb5..ed2be2c8f1 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/IndexWriter.java
@@ -267,8 +267,7 @@ public class IndexWriter extends IndexReader
     }
   }
 
-  public void detachObjects(CDOBranchPoint branchPoint, CDOID[] ids, InternalCDORevision[] detachedRevisions,
-      long[] detachedObjectPointers)
+  public void detachObjects(CDOBranchPoint branchPoint, CDOID[] ids, InternalCDORevision[] detachedRevisions, long[] detachedObjectPointers)
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
index 4c4533ab18..babff634de 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
@@ -115,8 +115,7 @@ public class LissomeBrowserPage extends AbstractPage
     try
     {
       String order = browser.getParam("order");
-      executeQuery(browser, pout, connection,
-          "SELECT * FROM " + table + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
+      executeQuery(browser, pout, connection, "SELECT * FROM " + table + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/ObjectsTable.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/ObjectsTable.java
index d0f2093784..81844c7031 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/ObjectsTable.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/ObjectsTable.java
@@ -174,8 +174,7 @@ public class ObjectsTable extends Table
     return builder.toString();
   }
 
-  protected String sqlHandleRevisions(boolean withClass, boolean withBranch, boolean withTime, boolean exactTime,
-      boolean historical)
+  protected String sqlHandleRevisions(boolean withClass, boolean withBranch, boolean withTime, boolean exactTime, boolean historical)
   {
     StringBuilder builder = new StringBuilder();
     builder.append("SELECT ");
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
index 8400ebca7f..6f97f2a194 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/file/Journal.java
@@ -355,8 +355,7 @@ public class Journal extends LissomeFile
     }
   }
 
-  protected void writePackageUnits(LissomeFileHandle writer, InternalCDOPackageUnit[] packageUnits, OMMonitor monitor)
-      throws IOException
+  protected void writePackageUnits(LissomeFileHandle writer, InternalCDOPackageUnit[] packageUnits, OMMonitor monitor) throws IOException
   {
     writer.writeInt(packageUnits.length);
     for (InternalCDOPackageUnit packageUnit : packageUnits)
@@ -475,8 +474,7 @@ public class Journal extends LissomeFile
 
             if (detachedRevisions != null)
             {
-              int version = branchVersion.getBranch() == transactionBranch ? branchVersion.getVersion() + 1
-                  : CDOBranchVersion.FIRST_VERSION;
+              int version = branchVersion.getBranch() == transactionBranch ? branchVersion.getVersion() + 1 : CDOBranchVersion.FIRST_VERSION;
 
               detachedRevisions[i] = new DetachedCDORevision(eClass, id, transactionBranch, version, timeStamp);
             }
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
index bf019c98d9..26ff5414f5 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/optimizer/Optimizer.java
@@ -195,8 +195,7 @@ public class Optimizer extends Lifecycle
     return cache.readRevision(id, branchPoint);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     // TODO: implement Optimizer.handleRevisions(eClass, branch, timeStamp, exactTime, handler)
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
index f0aad8462d..8f6dc475a5 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
@@ -149,8 +149,7 @@ public class Commits extends Coll
     idHandler = store.getIDHandler();
   }
 
-  public void writePackageUnits(MongoDBStoreAccessor mongoDBStoreAccessor, InternalCDOPackageUnit[] packageUnits,
-      OMMonitor monitor)
+  public void writePackageUnits(MongoDBStoreAccessor mongoDBStoreAccessor, InternalCDOPackageUnit[] packageUnits, OMMonitor monitor)
   {
     // This must be the first commit into the repo.
     systemPackageUnits = packageUnits;
@@ -413,8 +412,7 @@ public class Commits extends Coll
     }
   }
 
-  private void marshalRevisions(List<DBObject> docs, InternalCommitContext context, InternalCDORevision[] revisions,
-      CDOChangeKind changeKind)
+  private void marshalRevisions(List<DBObject> docs, InternalCommitContext context, InternalCDORevision[] revisions, CDOChangeKind changeKind)
   {
     for (InternalCDORevision revision : revisions)
     {
@@ -423,8 +421,7 @@ public class Commits extends Coll
     }
   }
 
-  private DBObject marshallRevision(InternalCommitContext context, InternalCDORevision revision,
-      CDOChangeKind changeKind)
+  private DBObject marshallRevision(InternalCommitContext context, InternalCDORevision revision, CDOChangeKind changeKind)
   {
     boolean resource = !(revision instanceof SyntheticCDORevision) && revision.isResource();
     if (resource && resourceNameFeature == null)
@@ -674,8 +671,7 @@ public class Commits extends Coll
     return CDOBranchPoint.UNSPECIFIED_DATE;
   }
 
-  public InternalCDORevision readRevision(final CDOID id, final CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(final CDOID id, final CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     final CDOBranch branch = branchPoint.getBranch();
     final long timeStamp = branchPoint.getTimeStamp();
@@ -736,8 +732,7 @@ public class Commits extends Coll
     }
   }
 
-  public InternalCDORevision readRevisionByVersion(final CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(final CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     DBObject query = new BasicDBObject();
     idHandler.write(query, REVISIONS + "." + REVISIONS_ID, id);
@@ -921,8 +916,7 @@ public class Commits extends Coll
         String user = (String)doc.get(COMMITS_USER);
         String comment = (String)doc.get(COMMITS_COMMENT);
 
-        CDOCommitInfo commitInfo = commitManager.createCommitInfo(commitBranch, time, previous, user, comment, null,
-            null);
+        CDOCommitInfo commitInfo = commitManager.createCommitInfo(commitBranch, time, previous, user, comment, null, null);
         handler.handleCommitInfo(commitInfo);
         return null;
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
index 5b7daee952..49001818f0 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
@@ -87,20 +87,17 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return commits.loadPackageUnit(packageUnit);
   }
 
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     return commits.readRevision(id, branchPoint, listChunk, cache);
   }
 
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     return commits.readRevisionByVersion(id, branchVersion, listChunk, cache);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     throw new UnsupportedOperationException("Not yet implemented"); // TODO Implement me
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
index a22181798b..37fa9d40a9 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
@@ -93,26 +93,22 @@ public class CDOServerProtocol extends SignalProtocol<InternalSession> implement
   }
 
   @Deprecated
-  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken)
-      throws Exception
+  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception
   {
     throw new UnsupportedOperationException();
   }
 
   public Response sendAuthenticationChallenge(Challenge challenge) throws Exception
   {
-    return new AuthenticationRequest(this, CDOProtocolConstants.SIGNAL_AUTHENTICATION, challenge)
-        .send(negotiationTimeout, new Monitor());
+    return new AuthenticationRequest(this, CDOProtocolConstants.SIGNAL_AUTHENTICATION, challenge).send(negotiationTimeout, new Monitor());
   }
 
-  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation)
-      throws Exception
+  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation) throws Exception
   {
     return new CredentialsChallengeRequest(this, challenge, userID, operation).send(negotiationTimeout, new Monitor());
   }
 
-  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
-      throws Exception
+  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType) throws Exception
   {
     if (LifecycleUtil.isActive(getChannel()))
     {
@@ -125,14 +121,12 @@ public class CDOServerProtocol extends SignalProtocol<InternalSession> implement
   }
 
   @Deprecated
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
-      throws Exception
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState) throws Exception
   {
     sendRepositoryStateNotification(oldState, newState, null);
   }
 
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID) throws Exception
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID) throws Exception
   {
     if (LifecycleUtil.isActive(getChannel()))
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
index 78d7eadfde..99b9c50721 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
@@ -137,8 +137,8 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
     InternalCDORevision[] newObjects = new InternalCDORevision[in.readInt()];
     InternalCDORevisionDelta[] dirtyObjectDeltas = new InternalCDORevisionDelta[in.readInt()];
     CDOID[] detachedObjects = new CDOID[in.readInt()];
-    monitor.begin(locksOnNewObjects.length + idsToUnlock.length + newPackageUnits.length + newObjects.length
-        + dirtyObjectDeltas.length + detachedObjects.length);
+    monitor
+        .begin(locksOnNewObjects.length + idsToUnlock.length + newPackageUnits.length + newObjects.length + dirtyObjectDeltas.length + detachedObjects.length);
 
     try
     {
@@ -352,8 +352,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
     }
   }
 
-  protected boolean respondingException(CDODataOutput out, byte rollbackReason, String rollbackMessage,
-      List<CDOIDReference> xRefs) throws Exception
+  protected boolean respondingException(CDODataOutput out, byte rollbackReason, String rollbackMessage, List<CDOIDReference> xRefs) throws Exception
   {
     boolean success = rollbackMessage == null;
     out.writeBoolean(success);
@@ -444,8 +443,8 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
     out.writeBoolean(false);
   }
 
-  protected void respondingNewPermissions(CDODataOutput out, IPermissionManager permissionManager,
-      InternalSession session, InternalCDORevision[] revisions) throws Exception
+  protected void respondingNewPermissions(CDODataOutput out, IPermissionManager permissionManager, InternalSession session, InternalCDORevision[] revisions)
+      throws Exception
   {
     int size = revisions.length;
     if (size != 0)
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
index ebdd787472..9419608edd 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
@@ -31,8 +31,7 @@ import java.util.concurrent.ExecutionException;
  */
 public class CommitXATransactionPhase2Indication extends CommitTransactionIndication
 {
-  private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL,
-      CommitXATransactionPhase2Indication.class);
+  private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitXATransactionPhase2Indication.class);
 
   public CommitXATransactionPhase2Indication(CDOServerProtocol protocol)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
index e1dedffcdc..207ce173cd 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
@@ -37,8 +37,7 @@ public class CommitXATransactionPhase3Indication extends CommitTransactionIndica
   protected void responding(CDODataOutput out, OMMonitor monitor) throws Exception
   {
     commitContext.commit(monitor);
-    boolean success = respondingException(out, CDOProtocolConstants.ROLLBACK_REASON_UNKNOWN,
-        commitContext.getRollbackMessage(), null);
+    boolean success = respondingException(out, CDOProtocolConstants.ROLLBACK_REASON_UNKNOWN, commitContext.getRollbackMessage(), null);
     commitContext.postCommit(success);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
index 41147774ad..6aae574a93 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
@@ -48,8 +48,7 @@ public class CreateBranchIndication extends CDOServerWriteIndication
   {
     InternalCDOBranchManager branchManager = getRepository().getBranchManager();
     InternalCDOBranch baseBranch = branchManager.getBranch(branchInfo.getBaseBranchID());
-    InternalCDOBranch branch = branchManager.createBranch(branchID, branchInfo.getName(), baseBranch,
-        branchInfo.getBaseTimeStamp());
+    InternalCDOBranch branch = branchManager.createBranch(branchID, branchInfo.getName(), baseBranch, branchInfo.getBaseTimeStamp());
 
     InternalSession session = getSession();
     InternalSessionManager sessionManager = getRepository().getSessionManager();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CredentialsChallengeRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CredentialsChallengeRequest.java
index 1c28697500..2a240b97d2 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CredentialsChallengeRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CredentialsChallengeRequest.java
@@ -37,8 +37,7 @@ public class CredentialsChallengeRequest extends RequestWithMonitoring<Response>
 
   private CredentialsUpdateOperation operation;
 
-  public CredentialsChallengeRequest(CDOServerProtocol protocol, Challenge challenge, String userID,
-      CredentialsUpdateOperation operation)
+  public CredentialsChallengeRequest(CDOServerProtocol protocol, Challenge challenge, String userID, CredentialsUpdateOperation operation)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_CREDENTIALS_CHALLENGE);
     this.challenge = challenge;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
index 3ca147a1de..04f7b14d88 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
@@ -93,29 +93,28 @@ public class HandleRevisionsIndication extends CDOServerReadIndication
     final IOException[] ioException = { null };
     final RuntimeException[] runtimeException = { null };
 
-    getRepository().handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime,
-        new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+    getRepository().handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+    {
+      public boolean handleRevision(CDORevision revision)
+      {
+        try
+        {
+          out.writeBoolean(true);
+          out.writeCDORevision(revision, CDORevision.UNCHUNKED); // Exposes revision to client side
+          return true;
+        }
+        catch (IOException ex)
         {
-          public boolean handleRevision(CDORevision revision)
-          {
-            try
-            {
-              out.writeBoolean(true);
-              out.writeCDORevision(revision, CDORevision.UNCHUNKED); // Exposes revision to client side
-              return true;
-            }
-            catch (IOException ex)
-            {
-              ioException[0] = ex;
-            }
-            catch (RuntimeException ex)
-            {
-              runtimeException[0] = ex;
-            }
-
-            return false;
-          }
-        }));
+          ioException[0] = ex;
+        }
+        catch (RuntimeException ex)
+        {
+          runtimeException[0] = ex;
+        }
+
+        return false;
+      }
+    }));
 
     if (ioException[0] != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
index dd1ca82a71..ca6b60236e 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
@@ -87,8 +87,7 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
     }
   }
 
-  private CDORevisionAvailabilityInfo readRevisionAvailabilityInfo(CDODataInput in, OMMonitor monitor)
-      throws IOException
+  private CDORevisionAvailabilityInfo readRevisionAvailabilityInfo(CDODataInput in, OMMonitor monitor) throws IOException
   {
     if (in.readBoolean())
     {
@@ -127,8 +126,7 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
     try
     {
       InternalRepository repository = getRepository();
-      MergeDataResult result = repository.getMergeData2(targetInfo, sourceInfo, targetBaseInfo, sourceBaseInfo,
-          monitor.fork());
+      MergeDataResult result = repository.getMergeData2(targetInfo, sourceInfo, targetBaseInfo, sourceBaseInfo, monitor.fork());
 
       Set<CDOID> targetIDs = result.getTargetIDs();
       Set<CDOID> targetAndSourceIDs = new HashSet<CDOID>();
@@ -203,8 +201,8 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
     }
   }
 
-  private void writeRevisionAvailabilityInfo(final CDODataOutput out, CDORevisionAvailabilityInfo info,
-      Set<CDORevisionKey> writtenRevisions, OMMonitor monitor) throws IOException
+  private void writeRevisionAvailabilityInfo(final CDODataOutput out, CDORevisionAvailabilityInfo info, Set<CDORevisionKey> writtenRevisions, OMMonitor monitor)
+      throws IOException
   {
     Collection<CDORevisionKey> revisions = info.getAvailableRevisions().values();
     for (Iterator<CDORevisionKey> it = revisions.iterator(); it.hasNext();)
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
index 18485b7d97..4914b61ce7 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
@@ -29,8 +29,7 @@ import java.io.IOException;
  */
 public class LoadRevisionByVersionIndication extends CDOServerReadIndication
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL,
-      LoadRevisionByVersionIndication.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadRevisionByVersionIndication.class);
 
   private CDOID id;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
index 60936a96ce..ff9957f1de 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
@@ -179,8 +179,7 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
 
     if (prefetchDepth != 0)
     {
-      prefetchRevisions(prefetchDepth > 0 ? prefetchDepth : Integer.MAX_VALUE, revisions, additionalRevisionInfos,
-          additionalRevisions);
+      prefetchRevisions(prefetchDepth > 0 ? prefetchDepth : Integer.MAX_VALUE, revisions, additionalRevisionInfos, additionalRevisions);
     }
 
     getRepository().notifyReadAccessHandlers(getSession(), revisions, additionalRevisions);
@@ -217,9 +216,8 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
     return info;
   }
 
-  private void collectRevisions(InternalCDORevision revision, Set<CDOID> revisions,
-      List<RevisionInfo> additionalRevisionInfos, List<CDORevision> additionalRevisions,
-      Set<CDOFetchRule> visitedFetchRules)
+  private void collectRevisions(InternalCDORevision revision, Set<CDOID> revisions, List<RevisionInfo> additionalRevisionInfos,
+      List<CDORevision> additionalRevisions, Set<CDOFetchRule> visitedFetchRules)
   {
     if (revision == null)
     {
@@ -257,8 +255,7 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
                 additionalRevisionInfos.add(info);
                 revisions.add(containedRevision.getID());
                 additionalRevisions.add(containedRevision);
-                collectRevisions(containedRevision, revisions, additionalRevisionInfos, additionalRevisions,
-                    visitedFetchRules);
+                collectRevisions(containedRevision, revisions, additionalRevisionInfos, additionalRevisions, visitedFetchRules);
               }
             }
           }
@@ -278,8 +275,7 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
             {
               revisions.add(containedRevision.getID());
               additionalRevisions.add(containedRevision);
-              collectRevisions(containedRevision, revisions, additionalRevisionInfos, additionalRevisions,
-                  visitedFetchRules);
+              collectRevisions(containedRevision, revisions, additionalRevisionInfos, additionalRevisions, visitedFetchRules);
             }
           }
         }
@@ -289,8 +285,7 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
     visitedFetchRules.remove(fetchRule);
   }
 
-  private void prefetchRevisions(int depth, CDORevision[] revisions, List<RevisionInfo> additionalRevisionInfos,
-      List<CDORevision> additionalRevisions)
+  private void prefetchRevisions(int depth, CDORevision[] revisions, List<RevisionInfo> additionalRevisionInfos, List<CDORevision> additionalRevisions)
   {
     Map<CDOID, CDORevision> map = CDOIDUtil.createMap();
     for (CDORevision revision : revisions)
@@ -309,8 +304,8 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
     }
   }
 
-  private void prefetchRevision(int depth, InternalCDORevision revision, List<RevisionInfo> additionalRevisionInfos,
-      List<CDORevision> additionalRevisions, Map<CDOID, CDORevision> map)
+  private void prefetchRevision(int depth, InternalCDORevision revision, List<RevisionInfo> additionalRevisionInfos, List<CDORevision> additionalRevisions,
+      Map<CDOID, CDORevision> map)
   {
     CDOClassInfo classInfo = revision.getClassInfo();
     for (EStructuralFeature feature : classInfo.getAllPersistentFeatures())
@@ -346,8 +341,8 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
     }
   }
 
-  private void prefetchRevisionChild(int depth, CDOID id, List<RevisionInfo> additionalRevisionInfos,
-      List<CDORevision> additionalRevisions, Map<CDOID, CDORevision> map)
+  private void prefetchRevisionChild(int depth, CDOID id, List<RevisionInfo> additionalRevisionInfos, List<CDORevision> additionalRevisions,
+      Map<CDOID, CDORevision> map)
   {
     if (CDOIDUtil.isNull(id))
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
index 41b0b9d78b..31149339d5 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
@@ -46,8 +46,7 @@ public class LoadSubBranchesIndication extends CDOServerReadIndication
     out.writeInt(branches.length);
     for (InternalCDOBranch subBranch : branches)
     {
-      SubBranchInfo info = new SubBranchInfo(subBranch.getID(), subBranch.getName(),
-          subBranch.getBase().getTimeStamp());
+      SubBranchInfo info = new SubBranchInfo(subBranch.getID(), subBranch.getName(), subBranch.getBase().getTimeStamp());
       info.write(out);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
index 141c7b1c4e..6a37ed6f0c 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
@@ -116,8 +116,7 @@ public class RefreshSessionIndication extends CDOServerReadIndication
     writeChangedObject(out, revision, null);
   }
 
-  protected void writeChangedObject(CDODataOutput out, InternalCDORevision revision, CDOBranchPoint securityContext)
-      throws IOException
+  protected void writeChangedObject(CDODataOutput out, InternalCDORevision revision, CDOBranchPoint securityContext) throws IOException
   {
     out.writeByte(CDOProtocolConstants.REFRESH_CHANGED_OBJECT);
     out.writeCDORevision(revision, initialChunkSize, securityContext); // Exposes revision to client side
@@ -153,8 +152,7 @@ public class RefreshSessionIndication extends CDOServerReadIndication
       {
         CDOID id = key.getID();
         synthetics[0] = null;
-        InternalCDORevision revision = revisionManager.getRevision(id, head, CDORevision.UNCHUNKED,
-            CDORevision.DEPTH_NONE, true, synthetics);
+        InternalCDORevision revision = revisionManager.getRevision(id, head, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
 
         if (revision == null)
         {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
index 9be9677798..28976542f8 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
@@ -27,15 +27,13 @@ import java.io.IOException;
  */
 public class RemoteMessageNotificationRequest extends CDOServerRequest
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL,
-      RemoteMessageNotificationRequest.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageNotificationRequest.class);
 
   private int senderID;
 
   private CDORemoteSessionMessage message;
 
-  public RemoteMessageNotificationRequest(CDOServerProtocol serverProtocol, InternalSession sender,
-      CDORemoteSessionMessage message)
+  public RemoteMessageNotificationRequest(CDOServerProtocol serverProtocol, InternalSession sender, CDORemoteSessionMessage message)
   {
     super(serverProtocol, CDOProtocolConstants.SIGNAL_REMOTE_MESSAGE_NOTIFICATION);
     senderID = sender.getSessionID();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryStateNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryStateNotificationRequest.java
index 8b666a7114..8443f1278f 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryStateNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryStateNotificationRequest.java
@@ -30,8 +30,8 @@ public class RepositoryStateNotificationRequest extends CDOServerRequest
 
   private final CDOID rootResourceID;
 
-  public RepositoryStateNotificationRequest(CDOServerProtocol serverProtocol, CDOCommonRepository.State oldState,
-      CDOCommonRepository.State newState, CDOID rootResourceID)
+  public RepositoryStateNotificationRequest(CDOServerProtocol serverProtocol, CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
+      CDOID rootResourceID)
   {
     super(serverProtocol, CDOProtocolConstants.SIGNAL_REPOSITORY_STATE_NOTIFICATION);
     this.oldState = oldState;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTypeNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTypeNotificationRequest.java
index 06a3b34e18..8c2179f660 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTypeNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTypeNotificationRequest.java
@@ -27,8 +27,7 @@ public class RepositoryTypeNotificationRequest extends CDOServerRequest
 
   private CDOCommonRepository.Type newType;
 
-  public RepositoryTypeNotificationRequest(CDOServerProtocol serverProtocol, CDOCommonRepository.Type oldType,
-      CDOCommonRepository.Type newType)
+  public RepositoryTypeNotificationRequest(CDOServerProtocol serverProtocol, CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
   {
     super(serverProtocol, CDOProtocolConstants.SIGNAL_REPOSITORY_TYPE_NOTIFICATION);
     this.oldType = oldType;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java
index bdaf740e77..024f5b2d8b 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java
@@ -25,8 +25,7 @@ import java.io.IOException;
  */
 public class UnsubscribeRemoteSessionsIndication extends CDOServerReadIndication
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL,
-      UnsubscribeRemoteSessionsIndication.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, UnsubscribeRemoteSessionsIndication.class);
 
   public UnsubscribeRemoteSessionsIndication(CDOServerProtocol protocol)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverAgent.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverAgent.java
index a083815836..99125ca363 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverAgent.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverAgent.java
@@ -262,8 +262,7 @@ public abstract class FailoverAgent extends Lifecycle implements CDOSessionConfi
     return CDOServerUtil.createRepositorySynchronizer(this);
   }
 
-  protected abstract CDOSessionConfiguration createSessionConfiguration(String connectorDescription,
-      String repositoryName);
+  protected abstract CDOSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName);
 
   /**
    * The agent-side implementation of the {@link FailoverMonitor fail-over monitor} protocol.
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
index 7117dd853d..8b395a26a8 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
@@ -243,8 +243,7 @@ public class FailoverMonitor extends Container<AgentProtocol>
    *
    * @author Eike Stepper
    */
-  public static abstract class AbstractServerProtocolFactory extends ServerProtocolFactory
-      implements FailoverMonitor.Provider
+  public static abstract class AbstractServerProtocolFactory extends ServerProtocolFactory implements FailoverMonitor.Provider
   {
     private IManagedContainer container;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
index a1f74db484..465ba67364 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
@@ -90,8 +90,7 @@ public class ObjectivityStore extends Store implements IObjectivityStore
     // RevisionTemporality.NONE, RevisionTemporality.AUDITING),
     // set(RevisionParallelism.NONE));
     // setRevisionTemporality(RevisionTemporality.AUDITING);
-    super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA),
-        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
+    super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
         set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
     storeConfig = config;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
index eb9e2c9695..232e1c866c 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
@@ -197,10 +197,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       for (CDOID id : detachedObjects)
       {
 
-        InternalCDORevision revision = revisionManager.getRevision(id, branch.getHead(), CDORevision.UNCHUNKED,
-            CDORevision.DEPTH_NONE, true);
-        int version = ObjectUtil.equals(branch, revision.getBranch()) ? revision.getVersion()
-            : CDOBranchVersion.FIRST_VERSION;
+        InternalCDORevision revision = revisionManager.getRevision(id, branch.getHead(), CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
+        int version = ObjectUtil.equals(branch, revision.getBranch()) ? revision.getVersion() : CDOBranchVersion.FIRST_VERSION;
 
         detachObject(id, version, branch, timeStamp);
       }
@@ -234,8 +232,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: " + version
-          + " in Branch: " + branch.getID() + " and timeStamp: " + timeStamp);
+      TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: " + version + " in Branch: " + branch.getID()
+          + " and timeStamp: " + timeStamp);
     }
 
     if (getStore().isRequiredToSupportAudits())
@@ -244,8 +242,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       {
         // pick the proper version of that branch to revise it. Otherwise, the detached version will
         // be in a different branch.
-        ObjyObject objyRevision = objyObject.getRevisionByVersion(version, branch.getID(),
-            objySession.getObjectManager());
+        ObjyObject objyRevision = objyObject.getRevisionByVersion(version, branch.getID(), objySession.getObjectManager());
         if (objyRevision.getVersion() < 0)
         {
           TRACER_DEBUG.trace("... OBJ is already detached...");
@@ -290,8 +287,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       ITransaction cdoTrx = getTransaction();
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG
-            .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString()));
+        TRACER_DEBUG.trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString()));
       }
       if (cdoTrx != null)
       {
@@ -316,8 +312,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       objySession = getStore().getConnection().getReadSessionFromPool(sessionName + "_" + getRepositoryName());
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG.trace("  getObjySession from read pool, session: " + objySession.toString() + " - isOpen: "
-            + objySession.isOpen() + " - sessionName:" + objySession.getName());
+        TRACER_DEBUG.trace("  getObjySession from read pool, session: " + objySession.toString() + " - isOpen: " + objySession.isOpen() + " - sessionName:"
+            + objySession.getName());
       }
     }
     else
@@ -325,8 +321,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       objySession = getStore().getConnection().getWriteSessionFromPool(sessionName + "_" + getRepositoryName());
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG.trace("  getObjySession from write pool, session: " + objySession.toString() + " - isOpen: "
-            + objySession.isOpen() + " - sessionName:" + objySession.getName());
+        TRACER_DEBUG.trace("  getObjySession from write pool, session: " + objySession.toString() + " - isOpen: " + objySession.isOpen() + " - sessionName:"
+            + objySession.getName());
       }
     }
 
@@ -439,8 +435,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
   }
 
   @Override
-  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor)
+  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor)
   {
     // System.out.println(">>>>IS:<<< writeRevisionDeltas() " + this + " - objy session: " + objySession.toString());
     long start = System.nanoTime();
@@ -469,8 +464,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace(
-          " writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
+      TRACER_DEBUG.trace(" writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
     }
   }
 
@@ -596,10 +590,9 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     int newVersion = CDOBranchVersion.FIRST_VERSION;
 
     ObjyObject objyObject = getObject(delta.getID());
-    TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}",
-        objyObject.ooId().getStoreString(), deltaVersion, delta.getBranch().getID());
-    ObjyObject objyOriginalRevision = objyObject.getRevisionByVersion(deltaVersion, delta.getBranch().getID(),
-        objySession.getObjectManager());
+    TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}", objyObject.ooId().getStoreString(), deltaVersion,
+        delta.getBranch().getID());
+    ObjyObject objyOriginalRevision = objyObject.getRevisionByVersion(deltaVersion, delta.getBranch().getID(), objySession.getObjectManager());
 
     if (branch.getID() == delta.getBranch().getID())
     {
@@ -609,10 +602,9 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.format("Writing revision delta: {0}, v:{1} - OID:{2}, v:{3} - BranchId:{4}", delta, deltaVersion,
-          objyObject.ooId().getStoreString(), objyOriginalRevision.getVersion(), objyOriginalRevision.getBranchId());
-      TRACER_DEBUG.format("... delta branch ID: {0} - revision branch ID: {1}", branch.getID(),
-          objyOriginalRevision.getBranchId());
+      TRACER_DEBUG.format("Writing revision delta: {0}, v:{1} - OID:{2}, v:{3} - BranchId:{4}", delta, deltaVersion, objyObject.ooId().getStoreString(),
+          objyOriginalRevision.getVersion(), objyOriginalRevision.getBranchId());
+      TRACER_DEBUG.format("... delta branch ID: {0} - revision branch ID: {1}", branch.getID(), objyOriginalRevision.getBranchId());
     }
     // System.out.println(">>>IS: Delta Writing: " + delta.getID() + " - oid: " + objyObject.ooId().getStoreString());
     // System.out.println("\t - old version : " + delta.getVersion());
@@ -634,9 +626,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
 
       ObjyObject objyObjectCopy = objySession.getObjectManager().copyRevision(this, objyOriginalRevision);
-      TRACER_DEBUG.format("  created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}",
-          objyObjectCopy.ooId().getStoreString(), objyOriginalRevision.ooId().getStoreString(),
-          objyOriginalRevision.getVersion(), branch.getID());
+      TRACER_DEBUG.format("  created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}", objyObjectCopy.ooId().getStoreString(),
+          objyOriginalRevision.ooId().getStoreString(), objyOriginalRevision.getVersion(), branch.getID());
 
       // // newObjyRevision = objySession.getObjectManager().copyRevision(this, objyRevision);
       // // objyRevision.setRevisedBranchId(branch.getID();
@@ -740,8 +731,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     // objySession.addToLog("IS:>>>", "writeRevisions - end");
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG
-          .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
+      TRACER_DEBUG.trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
       // TRACER_DEBUG.trace(" getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0);
       // TRACER_DEBUG.trace(" updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0);
       // TRACER_DEBUG.trace(" resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime /
@@ -807,8 +797,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       if (revision.getVersion() > CDOBranchVersion.FIRST_VERSION) // we're updating other versions...
       {
         // TRACER_DEBUG.format("...Updating other revisions using writeRevision()...");
-        ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1,
-            revision.getBranch().getID(), objySession.getObjectManager());
+        ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1, revision.getBranch().getID(), objySession.getObjectManager());
 
         if (oldObjyRevision == null)
         {
@@ -831,8 +820,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       if (getStore().isRequiredToSupportBranches())
       {
         // add the newObjyRevision to the proper branch.
-        ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName())
-            .getBranch(revision.getBranch().getID());
+        ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName()).getBranch(revision.getBranch().getID());
         ooObj anObj = ooObj.create_ooObj(newObjyRevision.ooId());
         try
         {
@@ -1016,8 +1004,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.format(
-          "queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: " + exactMatch);
+      TRACER_DEBUG.format("queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: " + exactMatch);
     }
     ObjyResourceList resourceList = objySession.getResourceList(getRepositoryName());
     int size = resourceList.size();
@@ -1041,8 +1028,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
         {
           try
           {
-            resourceRevision = resource.getRevision(context.getTimeStamp(), context.getBranch().getID(),
-                objySession.getObjectManager());
+            resourceRevision = resource.getRevision(context.getTimeStamp(), context.getBranch().getID(), objySession.getObjectManager());
           }
           catch (RuntimeException ex)
           {
@@ -1054,8 +1040,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
         {
           try
           {
-            resourceRevision = resource.getRevision(context.getTimeStamp(), CDOBranch.MAIN_BRANCH_ID,
-                objySession.getObjectManager());
+            resourceRevision = resource.getRevision(context.getTimeStamp(), CDOBranch.MAIN_BRANCH_ID, objySession.getObjectManager());
           }
           catch (RuntimeException ex)
           {
@@ -1070,15 +1055,13 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
         String resourceName = ObjyResourceList.getResourceName(resourceRevision);
         CDOID resourceID = OBJYCDOIDUtil.getCDOID(resource.ooId());
-        if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName)
-            || pathPrefix == null && resourceName == null)
+        if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName) || pathPrefix == null && resourceName == null)
         {
           if (!context.addResource(resourceID))
           {
             if (TRACER_DEBUG.isEnabled())
             {
-              TRACER_DEBUG.format("   queryResources(1.1) got: " + resource.ooId().getStoreString() + " - version: "
-                  + resource.getVersion());
+              TRACER_DEBUG.format("   queryResources(1.1) got: " + resource.ooId().getStoreString() + " - version: " + resource.getVersion());
             }
             // No more results allowed
             break; // don't continue
@@ -1091,8 +1074,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
             context.addResource(resourceID);
             if (TRACER_DEBUG.isEnabled())
             {
-              TRACER_DEBUG.format("   queryResources(1.2) got: " + resource.ooId().getStoreString() + " - version: "
-                  + resource.getVersion());
+              TRACER_DEBUG.format("   queryResources(1.2) got: " + resource.ooId().getStoreString() + " - version: " + resource.getVersion());
             }
           }
         }
@@ -1177,8 +1159,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
   }
 
-  private boolean queryXRefs(QueryXRefsContext context, Set<CDOID> targetIDs, CDOID targetID, CDOID sourceID,
-      EReference sourceReference, int index)
+  private boolean queryXRefs(QueryXRefsContext context, Set<CDOID> targetIDs, CDOID targetID, CDOID sourceID, EReference sourceReference, int index)
   {
     for (CDOID id : targetIDs)
     {
@@ -1218,8 +1199,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
   /**
    *
    */
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     long __start = System.nanoTime();
     ensureSessionBegin();
@@ -1265,8 +1245,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
       try
       {
-        objyRevision = objyObject.getRevision(branchPoint.getTimeStamp(), branchPoint.getBranch().getID(),
-            objySession.getObjectManager());
+        objyRevision = objyObject.getRevision(branchPoint.getTimeStamp(), branchPoint.getBranch().getID(), objySession.getObjectManager());
         if (objyRevision == null)
         {
           TRACER_DEBUG.format("RR - branches ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$
@@ -1282,8 +1261,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
       try
       {
-        objyRevision = objyObject.getRevision(branchPoint.getTimeStamp(), CDOBranch.MAIN_BRANCH_ID,
-            objySession.getObjectManager());
+        objyRevision = objyObject.getRevision(branchPoint.getTimeStamp(), CDOBranch.MAIN_BRANCH_ID, objySession.getObjectManager());
         if (objyRevision == null)
         {
           TRACER_DEBUG.format("RR - audit ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$
@@ -1315,8 +1293,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
             objyObject.ooId().getStoreString());
       }
       EClass eClass = ObjySchema.getEClass(getStore(), objyObject.objyClass());
-      return new DetachedCDORevision(eClass, id, branchPoint.getBranch(), -objyRevision.getVersion(),
-          objyRevision.getCreationTime());
+      return new DetachedCDORevision(eClass, id, branchPoint.getBranch(), -objyRevision.getVersion(), objyRevision.getCreationTime());
     }
 
     CDOBranchPoint branchPoint2 = revision.getBranch().getPoint(objyRevision.getCreationTime());
@@ -1344,8 +1321,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
   /**
    *
    */
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     long __start = System.nanoTime();
     ensureSessionBegin();
@@ -1372,8 +1348,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     // }
 
     ObjyObject objyRevision = null;
-    objyRevision = objyObject.getRevisionByVersion(branchVersion.getVersion(), branchVersion.getBranch().getID(),
-        objySession.getObjectManager());
+    objyRevision = objyObject.getRevisionByVersion(branchVersion.getVersion(), branchVersion.getBranch().getID(), objySession.getObjectManager());
     // if (getStore().isRequiredToSupportAudits())
     // {
     // objyRevision = objyObject.getRevisionByVersion(branchVersion.getVersion());
@@ -1494,8 +1469,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       {
         monitor.begin(newObjects.length);
 
-        ObjyPlacementManagerLocal placementManager = new ObjyPlacementManagerLocal(getStore(), objySession,
-            commitContext, newObjyObjectsMap);
+        ObjyPlacementManagerLocal placementManager = new ObjyPlacementManagerLocal(getStore(), objySession, commitContext, newObjyObjectsMap);
 
         // iterate over the list and skip the ones we already have created.
         for (InternalCDORevision revision : newObjects)
@@ -1506,8 +1480,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
           }
           catch (com.objy.db.ObjyRuntimeException ex)
           {
-            System.out
-                .println(">>>>IS: Exception<<<< Session: " + objySession + " open status: " + objySession.isOpen());
+            System.out.println(">>>>IS: Exception<<<< Session: " + objySession + " open status: " + objySession.isOpen());
             ex.printStackTrace();
           }
           monitor.worked();
@@ -1520,10 +1493,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace(" addIDMappings for " + commitContext.getNewObjects().length + " - time: "
-          + (System.nanoTime() - __start) / 1000000.0);
-      TRACER_DEBUG.trace(
-          "  createObjects : " + ObjyObject.createObjectCount + " - time: " + ObjyObject.createObjectTime / 1000000.0);
+      TRACER_DEBUG.trace(" addIDMappings for " + commitContext.getNewObjects().length + " - time: " + (System.nanoTime() - __start) / 1000000.0);
+      TRACER_DEBUG.trace("  createObjects : " + ObjyObject.createObjectCount + " - time: " + ObjyObject.createObjectTime / 1000000.0);
       ObjyObject.createObjectTime = 0;
       ObjyObject.createObjectCount = 0;
     }
@@ -1564,8 +1535,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       objySession.begin();
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG.trace(" ensureBeginSession() called begin() on session: " + objySession + " [name: "
-            + objySession.getName() + " - open: " + objySession.isOpen() + "]");
+        TRACER_DEBUG.trace(
+            " ensureBeginSession() called begin() on session: " + objySession + " [name: " + objySession.getName() + " - open: " + objySession.isOpen() + "]");
       }
     }
   }
@@ -1611,8 +1582,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
         infoBranch = branchManager.getBranch(id);
       }
 
-      CDOCommitInfo commitInfo = commitInfoManager.createCommitInfo(infoBranch, timeStamp, previousTimeStamp, userID,
-          comment, null, null);
+      CDOCommitInfo commitInfo = commitInfoManager.createCommitInfo(infoBranch, timeStamp, previousTimeStamp, userID, comment, null, null);
       handler.handleCommitInfo(commitInfo);
     }
 
@@ -1620,8 +1590,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
   @SuppressWarnings("deprecation")
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     ensureSessionBegin();
     // we need to write the following...
@@ -1688,8 +1657,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     for (ObjyBranch objyBranch : branches)
     {
-      InternalCDOBranch branch = branchManager.getBranch(objyBranch.getBranchId(), new BranchInfo(
-          objyBranch.getBranchName(), objyBranch.getBaseBranchId(), objyBranch.getBaseBranchTimeStamp()));
+      InternalCDOBranch branch = branchManager.getBranch(objyBranch.getBranchId(),
+          new BranchInfo(objyBranch.getBranchName(), objyBranch.getBaseBranchId(), objyBranch.getBaseBranchTimeStamp()));
       branchHandler.handleBranch(branch);
       count++;
     }
@@ -1705,15 +1674,13 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     List<ObjyBranch> objyBranchList = objySession.getBranchManager(getRepositoryName()).getSubBranches(branchID);
     for (ObjyBranch objyBranch : objyBranchList)
     {
-      SubBranchInfo subBranchInfo = new SubBranchInfo(objyBranch.getBranchId(), objyBranch.getBranchName(),
-          objyBranch.getBaseBranchTimeStamp());
+      SubBranchInfo subBranchInfo = new SubBranchInfo(objyBranch.getBranchId(), objyBranch.getBranchName(), objyBranch.getBaseBranchTimeStamp());
       result.add(subBranchInfo);
     }
     return result.toArray(new SubBranchInfo[result.size()]);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     ensureSessionBegin();
     IRepository repository = getStore().getRepository();
@@ -1735,8 +1702,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     throw new UnsupportedOperationException();
   }
 
-  private boolean handleRevision(ObjyObject objyObject, EClass eClass, CDOBranch branch, long timeStamp,
-      boolean exactTime, CDORevisionHandler handler, CDORevisionManager revisionManager, CDOBranchManager branchManager)
+  private boolean handleRevision(ObjyObject objyObject, EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler,
+      CDORevisionManager revisionManager, CDOBranchManager branchManager)
   {
     if (objyObject.getVersion() < 0) // DetachedCDORevision
     {
@@ -1773,10 +1740,9 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       }
     }
 
-    CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId())
-        .getVersion(Math.abs(objyObject.getVersion()));
-    InternalCDORevision revision = (InternalCDORevision)revisionManager
-        .getRevisionByVersion(OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion, CDORevision.UNCHUNKED, true);
+    CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId()).getVersion(Math.abs(objyObject.getVersion()));
+    InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion,
+        CDORevision.UNCHUNKED, true);
 
     return handler.handleRevision(revision);
   }
@@ -1816,8 +1782,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
   }
 
-  protected void readChangeSet(OMMonitor monitor, CDOChangeSetSegment segment, ObjyObjectManager objyObjectManager,
-      SortedSet<?> revisions, Set<CDOID> results)
+  protected void readChangeSet(OMMonitor monitor, CDOChangeSetSegment segment, ObjyObjectManager objyObjectManager, SortedSet<?> revisions, Set<CDOID> results)
   {
     int size = revisions.size();
     monitor.begin(size);
@@ -1881,15 +1846,13 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     throw new UnsupportedOperationException();
   }
 
-  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException
   {
     // TODO: implement ObjectivityStoreAccessor.rawExport();
     throw new UnsupportedOperationException();
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     // TODO: implement ObjectivityStoreAccessor.rawImport
     throw new UnsupportedOperationException();
@@ -1919,8 +1882,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     throw new UnsupportedOperationException();
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     // TODO: implement ObjectivityStoreAccessor.rawStore
     throw new UnsupportedOperationException();
@@ -1938,8 +1900,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     throw new UnsupportedOperationException();
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     // TODO: implement ObjectivityStoreAccessor.createLockArea
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
index 922cd05b47..d5ad2b2e2e 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
@@ -41,8 +41,8 @@ public class ObjectivityStoreChunkReader extends StoreChunkReader implements IOb
     CDOID id = getRevision().getID();
     getAccessor().ensureActiveSession();
     ObjyObject objyObject = getAccessor().getObject(id);
-    ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(),
-        getRevision().getBranch().getID(), getAccessor().getObjySession().getObjectManager());
+    ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(), getRevision().getBranch().getID(),
+        getAccessor().getObjySession().getObjectManager());
 
     List<Chunk> chunks = getChunks();
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
index 516047351f..047e7fc273 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
@@ -57,8 +57,8 @@ public class ObjyPlacementManagerLocal
 
   Map<CDOID, ObjyObject> newObjyObjectsMap;
 
-  public ObjyPlacementManagerLocal(ObjectivityStore objyStore, ObjySession objySession,
-      InternalCommitContext commitContext, Map<CDOID, ObjyObject> newObjyObjectsMap)
+  public ObjyPlacementManagerLocal(ObjectivityStore objyStore, ObjySession objySession, InternalCommitContext commitContext,
+      Map<CDOID, ObjyObject> newObjyObjectsMap)
   {
     repositoryName = objyStore.getRepository().getName();
     this.objySession = objySession;
@@ -156,8 +156,7 @@ public class ObjyPlacementManagerLocal
     {
       // we have to put it somewhere.
       // call the global placement manager.
-      nearObject = objySession.getObjectManager().getGlobalPlacementManager().getNearObject(null, null,
-          revision.getEClass());
+      nearObject = objySession.getObjectManager().getGlobalPlacementManager().getNearObject(null, null, revision.getEClass());
     }
 
     ObjyObject objyObject = objySession.getObjectManager().newObject(eClass, nearObject);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
index 13c79e8cc6..6b1132a18b 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
@@ -207,8 +207,7 @@ public class ObjyClassProposed
         if (TRACER_DEBUG.isEnabled())
         {
           TRACER_DEBUG.trace("Attribut Changed for " + eClass.getName() + " name : " + feature.getName());
-          TRACER_DEBUG.trace("... attribute change is not supported in this release... for " + eClass.getName()
-              + " name : " + feature.getName());
+          TRACER_DEBUG.trace("... attribute change is not supported in this release... for " + eClass.getName() + " name : " + feature.getName());
         }
 
         // TODO - enable the rest of attribute type evolution...
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
index f1885d89fa..6841c8ca7b 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
@@ -541,8 +541,7 @@ public class ObjyObject
       if (TRACER_DEBUG.isEnabled())
       {
         checkSession();
-        TRACER_DEBUG
-            .trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:" + revision.getVersion());
+        TRACER_DEBUG.trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:" + revision.getVersion());
       }
 
       // this is done in the updateDate()
@@ -597,8 +596,7 @@ public class ObjyObject
         {
           if (TRACER_DEBUG.isEnabled())
           {
-            TRACER_DEBUG
-                .trace("In " + ooId().getStoreString() + " - Can't find mapper for feature " + feature.getName());
+            TRACER_DEBUG.trace("In " + ooId().getStoreString() + " - Can't find mapper for feature " + feature.getName());
           }
           continue;
         }
@@ -626,8 +624,7 @@ public class ObjyObject
             }
             else if (value instanceof CDOIDExternal)
             {
-              TRACER_DEBUG
-                  .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
+              TRACER_DEBUG.trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
               // System.out.println("value is a proxy object - it should be handled by the mapper.");
               // create an ObjyProxy object to hold the the value.
               ObjyProxy proxyObject = ObjyProxy.createObject(ooId());
@@ -648,8 +645,7 @@ public class ObjyObject
               ooId oid = null;
               if (entryValue instanceof CDOIDExternal)
               {
-                TRACER_DEBUG
-                    .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)entryValue).getURI());
+                TRACER_DEBUG.trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)entryValue).getURI());
                 // System.out.println("value is a proxy object - it should be handled by the mapper.");
                 // create an ObjyProxy object to hold the the value.
                 ObjyProxy proxyObject = ObjyProxy.createObject(ooId());
@@ -675,8 +671,8 @@ public class ObjyObject
             }
             else if (value.equals(InternalCDOList.UNINITIALIZED))
             {
-              TRACER_DEBUG.format("...GOT UNINITIALIZED at {0}, listSize:{1}, feature:{2}, oid:{3}", i, values.length,
-                  feature.getName(), objectId.getStoreString());
+              TRACER_DEBUG.format("...GOT UNINITIALIZED at {0}, listSize:{1}, feature:{2}, oid:{3}", i, values.length, feature.getName(),
+                  objectId.getStoreString());
               continue;
             }
             else
@@ -937,8 +933,7 @@ public class ObjyObject
    * Fetch data for a specific feature from the store, and return a list of objects. Used by
    * ObjectivityStoreChunkAccessor
    */
-  public List<Object> fetchList(ObjectivityStoreAccessor storeAccessor, EStructuralFeature feature, int startIndex,
-      int chunkSize)
+  public List<Object> fetchList(ObjectivityStoreAccessor storeAccessor, EStructuralFeature feature, int startIndex, int chunkSize)
   {
     fetchCount++;
 
@@ -954,8 +949,7 @@ public class ObjyObject
     {
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG.trace("ObjyObject.fetch() - feature:" + feature.getName() + "from Object: "
-            + ooId().getStoreString() + " version:" + getVersion());
+        TRACER_DEBUG.trace("ObjyObject.fetch() - feature:" + feature.getName() + "from Object: " + ooId().getStoreString() + " version:" + getVersion());
       }
       int featureSize = size(feature);
       chunkSize = Math.min(featureSize - startIndex, chunkSize);
@@ -1065,8 +1059,7 @@ public class ObjyObject
       if (TRACER_DEBUG.isEnabled())
       {
         // TODO - verify the message.
-        TRACER_DEBUG
-            .trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: " + feature.getName());
+        TRACER_DEBUG.trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: " + feature.getName());
       }
     }
     catch (RuntimeException ex)
@@ -1105,8 +1098,7 @@ public class ObjyObject
     if (TRACER_DEBUG.isEnabled())
     {
       // TODO - verify the message.
-      TRACER_DEBUG.trace("Getting object " + objectId.getStoreString() + " <feature ' " + feature.getName() + "':"
-          + feature.getEType() + "> from " + this);
+      TRACER_DEBUG.trace("Getting object " + objectId.getStoreString() + " <feature ' " + feature.getName() + "':" + feature.getEType() + "> from " + this);
     }
 
     // Class_Position position =
@@ -1440,8 +1432,8 @@ public class ObjyObject
         // different feature then.
         if (TRACER_DEBUG.isEnabled())
         {
-          TRACER_DEBUG.trace("-->> No process to delete() feature (" + i + ") -> feature:" + feature.getName()
-              + " - value:" + objects[i] + " ... nothing to do here.");
+          TRACER_DEBUG
+              .trace("-->> No process to delete() feature (" + i + ") -> feature:" + feature.getName() + " - value:" + objects[i] + " ... nothing to do here.");
         }
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java
index 8b973b4023..4295ddb238 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java
@@ -75,8 +75,7 @@ public class ObjyObjectManager
     }
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace("Create new object of type " + eClass.getName() + " near object "
-          + (nearObject != null ? nearObject.getStoreString() : null));
+      TRACER_DEBUG.trace("Create new object of type " + eClass.getName() + " near object " + (nearObject != null ? nearObject.getStoreString() : null));
     }
 
     Class_Object newClassObject = newClassObject(eClass, nearObject);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
index 65fdffbf5a..381183f899 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
@@ -103,8 +103,7 @@ public class FeatureMapTypeMapper extends BasicTypeMapper implements IManyTypeMa
   public void initialize(Class_Object classObject, EStructuralFeature feature)
   {
     // create the reference.
-    Class_Object newClassObject = Class_Object.new_persistent_object(getArrayListClass(), classObject.objectID(),
-        false);
+    Class_Object newClassObject = Class_Object.new_persistent_object(getArrayListClass(), classObject.objectID(), false);
     // {
     // ObjyObjectManager.newInternalObjCount++;
     // }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
index 438b24cd33..3969fa667b 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
@@ -115,8 +115,7 @@ public abstract class NumericTypeMapper extends BasicTypeMapper implements ISing
     d_Type type = ooAttribute.type_of();
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace(getAttributeName(feature) + " " + ((Basic_Type)type).base_type() + " basic type "
-          + type.is_basic_type() + " - " + getObjyBaseType());
+      TRACER_DEBUG.trace(getAttributeName(feature) + " " + ((Basic_Type)type).base_type() + " basic type " + type.is_basic_type() + " - " + getObjyBaseType());
     }
     return type.is_basic_type() && ((Basic_Type)type).base_type() == getObjyBaseType();
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ObjyMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ObjyMapper.java
index d14157b027..a2f1264758 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ObjyMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ObjyMapper.java
@@ -125,10 +125,9 @@ public class ObjyMapper
       return singleRef;
     }
 
-    TRACER_DEBUG.trace("ERROR: " + feature.getEType() + " not supported for feature "
-        + ((EClassifier)feature.eContainer()).getName() + "." + feature.getName());
-    throw new RuntimeException(feature.getEType() + " not supported for feature "
-        + ((EClassifier)feature.eContainer()).getName() + "." + feature.getName());
+    TRACER_DEBUG
+        .trace("ERROR: " + feature.getEType() + " not supported for feature " + ((EClassifier)feature.eContainer()).getName() + "." + feature.getName());
+    throw new RuntimeException(feature.getEType() + " not supported for feature " + ((EClassifier)feature.eContainer()).getName() + "." + feature.getName());
   }
 
   protected void initMap()
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringManyTypeMapper.java
index e311d4cd0a..5369833e47 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringManyTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringManyTypeMapper.java
@@ -171,8 +171,8 @@ public class StringManyTypeMapper extends BasicTypeMapper implements IManyTypeMa
   public void initialize(Class_Object classObject, EStructuralFeature feature)
   {
     // Class_Position position = classObject.type_of().position_in_class(getAttributeName(feature));
-    Class_Object newClassObject = Class_Object.new_persistent_object(
-        ObjySchema.getObjyClass(ObjyArrayListString.ClassName).getASClass(), classObject.objectID(), false);
+    Class_Object newClassObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyArrayListString.ClassName).getASClass(),
+        classObject.objectID(), false);
     // ObjyObjectManager.newInternalObjCount++;
     classObject.nset_ooId(getAttributeName(feature), newClassObject.objectID());
     ObjyArrayListString.initObject(newClassObject);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
index 20f2339120..60fe7077ff 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
@@ -282,8 +282,7 @@ public class ObjyArrayListString
       for (int i = 0; i < newChunks; i++)
       {
         // create a new chunk.
-        Class_Object newChunk = Class_Object.new_persistent_object(chunkClass.getASClass(), classObject.objectID(),
-            false);
+        Class_Object newChunk = Class_Object.new_persistent_object(chunkClass.getASClass(), classObject.objectID(), false);
         getVArray().set_ooId(arraySize + i, newChunk.objectID());
       }
       cacheSize = -1;
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
index aec7c1afbb..40cb5a1a92 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
@@ -59,8 +59,7 @@ public class ObjyBase
   public static void buildSchema()
   {
     d_Module top_mod = ObjySchema.getTopModule();
-    if (top_mod.resolve_class(ObjyBase.CLASS_NAME) == null
-        && top_mod.resolve_proposed_class(ObjyBase.CLASS_NAME) == null)
+    if (top_mod.resolve_class(ObjyBase.CLASS_NAME) == null && top_mod.resolve_proposed_class(ObjyBase.CLASS_NAME) == null)
     {
       if (TRACER_DEBUG.isEnabled())
       {
@@ -73,21 +72,18 @@ public class ObjyBase
 
       propClass.add_base_class(com.objy.as.app.d_Module.LAST, com.objy.as.app.d_Access_Kind.d_PUBLIC, "ooObj");
 
-      propClass.add_bidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_REVISIONS,
-          ObjyBase.CLASS_NAME, false, false, true, Rel_Copy.DELETE, Rel_Versioning.COPY,
-          Rel_Propagation.LOCK_YES_DELETE_YES, ObjyBase.ATT_BASE, false);
+      propClass.add_bidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_REVISIONS, ObjyBase.CLASS_NAME, false, false, true,
+          Rel_Copy.DELETE, Rel_Versioning.COPY, Rel_Propagation.LOCK_YES_DELETE_YES, ObjyBase.ATT_BASE, false);
 
       // propClass.add_bidirectional_relationship(position, visibility,
       // name, destinationClassName, isInline, isShort, isToMany,
       // copyMode, versioning, propagation, inverseName, inverseIsToMany)
 
-      propClass.add_bidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_BASE,
-          ObjyBase.CLASS_NAME, false, false, false, Rel_Copy.DELETE, Rel_Versioning.COPY,
-          Rel_Propagation.LOCK_YES_DELETE_YES, ObjyBase.ATT_REVISIONS, true);
+      propClass.add_bidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_BASE, ObjyBase.CLASS_NAME, false, false, false,
+          Rel_Copy.DELETE, Rel_Versioning.COPY, Rel_Propagation.LOCK_YES_DELETE_YES, ObjyBase.ATT_REVISIONS, true);
 
-      propClass.add_unidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_LAST_REVISION,
-          ObjyBase.CLASS_NAME, true, false, false, Rel_Copy.DELETE, Rel_Versioning.COPY,
-          Rel_Propagation.LOCK_YES_DELETE_YES);
+      propClass.add_unidirectional_relationship(d_Module.LAST, d_Access_Kind.d_PUBLIC, ObjyBase.ATT_LAST_REVISION, ObjyBase.CLASS_NAME, true, false, false,
+          Rel_Copy.DELETE, Rel_Versioning.COPY, Rel_Propagation.LOCK_YES_DELETE_YES);
 
       propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyBase.ATT_CONTAINER_FEATUERID, // Attribute name
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranchManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranchManager.java
index 6c288d66c4..3335b9156d 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranchManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranchManager.java
@@ -155,8 +155,7 @@ public class ObjyBranchManager extends ooObj
 
   public void createMainBranch()
   {
-    ObjyBranch newObjyBranch = ObjyBranch.create(this, CDOBranch.MAIN_BRANCH_ID, CDOBranch.MAIN_BRANCH_ID,
-        CDOBranch.MAIN_BRANCH_NAME, 0);
+    ObjyBranch newObjyBranch = ObjyBranch.create(this, CDOBranch.MAIN_BRANCH_ID, CDOBranch.MAIN_BRANCH_ID, CDOBranch.MAIN_BRANCH_NAME, 0);
     branchSet.add(newObjyBranch); // implicit clustering.
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
index 81949816fb..0fa893c4a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
@@ -58,8 +58,7 @@ public class ObjyFeatureMapArrayList extends ObjyArrayList<ObjyFeatureMapEntry>
   {
     // Connection.current().registerClass(MapEntryClassName);
     d_Module top_mod = ObjySchema.getTopModule();
-    if (top_mod.resolve_class(ObjyFeatureMapArrayList.ClassName) == null
-        && top_mod.resolve_proposed_class(ObjyFeatureMapArrayList.ClassName) == null)
+    if (top_mod.resolve_class(ObjyFeatureMapArrayList.ClassName) == null && top_mod.resolve_proposed_class(ObjyFeatureMapArrayList.ClassName) == null)
     {
 
       if (TRACER_DEBUG.isEnabled())
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
index b8980fe8a3..cae1e930a8 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
@@ -70,8 +70,7 @@ public class ObjyFeatureMapEntry
     this.tagId = tagId;
     object = oid;
 
-    classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(MapEntryClassName).getASClass(), near,
-        false);
+    classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(MapEntryClassName).getASClass(), near, false);
 
     classObject.nset_ooId(EntryObject, object);
     classObject.nset_numeric(EntryName, new Numeric_Value(tagId));
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
index 35f42460b3..69467682d7 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
@@ -54,8 +54,8 @@ public class ObjyLockArea extends ooObj
     this.readOnly = readOnly;
   }
 
-  public static ObjyLockArea create(ooId scopeContOid, String durableLockingID, String userID, ObjyBranch branchPoint,
-      boolean readOnly, Map<CDOID, LockGrade> locks)
+  public static ObjyLockArea create(ooId scopeContOid, String durableLockingID, String userID, ObjyBranch branchPoint, boolean readOnly,
+      Map<CDOID, LockGrade> locks)
   {
     ObjyLockArea objyLockArea = new ObjyLockArea(durableLockingID, userID, branchPoint, readOnly);
     ooObj clusterObject = ooObj.create_ooObj(scopeContOid);
@@ -158,9 +158,7 @@ public class ObjyLockArea extends ooObj
   public String toString()
   {
     fetch();
-    return MessageFormat.format(
-        "ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}",
-        durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(),
-        readWriteLockSet.size());
+    return MessageFormat.format("ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}",
+        durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(), readWriteLockSet.size());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockAreaManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockAreaManager.java
index d80d10cd79..f2aaea7926 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockAreaManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockAreaManager.java
@@ -71,10 +71,9 @@ public class ObjyLockAreaManager extends ooObj
   private LockArea makeLockArea(InternalCDOBranchManager branchManager, ObjyLockArea objyLockArea)
   {
     ObjyBranch objyBranch = objyLockArea.getBranch();
-    CDOBranchPoint branchPoint = branchManager.getBranch(objyBranch.getBranchId())
-        .getPoint(objyLockArea.getTimeStamp());
-    return CDOLockUtil.createLockArea(objyLockArea.getDurableLockingID(), objyLockArea.getUserID(), branchPoint,
-        objyLockArea.isReadOnly(), objyLockArea.getLocks());
+    CDOBranchPoint branchPoint = branchManager.getBranch(objyBranch.getBranchId()).getPoint(objyLockArea.getTimeStamp());
+    return CDOLockUtil.createLockArea(objyLockArea.getDurableLockingID(), objyLockArea.getUserID(), branchPoint, objyLockArea.isReadOnly(),
+        objyLockArea.getLocks());
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
index 82fe3a79f4..4060da21a5 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
@@ -36,8 +36,7 @@ public class ObjyProxy
   public static void buildSchema()
   {
     d_Module top_mod = ObjySchema.getTopModule();
-    if (top_mod.resolve_class(ObjyProxy.className) == null
-        && top_mod.resolve_proposed_class(ObjyProxy.className) == null)
+    if (top_mod.resolve_class(ObjyProxy.className) == null && top_mod.resolve_proposed_class(ObjyProxy.className) == null)
     {
 
       if (TRACER_DEBUG.isEnabled())
@@ -80,8 +79,7 @@ public class ObjyProxy
   // factory.
   public static ObjyProxy createObject(ooId nearObject)
   {
-    Class_Object newClassObject = Class_Object
-        .new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className).getASClass(), nearObject, false);
+    Class_Object newClassObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className).getASClass(), nearObject, false);
     ObjyProxy proxyObject = new ObjyProxy(newClassObject);
     return proxyObject;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
index 433ea6d206..831ac5dbcb 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
@@ -64,8 +64,7 @@ public class ObjyResourceList
   public static void buildSchema()
   {
     d_Module top_mod = ObjySchema.getTopModule();
-    if (top_mod.resolve_class(ObjyResourceList.className) == null
-        && top_mod.resolve_proposed_class(ObjyResourceList.className) == null)
+    if (top_mod.resolve_class(ObjyResourceList.className) == null && top_mod.resolve_proposed_class(ObjyResourceList.className) == null)
     {
 
       if (TRACER_DEBUG.isEnabled())
@@ -78,8 +77,7 @@ public class ObjyResourceList
       // Proposed_Class A = new Proposed_Class(ooArrayListId.ClassName);
       Proposed_Class propClass = top_mod.propose_new_class(ObjyResourceList.className);
 
-      propClass.add_base_class(com.objy.as.app.d_Module.LAST, com.objy.as.app.d_Access_Kind.d_PUBLIC,
-          ObjyBase.CLASS_NAME /* "ooObj" */);
+      propClass.add_base_class(com.objy.as.app.d_Module.LAST, com.objy.as.app.d_Access_Kind.d_PUBLIC, ObjyBase.CLASS_NAME /* "ooObj" */);
 
       propClass.add_ref_attribute(com.objy.as.app.d_Module.LAST, // Access kind
           d_Access_Kind.d_PUBLIC, // Access kind
@@ -170,8 +168,7 @@ public class ObjyResourceList
   // }
   // }
 
-  public void checkDuplicateResources(ObjectivityStoreAccessor storeAccessor, InternalCDORevision revision)
-      throws IllegalStateException
+  public void checkDuplicateResources(ObjectivityStoreAccessor storeAccessor, InternalCDORevision revision) throws IllegalStateException
   {
     // CDOID folderID = (CDOID)revision.data().getContainerID();
     CDOID folderId = (CDOID)revision.data().getContainerID();
@@ -192,8 +189,7 @@ public class ObjyResourceList
       {
         try
         {
-          resourceRevision = resource.getRevision(revision.getTimeStamp(), revision.getBranch().getID(),
-              objyObjectManager);
+          resourceRevision = resource.getRevision(revision.getTimeStamp(), revision.getBranch().getID(), objyObjectManager);
         }
         catch (RuntimeException ex)
         {
@@ -220,8 +216,7 @@ public class ObjyResourceList
       // int v = resource.getVersion();
       CDOID resourceFolderId = (CDOID)resourceRevision.getEContainer();
       String resourceName = ObjyResourceList.getResourceName(resourceRevision);
-      if (resourceFolderId != null && resourceFolderId.equals(folderId) && resourceName != null
-          && resourceName.equals(name))
+      if (resourceFolderId != null && resourceFolderId.equals(folderId) && resourceName != null && resourceName.equals(name))
       {
         throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder: " + folderId); //$NON-NLS-1$
       }
@@ -241,8 +236,7 @@ public class ObjyResourceList
 
   public static ObjyObject create(ooId nearOid)
   {
-    Class_Object classObject = Class_Object
-        .new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className).getASClass(), nearOid, false);
+    Class_Object classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className).getASClass(), nearOid, false);
     // ObjyObjectManager.newInternalObjCount++;
     // Class_Position position = classObject.position_in_class(ObjyResourceList.Attribute_arrayName);
     // Class_Object arrayClassObject = Class_Object.new_persistent_object(
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
index cd1eeceb16..24fbcd1ff7 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
@@ -79,8 +79,7 @@ abstract class CDOAdditionalOperation extends AdapterImpl
   /**
    * Resolves the possibly generic return type of an operation according to its relation to the source ({@code owner}) type and argument types.
    */
-  protected EClassifier getResultType(EClassifier owner, EOperation operation,
-      List<? extends TypedElement<EClassifier>> args)
+  protected EClassifier getResultType(EClassifier owner, EOperation operation, List<? extends TypedElement<EClassifier>> args)
   {
     EClassifier result = operation.getEType();
     return result != null ? result : env.getOCLStandardLibrary().getOclVoid();
@@ -227,12 +226,10 @@ abstract class CDOAdditionalOperation extends AdapterImpl
     }
 
     @Override
-    protected EClassifier getResultType(EClassifier owner, EOperation operation,
-        List<? extends TypedElement<EClassifier>> args)
+    protected EClassifier getResultType(EClassifier owner, EOperation operation, List<? extends TypedElement<EClassifier>> args)
     {
       // The result type of the type-filtered variant is a collection of the filter type
-      EClassifier elementType = args.isEmpty() ? getEnv().getOCLStandardLibrary().getOclAny()
-          : ((TypeType)args.get(0).getType()).getReferredType();
+      EClassifier elementType = args.isEmpty() ? getEnv().getOCLStandardLibrary().getOclAny() : ((TypeType)args.get(0).getType()).getReferredType();
       return collectionType(CollectionKind.COLLECTION_LITERAL, elementType);
     }
   }
@@ -263,8 +260,7 @@ abstract class CDOAdditionalOperation extends AdapterImpl
     {
       CDOEnvironment env = getEnv();
       EClassifier oclAny = env.getOCLStandardLibrary().getOclAny();
-      env.addHelperOperation(oclAny,
-          createEOperation(env.getOCLStandardLibrary().getBoolean(), "regex", env.getOCLStandardLibrary().getString())); //$NON-NLS-1$
+      env.addHelperOperation(oclAny, createEOperation(env.getOCLStandardLibrary().getBoolean(), "regex", env.getOCLStandardLibrary().getString())); //$NON-NLS-1$
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
index 250ac42782..b4765a1c13 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
@@ -78,8 +78,7 @@ class CDOEnvironment extends EcoreEnvironment
      * Overrides the superclass implementation to resolve generic result types of our
      * CDO-specific operations according to their individual semantics.
      */
-    public EClassifier getResultType(Object problemObject, EClassifier owner, EOperation operation,
-        List<? extends TypedElement<EClassifier>> args)
+    public EClassifier getResultType(Object problemObject, EClassifier owner, EOperation operation, List<? extends TypedElement<EClassifier>> args)
     {
       CDOAdditionalOperation cdoOperation = CDOAdditionalOperation.getInstance(operation);
       if (cdoOperation != null)
@@ -139,20 +138,17 @@ class CDOEnvironment extends EcoreEnvironment
       return delegate.resolveGenericSignature(owner, oper);
     }
 
-    public EClassifier findSignalMatching(EClassifier receiver, List<EClassifier> signals, String name,
-        List<? extends TypedElement<EClassifier>> args)
+    public EClassifier findSignalMatching(EClassifier receiver, List<EClassifier> signals, String name, List<? extends TypedElement<EClassifier>> args)
     {
       return delegate.findSignalMatching(receiver, signals, name, args);
     }
 
-    public EOperation findOperationMatching(EClassifier owner, String name,
-        List<? extends TypedElement<EClassifier>> args)
+    public EOperation findOperationMatching(EClassifier owner, String name, List<? extends TypedElement<EClassifier>> args)
     {
       return delegate.findOperationMatching(owner, name, args);
     }
 
-    public boolean matchArgs(EClassifier owner, List<?> paramsOrProperties,
-        List<? extends TypedElement<EClassifier>> args)
+    public boolean matchArgs(EClassifier owner, List<?> paramsOrProperties, List<? extends TypedElement<EClassifier>> args)
     {
       return delegate.matchArgs(owner, paramsOrProperties, args);
     }
@@ -171,8 +167,7 @@ class CDOEnvironment extends EcoreEnvironment
   /**
    * @author Christian W. Damus
    */
-  private static class DelegatingCachedTypeChecker extends DelegatingTypeChecker
-      implements TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature>
+  private static class DelegatingCachedTypeChecker extends DelegatingTypeChecker implements TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature>
   {
     private final TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature> delegate;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
index 089a61669a..0cee13cd76 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
@@ -33,15 +33,13 @@ class CDOEvaluationEnvironment extends EcoreEvaluationEnvironment
     super(factory);
   }
 
-  public CDOEvaluationEnvironment(
-      EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> parent)
+  public CDOEvaluationEnvironment(EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> parent)
   {
     super(parent);
   }
 
   @Override
-  public Object callOperation(EOperation operation, int opcode, Object source, Object[] args)
-      throws IllegalArgumentException
+  public Object callOperation(EOperation operation, int opcode, Object source, Object[] args) throws IllegalArgumentException
   {
     CDOAdditionalOperation cdoOperation = CDOAdditionalOperation.getInstance(operation);
     if (cdoOperation != null)
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOExtentCreator.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOExtentCreator.java
index 64c30d45c7..6fdcd124de 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOExtentCreator.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOExtentCreator.java
@@ -92,8 +92,7 @@ public class CDOExtentCreator implements OCLExtentCreator
     return createExtent(eClass, accessor, branch, timeStamp, canceled);
   }
 
-  protected Set<EObject> createExtent(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp,
-      final AtomicBoolean canceled)
+  protected Set<EObject> createExtent(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp, final AtomicBoolean canceled)
   {
     final Set<EObject> extent = new HashSet<EObject>();
     if (changeSetData != null)
@@ -142,8 +141,8 @@ public class CDOExtentCreator implements OCLExtentCreator
   /**
    * @since 4.1
    */
-  protected void createExtent(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp,
-      final AtomicBoolean canceled, CDORevisionHandler revisionHandler)
+  protected void createExtent(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp, final AtomicBoolean canceled,
+      CDORevisionHandler revisionHandler)
   {
     handleRevisions(eClass, accessor, branch, timeStamp, revisionHandler);
 
@@ -166,8 +165,7 @@ public class CDOExtentCreator implements OCLExtentCreator
   /**
    * @since 4.2
    */
-  protected void handleRevisions(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp,
-      CDORevisionHandler revisionHandler)
+  protected void handleRevisions(EClass eClass, IStoreAccessor accessor, CDOBranch branch, long timeStamp, CDORevisionHandler revisionHandler)
   {
     if (!eClass.isAbstract() && !eClass.isInterface())
     {
@@ -211,8 +209,8 @@ public class CDOExtentCreator implements OCLExtentCreator
     }
 
     @Override
-    protected Set<EObject> createExtent(final EClass eClass, final IStoreAccessor accessor, final CDOBranch branch,
-        final long timeStamp, final AtomicBoolean canceled)
+    protected Set<EObject> createExtent(final EClass eClass, final IStoreAccessor accessor, final CDOBranch branch, final long timeStamp,
+        final AtomicBoolean canceled)
     {
       return new Set<EObject>()
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
index 51720d4312..5d6cd5623a 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
@@ -93,8 +93,8 @@ public class OCLQueryHandler implements IQueryHandler
    */
   public static final String IMPLICIT_ROOT_CLASS_PARAMETER = "cdoImplicitRootClass";
 
-  private static final Set<String> SERVER_QUERY_PARAMETERS = Collections.unmodifiableSet(
-      new java.util.HashSet<String>(Arrays.asList(LAZY_EXTENTS_PARAMETER, IMPLICIT_ROOT_CLASS_PARAMETER)));
+  private static final Set<String> SERVER_QUERY_PARAMETERS = Collections
+      .unmodifiableSet(new java.util.HashSet<String>(Arrays.asList(LAZY_EXTENTS_PARAMETER, IMPLICIT_ROOT_CLASS_PARAMETER)));
 
   private static final EcoreFactory FACTORY = EcoreFactory.eINSTANCE;
 
@@ -131,8 +131,7 @@ public class OCLQueryHandler implements IQueryHandler
       Object result = evaluate(query, contextParameter.getObject());
       if (result == ocl.getEnvironment().getOCLStandardLibrary().getInvalid())
       {
-        throw new Exception(
-            "OCL query evaluated to 'invalid'. Run with '-Dorg.eclipse.ocl.debug=true' and visit the log for failure details.");
+        throw new Exception("OCL query evaluated to 'invalid'. Run with '-Dorg.eclipse.ocl.debug=true' and visit the log for failure details.");
       }
 
       if (result instanceof Collection<?>)
@@ -200,8 +199,7 @@ public class OCLQueryHandler implements IQueryHandler
   /**
    * @since 4.2
    */
-  protected OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> createOCL(CDOView view,
-      CDOExtentMap extentMap)
+  protected OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> createOCL(CDOView view, CDOExtentMap extentMap)
   {
     EcoreEnvironmentFactory envFactory = new CDOEnvironmentFactory(view.getSession().getPackageRegistry());
 
@@ -214,9 +212,8 @@ public class OCLQueryHandler implements IQueryHandler
   /**
    * @since 4.2
    */
-  protected Query<EClassifier, EClass, EObject> createQuery(CDOView view, CDOQueryInfo info,
-      ContextParameter contextParameter, OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> ocl)
-      throws ParserException, DiagnosticException
+  protected Query<EClassifier, EClass, EObject> createQuery(CDOView view, CDOQueryInfo info, ContextParameter contextParameter,
+      OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> ocl) throws ParserException, DiagnosticException
   {
     Map<String, Object> parameters = new HashMap<String, Object>(info.getParameters());
     initEnvironment(ocl.getEnvironment(), view.getSession().getPackageRegistry(), parameters);
@@ -249,9 +246,8 @@ public class OCLQueryHandler implements IQueryHandler
     return ContextParameter.getArbitraryContextClassifier(packageRegistry);
   }
 
-  protected void initEnvironment(
-      Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> environment,
-      CDOPackageRegistry packageRegistry, Map<String, Object> parameters)
+  protected void initEnvironment(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> environment, CDOPackageRegistry packageRegistry,
+      Map<String, Object> parameters)
   {
 
     // initialize parsing options
@@ -290,8 +286,7 @@ public class OCLQueryHandler implements IQueryHandler
     return implicitRootClass;
   }
 
-  protected OCLExpression<EClassifier> createInitExpression(OCLStandardLibrary<EClassifier> stdLib,
-      CDOPackageRegistry packageRegistry, Object value)
+  protected OCLExpression<EClassifier> createInitExpression(OCLStandardLibrary<EClassifier> stdLib, CDOPackageRegistry packageRegistry, Object value)
   {
     if (value instanceof String)
     {
@@ -350,8 +345,7 @@ public class OCLQueryHandler implements IQueryHandler
   }
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
-  protected void addEnvironmentVariable(
-      Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> environment,
+  protected void addEnvironmentVariable(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> environment,
       Variable<EClassifier, ?> variable)
   {
     environment.addElement(variable.getName(), (Variable)variable, true);
@@ -398,8 +392,8 @@ public class OCLQueryHandler implements IQueryHandler
       }
       catch (ClassCastException ex)
       {
-        throw new IllegalArgumentException("Parameter " + name + " must be a " + type.getSimpleName() + " but it is a "
-            + o + " class " + o.getClass().getName(), ex);
+        throw new IllegalArgumentException(
+            "Parameter " + name + " must be a " + type.getSimpleName() + " but it is a " + o + " class " + o.getClass().getName(), ex);
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
index 9b70acc108..3ffaa454a5 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java
@@ -104,8 +104,7 @@ public class SecurityExtension implements IAppExtension2
     NodeList securityManagers = repositoryConfig.getElementsByTagName("securityManager"); //$NON-NLS-1$
     if (securityManagers.getLength() > 1)
     {
-      throw new IllegalStateException(
-          "A maximum of one security manager can be configured for repository " + repository); //$NON-NLS-1$
+      throw new IllegalStateException("A maximum of one security manager can be configured for repository " + repository); //$NON-NLS-1$
     }
 
     if (securityManagers.getLength() == 1)
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
index 380987f1a0..740bad797a 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
@@ -626,26 +626,20 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
     // Create roles
 
     Role allReaderRole = realm.addRole(Role.ALL_OBJECTS_READER);
-    allReaderRole.getPermissions()
-        .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+    allReaderRole.getPermissions().add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
 
     Role allWriterRole = realm.addRole(Role.ALL_OBJECTS_WRITER);
-    allWriterRole.getPermissions()
-        .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+    allWriterRole.getPermissions().add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
 
     Role treeReaderRole = realm.addRole(Role.RESOURCE_TREE_READER);
-    treeReaderRole.getPermissions()
-        .add(SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+    treeReaderRole.getPermissions().add(SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
 
     Role treeWriterRole = realm.addRole(Role.RESOURCE_TREE_WRITER);
-    treeWriterRole.getPermissions()
-        .add(SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+    treeWriterRole.getPermissions().add(SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
 
     Role adminRole = realm.addRole(Role.ADMINISTRATION);
-    adminRole.getPermissions()
-        .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
-    adminRole.getPermissions()
-        .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
+    adminRole.getPermissions().add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
+    adminRole.getPermissions().add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
 
     // Create groups
 
@@ -686,8 +680,8 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
     return CDOPermission.NONE;
   }
 
-  protected CDOPermission authorize(CDORevision revision, CDORevisionProvider revisionProvider,
-      CDOBranchPoint securityContext, ISession session, Access defaultAccess, Permission[] permissions)
+  protected CDOPermission authorize(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, ISession session,
+      Access defaultAccess, Permission[] permissions)
   {
     if (lastRealmModification != CDOBranchPoint.UNSPECIFIED_DATE)
     {
@@ -840,8 +834,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
 
       for (Permission permission : user.getAllPermissions())
       {
-        if (permission.getAccess() == Access.WRITE
-            && permission.isApplicable(revision, revisionProvider, securityContext))
+        if (permission.getAccess() == Access.WRITE && permission.isApplicable(revision, revisionProvider, securityContext))
         {
           return true;
         }
@@ -976,8 +969,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
       throw new UnsupportedOperationException();
     }
 
-    public CDOPermission getPermission(CDORevision revision, final CDOBranchPoint securityContext,
-        final ISession session)
+    public CDOPermission getPermission(CDORevision revision, final CDOBranchPoint securityContext, final ISession session)
     {
       String userID = session.getUserID();
       if (SYSTEM_USER_ID.equals(userID))
@@ -1045,8 +1037,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
   {
     private final IRepository.WriteAccessHandler realmValidationHandler = new RealmValidationHandler();
 
-    public void handleTransactionBeforeCommitting(ITransaction transaction, final CommitContext commitContext,
-        OMMonitor monitor) throws RuntimeException
+    public void handleTransactionBeforeCommitting(ITransaction transaction, final CommitContext commitContext, OMMonitor monitor) throws RuntimeException
     {
       doHandleTransactionBeforeCommitting(transaction, commitContext, monitor);
 
@@ -1057,8 +1048,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
       }
     }
 
-    protected void doHandleTransactionBeforeCommitting(ITransaction transaction, final CommitContext commitContext,
-        OMMonitor monitor) throws RuntimeException
+    protected void doHandleTransactionBeforeCommitting(ITransaction transaction, final CommitContext commitContext, OMMonitor monitor) throws RuntimeException
     {
       if (transaction.getSessionID() == systemSession.getSessionID())
       {
@@ -1098,13 +1088,11 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
         for (int i = 0; i < revisions.length; i++)
         {
           InternalCDORevision revision = revisions[i];
-          CDOPermission permission = authorize(revision, commitContext, securityContext, session, userDefaultAccess,
-              userPermissions);
+          CDOPermission permission = authorize(revision, commitContext, securityContext, session, userDefaultAccess, userPermissions);
 
           if (permission != CDOPermission.WRITE)
           {
-            throw new SecurityException(
-                "User " + commitContext.getUserID() + " is not allowed to write to " + revision);
+            throw new SecurityException("User " + commitContext.getUserID() + " is not allowed to write to " + revision);
           }
 
           if (securityImpact != CommitNotificationInfo.IMPACT_REALM)
@@ -1177,8 +1165,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
       }
     }
 
-    public void handleTransactionAfterCommitted(ITransaction transaction, final CommitContext commitContext,
-        OMMonitor monitor)
+    public void handleTransactionAfterCommitted(ITransaction transaction, final CommitContext commitContext, OMMonitor monitor)
     {
       if (commitContext.getSecurityImpact() == CommitNotificationInfo.IMPACT_REALM)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
index eee33a03fa..b9e08b6a7e 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
@@ -51,8 +51,7 @@ public abstract class SecurityManagerCommand extends CDOCommand.WithRepository
   {
     public AddUser()
     {
-      super("adduser", "adds a user to the security realm of a repository", parameter("username"),
-          optional("password"));
+      super("adduser", "adds a user to the security realm of a repository", parameter("username"), optional("password"));
     }
 
     @Override
@@ -80,8 +79,7 @@ public abstract class SecurityManagerCommand extends CDOCommand.WithRepository
   {
     public SetPassword()
     {
-      super("setpassword", "sets or unsets the password of a repository user", parameter("username"),
-          optional("password"));
+      super("setpassword", "sets or unsets the password of a repository user", parameter("username"), optional("password"));
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
index 61c0f0da05..22e25c72a7 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
@@ -123,8 +123,7 @@ public class AnnotationHandler implements InternalSecurityManager.CommitHandler
     handlePermission(realm, eClass, key, access, filterClass, filterFeature);
   }
 
-  protected void handlePermission(Realm realm, EModelElement modelElement, String key, Access access,
-      EClass filterClass, EReference filterFeature)
+  protected void handlePermission(Realm realm, EModelElement modelElement, String key, Access access, EClass filterClass, EReference filterFeature)
   {
     String annotation = EcoreUtil.getAnnotation(modelElement, SOURCE_URI, key);
     if (annotation == null || annotation.length() == 0)
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/HomeFolderHandler.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/HomeFolderHandler.java
index 91482a52a5..cd8ab60a97 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/HomeFolderHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/HomeFolderHandler.java
@@ -151,8 +151,7 @@ public class HomeFolderHandler implements InternalSecurityManager.CommitHandler2
     }
   }
 
-  protected void handleUsers(final InternalSecurityManager securityManager, final List<String> userIDs,
-      final boolean init)
+  protected void handleUsers(final InternalSecurityManager securityManager, final List<String> userIDs, final boolean init)
   {
     executorService.submit(new Runnable()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/InternalSecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/InternalSecurityManager.java
index 0532bf534c..a13c2cfa92 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/InternalSecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/InternalSecurityManager.java
@@ -113,8 +113,7 @@ public interface InternalSecurityManager extends ISecurityManager
         handleCommitted(securityManager, commitContext, user);
       }
 
-      protected abstract void handleCommitted(InternalSecurityManager securityManager, CommitContext commitContext,
-          User user);
+      protected abstract void handleCommitted(InternalSecurityManager securityManager, CommitContext commitContext, User user);
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
index b28d4ec336..f209b7fea1 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
@@ -87,8 +87,7 @@ public abstract class SecurityManagerFactory extends Factory
 
       if (securityManager instanceof InternalSecurityManager)
       {
-        ((InternalSecurityManager)securityManager)
-            .setRepository((InternalRepository)RepositoryFactory.get(container, repositoryName));
+        ((InternalSecurityManager)securityManager).setRepository((InternalRepository)RepositoryFactory.get(container, repositoryName));
       }
 
       return securityManager;
@@ -140,8 +139,7 @@ public abstract class SecurityManagerFactory extends Factory
       OM.LOG.warn(
           "SecurityManagerFactory.Annotation is deprecated. As of 4.3 use SecurityManagerFactory.Default with a description like \"realmPath:annotation\"");
 
-      InternalSecurityManager securityManager = (InternalSecurityManager)SecurityManagerUtil
-          .createSecurityManager(realmPath);
+      InternalSecurityManager securityManager = (InternalSecurityManager)SecurityManagerUtil.createSecurityManager(realmPath);
 
       AnnotationHandler handler = new AnnotationHandler();
       securityManager.addCommitHandler(handler);
diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
index 3d9a7d4fb8..17b1d6255c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
@@ -186,14 +186,13 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Deprecated
-  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock,
-      long timeout) throws InterruptedException
+  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock, long timeout) throws InterruptedException
   {
     lock2(explicit, type, view, objectsToLock, false, timeout);
   }
 
-  public List<LockState<Object, IView>> lock2(boolean explicit, LockType type, IView view,
-      Collection<? extends Object> objectsToLock, boolean recursive, long timeout) throws InterruptedException
+  public List<LockState<Object, IView>> lock2(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock, boolean recursive,
+      long timeout) throws InterruptedException
   {
     String durableLockingID = null;
     DurableLocking accessor = null;
@@ -235,15 +234,14 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Override
-  public void lock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context,
-      Collection<? extends Object> objectsToLock, long timeout) throws InterruptedException
+  public void lock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context, Collection<? extends Object> objectsToLock, long timeout)
+      throws InterruptedException
   {
     lock2(false, type, context, objectsToLock, false, timeout);
   }
 
   @Override
-  public void lock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context, Object objectToLock,
-      long timeout) throws InterruptedException
+  public void lock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context, Object objectToLock, long timeout) throws InterruptedException
   {
     Collection<Object> objectsToLock = new LinkedHashSet<Object>();
     objectsToLock.add(objectToLock);
@@ -251,9 +249,8 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Override
-  public List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> lock2(
-      org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context,
-      Collection<? extends Object> objectsToLock, long timeout) throws InterruptedException
+  public List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> lock2(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type,
+      IView context, Collection<? extends Object> objectsToLock, long timeout) throws InterruptedException
   {
     return lock2(false, type, context, objectsToLock, false, timeout);
   }
@@ -280,8 +277,7 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
     return contents;
   }
 
-  private void createContentSet(CDOBranch branch, boolean branching, CDORevisionProvider revisionProvider,
-      CDORevision revision, Set<Object> contents)
+  private void createContentSet(CDOBranch branch, boolean branching, CDORevisionProvider revisionProvider, CDORevision revision, Set<Object> contents)
   {
     for (CDORevision child : CDORevisionUtil.getChildRevisions(revision, revisionProvider))
     {
@@ -292,14 +288,13 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Deprecated
-  public synchronized void unlock(boolean explicit, LockType type, IView view,
-      Collection<? extends Object> objectsToUnlock)
+  public synchronized void unlock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToUnlock)
   {
     unlock2(explicit, type, view, objectsToUnlock, false);
   }
 
-  public synchronized List<LockState<Object, IView>> unlock2(boolean explicit, LockType type, IView view,
-      Collection<? extends Object> objects, boolean recursive)
+  public synchronized List<LockState<Object, IView>> unlock2(boolean explicit, LockType type, IView view, Collection<? extends Object> objects,
+      boolean recursive)
   {
     List<LockState<Object, IView>> newLockStates;
     synchronized (this)
@@ -347,15 +342,14 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Override
-  public synchronized List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> unlock2(
-      IView context)
+  public synchronized List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> unlock2(IView context)
   {
     return unlock2(false, context);
   }
 
   @Override
-  public synchronized List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> unlock2(
-      IView context, Collection<? extends Object> objectsToUnlock)
+  public synchronized List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> unlock2(IView context,
+      Collection<? extends Object> objectsToUnlock)
   {
     // If no locktype is specified, use the LockType.WRITE
     return unlock2(false, LockType.WRITE, context, objectsToUnlock, false);
@@ -363,8 +357,7 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
 
   @Override
   public synchronized List<org.eclipse.net4j.util.concurrent.RWOLockManager.LockState<Object, IView>> unlock2(
-      org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context,
-      Collection<? extends Object> objectsToUnlock)
+      org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context, Collection<? extends Object> objectsToUnlock)
   {
     return unlock2(false, type, context, objectsToUnlock, false);
   }
@@ -376,20 +369,17 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Override
-  public synchronized void unlock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context,
-      Collection<? extends Object> objectsToUnlock)
+  public synchronized void unlock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, IView context, Collection<? extends Object> objectsToUnlock)
   {
     unlock2(type, context, objectsToUnlock);
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return createLockArea(userID, branchPoint, readOnly, locks, null);
   }
 
-  private LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks, String lockAreaID)
+  private LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks, String lockAreaID)
   {
     if (lockAreaID == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index d632dcaf69..b8312d490f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -525,8 +525,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     return accessor.loadCommitData(timeStamp);
   }
 
-  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth)
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     for (RevisionInfo info : infos)
     {
@@ -551,8 +550,8 @@ public class Repository extends Container<Object> implements InternalRepository,
         {
           CDOBranchVersion targetBranchVersion = pointerInfo.getTargetBranchVersion();
           InternalCDORevision target = loadRevisionByVersion(id, targetBranchVersion, referenceChunk);
-          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id,
-              pointerInfo.getAvailableBranchVersion().getBranch(), CDORevision.UNSPECIFIED_DATE, target);
+          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id, pointerInfo.getAvailableBranchVersion().getBranch(),
+              CDORevision.UNSPECIFIED_DATE, target);
 
           info.setResult(target);
           info.setSynthetic(pointer);
@@ -602,8 +601,8 @@ public class Repository extends Container<Object> implements InternalRepository,
         }
         else
         {
-          DetachedCDORevision detachedRevision = new DetachedCDORevision(EcorePackage.Literals.ECLASS, id,
-              branchPoint.getBranch(), 0, CDORevision.UNSPECIFIED_DATE);
+          DetachedCDORevision detachedRevision = new DetachedCDORevision(EcorePackage.Literals.ECLASS, id, branchPoint.getBranch(), 0,
+              CDORevision.UNSPECIFIED_DATE);
           info.setSynthetic(detachedRevision);
         }
       }
@@ -627,8 +626,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     return null;
   }
 
-  private InternalCDORevision loadRevisionTarget(CDOID id, CDOBranchPoint branchPoint, int referenceChunk,
-      IStoreAccessor accessor)
+  private InternalCDORevision loadRevisionTarget(CDOID id, CDOBranchPoint branchPoint, int referenceChunk, IStoreAccessor accessor)
   {
     CDOBranch branch = branchPoint.getBranch();
     while (!branch.isMainBranch())
@@ -807,8 +805,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     }
   }
 
-  public IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature, int chunkStart,
-      int chunkEnd)
+  public IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature, int chunkStart, int chunkEnd)
   {
     if (!revision.isUnchunked())
     {
@@ -850,8 +847,8 @@ public class Repository extends Container<Object> implements InternalRepository,
     return true;
   }
 
-  protected IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature,
-      IStoreAccessor accessor, MoveableList<Object> list, int chunkStart, int chunkEnd)
+  protected IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature, IStoreAccessor accessor, MoveableList<Object> list,
+      int chunkStart, int chunkEnd)
   {
     IStoreChunkReader chunkReader = null;
     int fromIndex = -1;
@@ -1311,8 +1308,8 @@ public class Repository extends Container<Object> implements InternalRepository,
 
   public Object[] getElements()
   {
-    final Object[] elements = { packageRegistry, branchManager, revisionManager, sessionManager, queryManager,
-        commitManager, commitInfoManager, getLockingManager(), store };
+    final Object[] elements = { packageRegistry, branchManager, revisionManager, sessionManager, queryManager, commitManager, commitInfoManager,
+        getLockingManager(), store };
     return elements;
   }
 
@@ -1425,8 +1422,7 @@ public class Repository extends Container<Object> implements InternalRepository,
   /**
    * @since 2.0
    */
-  public void notifyReadAccessHandlers(InternalSession session, CDORevision[] revisions,
-      List<CDORevision> additionalRevisions)
+  public void notifyReadAccessHandlers(InternalSession session, CDORevision[] revisions, List<CDORevision> additionalRevisions)
   {
     ReadAccessHandler[] handlers;
     synchronized (readAccessHandlers)
@@ -1447,8 +1443,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     }
   }
 
-  public void notifyWriteAccessHandlers(ITransaction transaction, IStoreAccessor.CommitContext commitContext,
-      boolean beforeCommit, OMMonitor monitor)
+  public void notifyWriteAccessHandlers(ITransaction transaction, IStoreAccessor.CommitContext commitContext, boolean beforeCommit, OMMonitor monitor)
   {
     WriteAccessHandler[] handlers;
     synchronized (writeAccessHandlers)
@@ -1504,8 +1499,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     this.initialPackages = initialPackages;
   }
 
-  public CDOReplicationInfo replicateRaw(CDODataOutput out, int lastReplicatedBranchID, long lastReplicatedCommitTime)
-      throws IOException
+  public CDOReplicationInfo replicateRaw(CDODataOutput out, int lastReplicatedBranchID, long lastReplicatedCommitTime) throws IOException
   {
     final int fromBranchID = lastReplicatedBranchID + 1;
     final int toBranchID = store.getLastBranchID();
@@ -1560,8 +1554,8 @@ public class Repository extends Container<Object> implements InternalRepository,
   }
 
   @Deprecated
-  public Set<CDOID> getMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo, OMMonitor monitor)
+  public Set<CDOID> getMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo, OMMonitor monitor)
   {
     MergeDataResult result = getMergeData2(targetInfo, sourceInfo, targetBaseInfo, sourceBaseInfo, monitor);
     Set<CDOID> ids = result.getTargetIDs();
@@ -1683,8 +1677,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     }
   }
 
-  private CDOBranchPointRange getLatestMerge(CDOChangeSetSegment[] targetSegments, CDOChangeSetSegment[] sourceSegments,
-      long ancestorTime)
+  private CDOBranchPointRange getLatestMerge(CDOChangeSetSegment[] targetSegments, CDOChangeSetSegment[] sourceSegments, long ancestorTime)
   {
     for (int i = targetSegments.length - 1; i >= 0; --i)
     {
@@ -1721,8 +1714,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     return null;
   }
 
-  private CDOBranchPoint getMergeSource(CDOCommitInfo commitInfo, CDOChangeSetSegment[] sourceSegments,
-      long ancestorTime)
+  private CDOBranchPoint getMergeSource(CDOCommitInfo commitInfo, CDOChangeSetSegment[] sourceSegments, long ancestorTime)
   {
     CDOBranchPoint mergeSource = commitInfo.getMergeSource();
     if (mergeSource != null)
@@ -1802,8 +1794,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     accessor.loadLob(id, out);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      final CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, final CDORevisionHandler handler)
   {
     CDORevisionHandler wrapper = handler;
     if (!exactBranch && !branch.isMainBranch())
@@ -1845,8 +1836,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     }
   }
 
-  public static List<Object> revisionKeysToObjects(List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch,
-      boolean isSupportingBranches)
+  public static List<Object> revisionKeysToObjects(List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, boolean isSupportingBranches)
   {
     List<Object> lockables = new ArrayList<Object>();
     for (CDORevisionKey revKey : revisionKeys)
@@ -1865,15 +1855,13 @@ public class Repository extends Container<Object> implements InternalRepository,
     return lockables;
   }
 
-  public LockObjectsResult lock(InternalView view, LockType lockType, List<CDORevisionKey> revKeys, boolean recursive,
-      long timeout)
+  public LockObjectsResult lock(InternalView view, LockType lockType, List<CDORevisionKey> revKeys, boolean recursive, long timeout)
   {
     List<Object> lockables = revisionKeysToObjects(revKeys, view.getBranch(), isSupportingBranches());
     return lock(view, lockType, lockables, revKeys, recursive, timeout);
   }
 
-  protected LockObjectsResult lock(InternalView view, LockType type, List<Object> lockables,
-      List<CDORevisionKey> loadedRevs, boolean recursive, long timeout)
+  protected LockObjectsResult lock(InternalView view, LockType type, List<Object> lockables, List<CDORevisionKey> loadedRevs, boolean recursive, long timeout)
   {
     List<LockState<Object, IView>> newLockStates = null;
 
@@ -1911,20 +1899,18 @@ public class Repository extends Container<Object> implements InternalRepository,
     if (staleNoUpdate)
     {
       getLockingManager().unlock2(true, type, view, lockables, recursive);
-      return new LockObjectsResult(false, false, false, requiredTimestamp[0], staleRevisionsArray, new CDOLockState[0],
-          getTimeStamp());
+      return new LockObjectsResult(false, false, false, requiredTimestamp[0], staleRevisionsArray, new CDOLockState[0], getTimeStamp());
     }
 
     CDOLockState[] cdoLockStates = toCDOLockStates(newLockStates);
     sendLockNotifications(view, Operation.LOCK, type, cdoLockStates);
 
     boolean waitForUpdate = staleRevisionsArray.length > 0;
-    return new LockObjectsResult(true, false, waitForUpdate, requiredTimestamp[0], staleRevisionsArray, cdoLockStates,
-        getTimeStamp());
+    return new LockObjectsResult(true, false, waitForUpdate, requiredTimestamp[0], staleRevisionsArray, cdoLockStates, getTimeStamp());
   }
 
-  private CDORevisionKey[] checkStaleRevisions(InternalView view, List<CDORevisionKey> revisionKeys,
-      List<Object> objectsToLock, LockType lockType, long[] requiredTimestamp)
+  private CDORevisionKey[] checkStaleRevisions(InternalView view, List<CDORevisionKey> revisionKeys, List<Object> objectsToLock, LockType lockType,
+      long[] requiredTimestamp)
   {
     List<CDORevisionKey> staleRevisions = new LinkedList<CDORevisionKey>();
     if (revisionKeys != null)
@@ -1938,8 +1924,7 @@ public class Repository extends Container<Object> implements InternalRepository,
 
         if (rev == null)
         {
-          throw new IllegalArgumentException(
-              String.format("Object %s not found in branch %s (possibly detached)", id, viewedBranch));
+          throw new IllegalArgumentException(String.format("Object %s not found in branch %s (possibly detached)", id, viewedBranch));
         }
 
         if (!revKey.equals(rev))
@@ -1961,8 +1946,7 @@ public class Repository extends Container<Object> implements InternalRepository,
   private void sendLockNotifications(IView view, Operation operation, LockType lockType, CDOLockState[] cdoLockStates)
   {
     long timestamp = getTimeStamp();
-    CDOLockChangeInfo lockChangeInfo = CDOLockUtil.createLockChangeInfo(timestamp, view, view.getBranch(), operation,
-        lockType, cdoLockStates);
+    CDOLockChangeInfo lockChangeInfo = CDOLockUtil.createLockChangeInfo(timestamp, view, view.getBranch(), operation, lockType, cdoLockStates);
     getSessionManager().sendLockNotification((InternalSession)view.getSession(), lockChangeInfo);
   }
 
@@ -1998,8 +1982,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     return doUnlock(view, lockType, unlockables, recursive);
   }
 
-  protected UnlockObjectsResult doUnlock(InternalView view, LockType lockType, List<Object> unlockables,
-      boolean recursive)
+  protected UnlockObjectsResult doUnlock(InternalView view, LockType lockType, List<Object> unlockables, boolean recursive)
   {
     List<LockState<Object, IView>> newLockStates = null;
     if (lockType == null) // Signals an unlock-all operation
@@ -2188,8 +2171,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     CDOBranchPoint head = branchManager.getMainBranch().getHead();
 
     CDORevisionFactory factory = getRevisionManager().getFactory();
-    InternalCDORevision rootResource = (InternalCDORevision)factory
-        .createRevision(EresourcePackage.Literals.CDO_RESOURCE);
+    InternalCDORevision rootResource = (InternalCDORevision)factory.createRevision(EresourcePackage.Literals.CDO_RESOURCE);
 
     rootResource.setBranchPoint(head);
     rootResource.setContainerID(CDOID.NULL);
@@ -2242,8 +2224,7 @@ public class Repository extends Container<Object> implements InternalRepository,
     session.close();
   }
 
-  private InternalCDOPackageUnit[] getNewPackageUnitsForRootResource(
-      InternalCDOPackageRegistry commitContextPackageRegistry)
+  private InternalCDOPackageUnit[] getNewPackageUnitsForRootResource(InternalCDOPackageRegistry commitContextPackageRegistry)
   {
     Collection<InternalCDOPackageUnit> newPackageUnitsForRootResource = new ArrayList<InternalCDOPackageUnit>();
     IPackageClosure closure = new CompletePackageClosure();
@@ -2353,10 +2334,8 @@ public class Repository extends Container<Object> implements InternalRepository,
       throw new IllegalStateException("Store can not handle client-assigned IDs: " + store);
     }
 
-    store.setRevisionTemporality(
-        supportingAudits ? IStore.RevisionTemporality.AUDITING : IStore.RevisionTemporality.NONE);
-    store.setRevisionParallelism(
-        supportingBranches ? IStore.RevisionParallelism.BRANCHING : IStore.RevisionParallelism.NONE);
+    store.setRevisionTemporality(supportingAudits ? IStore.RevisionTemporality.AUDITING : IStore.RevisionTemporality.NONE);
+    store.setRevisionParallelism(supportingBranches ? IStore.RevisionParallelism.BRANCHING : IStore.RevisionParallelism.NONE);
     revisionManager.setSupportingAudits(supportingAudits);
     revisionManager.setSupportingBranches(supportingBranches);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
index d72b2c6c5c..17203f52e1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
@@ -102,8 +102,7 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
 {
   private static final CDOAdapterPolicy[] ADAPTER_POLICIES = new CDOAdapterPolicy[0];
 
-  private static final CDORevisionPrefetchingPolicy REVISION_PREFETCHING = CDOUtil
-      .createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
+  private static final CDORevisionPrefetchingPolicy REVISION_PREFETCHING = CDOUtil.createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
 
   private InternalCDOSession session;
 
@@ -170,14 +169,12 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
     throw new UnsupportedOperationException();
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout) throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive) throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
@@ -267,16 +264,15 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
   {
     throw new UnsupportedOperationException();
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async,
-      boolean clearResourcePathCache)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async, boolean clearResourcePathCache)
   {
     throw new UnsupportedOperationException();
   }
@@ -485,8 +481,7 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
   /**
    * @author Eike Stepper
    */
-  private final class ServerCDOSession extends PlatformObject
-      implements InternalCDOSession, CDORepositoryInfo, org.eclipse.emf.cdo.session.CDOSession.Options
+  private final class ServerCDOSession extends PlatformObject implements InternalCDOSession, CDORepositoryInfo, org.eclipse.emf.cdo.session.CDOSession.Options
   {
     private final IRegistry<String, Object> properties = new HashMapRegistry<String, Object>()
     {
@@ -1011,8 +1006,7 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
       throw new UnsupportedOperationException();
     }
 
-    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex,
-        int serverIndex)
+    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex, int serverIndex)
     {
       throw new UnsupportedOperationException();
     }
@@ -1027,8 +1021,8 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
       throw new UnsupportedOperationException();
     }
 
-    public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch,
-        List<InternalCDOView> branchViews, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
+    public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch, List<InternalCDOView> branchViews,
+        Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
     {
       throw new UnsupportedOperationException();
     }
@@ -1056,8 +1050,8 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
     }
 
     @Deprecated
-    public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache,
-        byte securityImpact, Map<CDOID, CDOPermission> newPermissions)
+    public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache, byte securityImpact,
+        Map<CDOID, CDOPermission> newPermissions)
     {
       throw new UnsupportedOperationException();
     }
@@ -1179,14 +1173,12 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
       throw new UnsupportedOperationException();
     }
 
-    public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase,
-        boolean computeChangeSets)
+    public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, boolean computeChangeSets)
     {
       throw new UnsupportedOperationException();
     }
 
-    public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase,
-        CDOBranchPoint sourceBase, boolean computeChangeSets)
+    public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase, CDOBranchPoint sourceBase, boolean computeChangeSets)
     {
       throw new UnsupportedOperationException();
     }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index b1e9b347e2..0c8f68d629 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -209,8 +209,7 @@ public class Session extends Container<IView> implements InternalSession
     if (this.subscribed != subscribed)
     {
       this.subscribed = subscribed;
-      byte opcode = subscribed ? CDOProtocolConstants.REMOTE_SESSION_SUBSCRIBED
-          : CDOProtocolConstants.REMOTE_SESSION_UNSUBSCRIBED;
+      byte opcode = subscribed ? CDOProtocolConstants.REMOTE_SESSION_SUBSCRIBED : CDOProtocolConstants.REMOTE_SESSION_UNSUBSCRIBED;
       manager.sendRemoteSessionNotification(this, opcode);
     }
   }
@@ -399,8 +398,8 @@ public class Session extends Container<IView> implements InternalSession
    *
    * @since 2.0
    */
-  public void collectContainedRevisions(InternalCDORevision revision, CDOBranchPoint branchPoint, int referenceChunk,
-      Set<CDOID> revisions, List<CDORevision> additionalRevisions)
+  public void collectContainedRevisions(InternalCDORevision revision, CDOBranchPoint branchPoint, int referenceChunk, Set<CDOID> revisions,
+      List<CDORevision> additionalRevisions)
   {
     InternalCDORevisionManager revisionManager = manager.getRepository().getRevisionManager();
     for (EStructuralFeature feature : revision.getClassInfo().getAllPersistentFeatures())
@@ -414,8 +413,7 @@ public class Session extends Container<IView> implements InternalSession
           CDOID id = (CDOID)value;
           if (!CDOIDUtil.isNull(id) && !revisions.contains(id))
           {
-            InternalCDORevision containedRevision = revisionManager.getRevision(id, branchPoint, referenceChunk,
-                CDORevision.DEPTH_NONE, true);
+            InternalCDORevision containedRevision = revisionManager.getRevision(id, branchPoint, referenceChunk, CDORevision.DEPTH_NONE, true);
             revisions.add(id);
             additionalRevisions.add(containedRevision);
 
@@ -443,8 +441,7 @@ public class Session extends Container<IView> implements InternalSession
     return CDORevision.PERMISSION_PROVIDER.getPermission(revision, securityContext);
   }
 
-  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
-      throws Exception
+  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType) throws Exception
   {
     if (protocol != null)
     {
@@ -453,14 +450,12 @@ public class Session extends Container<IView> implements InternalSession
   }
 
   @Deprecated
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
-      throws Exception
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState) throws Exception
   {
     sendRepositoryStateNotification(oldState, newState, null);
   }
 
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID) throws Exception
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID) throws Exception
   {
     if (protocol != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index ec3f7478e4..56bc66c813 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -284,8 +284,7 @@ public class SessionManager extends Container<ISession> implements InternalSessi
     sendRepositoryStateNotification(oldState, newState, null);
   }
 
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID)
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID)
   {
     for (InternalSession session : getSessions())
     {
@@ -452,8 +451,7 @@ public class SessionManager extends Container<ISession> implements InternalSessi
     }
   }
 
-  public List<Integer> sendRemoteMessageNotification(InternalSession sender, CDORemoteSessionMessage message,
-      int[] recipients)
+  public List<Integer> sendRemoteMessageNotification(InternalSession sender, CDORemoteSessionMessage message, int[] recipients)
   {
     List<Integer> result = new ArrayList<Integer>();
     for (int i = 0; i < recipients.length; i++)
@@ -549,8 +547,7 @@ public class SessionManager extends Container<ISession> implements InternalSessi
     changeUserCredentials(sessionProtocol, userID, CredentialsUpdateOperation.RESET_PASSWORD);
   }
 
-  protected void changeUserCredentials(IAuthenticationProtocol sessionProtocol, String userID,
-      CredentialsUpdateOperation operation)
+  protected void changeUserCredentials(IAuthenticationProtocol sessionProtocol, String userID, CredentialsUpdateOperation operation)
   {
 
     if (sessionProtocol == null)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
index da0089aa9e..327737b0e2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
@@ -636,8 +636,7 @@ public class TransactionCommitContext implements InternalCommitContext
     return old;
   }
 
-  protected InternalCDOPackageUnit[] lockPackageRegistry(InternalCDOPackageUnit[] packageUnits)
-      throws InterruptedException
+  protected InternalCDOPackageUnit[] lockPackageRegistry(InternalCDOPackageUnit[] packageUnits) throws InterruptedException
   {
     if (!packageRegistryLocked)
     {
@@ -909,8 +908,7 @@ public class TransactionCommitContext implements InternalCommitContext
     CDOCommitData commitData = createCommitData();
 
     InternalCDOCommitInfoManager commitInfoManager = repository.getCommitInfoManager();
-    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, commitComment,
-        commitMergeSource, commitData);
+    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, commitComment, commitMergeSource, commitData);
   }
 
   public CDOCommitInfo createFailureCommitInfo()
@@ -968,8 +966,7 @@ public class TransactionCommitContext implements InternalCommitContext
       }
     };
 
-    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection, changedObjectsCollection,
-        detachedObjectsCollection);
+    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection, changedObjectsCollection, detachedObjectsCollection);
   }
 
   protected void adjustForCommit()
@@ -1251,8 +1248,7 @@ public class TransactionCommitContext implements InternalCommitContext
     }
   }
 
-  protected boolean isTheRootReachable(InternalCDORevision revision, Set<CDOID> objectsThatReachTheRoot,
-      Set<CDOID> visited)
+  protected boolean isTheRootReachable(InternalCDORevision revision, Set<CDOID> objectsThatReachTheRoot, Set<CDOID> visited)
   {
     CDOID id = revision.getID();
     if (!visited.add(id))
@@ -1422,8 +1418,7 @@ public class TransactionCommitContext implements InternalCommitContext
       {
         if (lockState.isLocked(type, owner, false))
         {
-          List<LockState<Object, IView>> lockStates = lockManager.lock2(type, transaction,
-              Collections.singleton(target), 0);
+          List<LockState<Object, IView>> lockStates = lockManager.lock2(type, transaction, Collections.singleton(target), 0);
           postCommitLockState = lockStates.get(0);
         }
       }
@@ -1461,8 +1456,7 @@ public class TransactionCommitContext implements InternalCommitContext
     {
       RWOLockManager.setUnlockAll(true);
 
-      List<LockState<Object, IView>> lockStates = lockManager.unlock2(true, LockType.WRITE, transaction, targets,
-          false);
+      List<LockState<Object, IView>> lockStates = lockManager.unlock2(true, LockType.WRITE, transaction, targets, false);
       if (lockStates != null)
       {
         postCommitLockStates.addAll(lockStates);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/UnitManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/UnitManager.java
index 5ab1c0e0d0..d7e3e58153 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/UnitManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/UnitManager.java
@@ -296,8 +296,7 @@ public class UnitManager extends Container<IUnit> implements InternalUnitManager
     }
   }
 
-  public List<InternalCDORevisionDelta> getUnitMoves(InternalCDORevisionDelta[] deltas, CDORevisionProvider before,
-      CDORevisionProvider after)
+  public List<InternalCDORevisionDelta> getUnitMoves(InternalCDORevisionDelta[] deltas, CDORevisionProvider before, CDORevisionProvider after)
   {
     ReadLock readLock = managerLock.readLock();
     readLock.lock();
@@ -465,14 +464,12 @@ public class UnitManager extends Container<IUnit> implements InternalUnitManager
     return new UnitInitializer(rootID, view, revisionHandler);
   }
 
-  protected ObjectAttacher createObjectAttacher(InternalCommitContext commitContext,
-      List<InternalCDORevision> unmappedRevisions)
+  protected ObjectAttacher createObjectAttacher(InternalCommitContext commitContext, List<InternalCDORevision> unmappedRevisions)
   {
     return new ObjectAttacher(commitContext, unmappedRevisions);
   }
 
-  protected void mapAttachedObjectsToUnits(InternalCommitContext commitContext, long timeStamp,
-      Map<CDOID, CDOID> unitMappings)
+  protected void mapAttachedObjectsToUnits(InternalCommitContext commitContext, long timeStamp, Map<CDOID, CDOID> unitMappings)
   {
     UnitSupport storeAccessor = (UnitSupport)commitContext.getAccessor();
     storeAccessor.writeUnits(unitMappings, timeStamp);
@@ -591,8 +588,7 @@ public class UnitManager extends Container<IUnit> implements InternalUnitManager
     /**
      * Does not hold any manager lock when called.
      */
-    public void initialize(IView view, long timeStamp, CDORevisionHandler revisionHandler,
-        Map<ObjectAttacher, List<CDOID>> objectAttachers, OMMonitor monitor)
+    public void initialize(IView view, long timeStamp, CDORevisionHandler revisionHandler, Map<ObjectAttacher, List<CDOID>> objectAttachers, OMMonitor monitor)
     {
       UnitSupport storeAccessor = (UnitSupport)repository.getStore().getWriter(null);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
index 8b73271929..54baac43e1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
@@ -151,19 +151,16 @@ public class View extends Lifecycle implements InternalView, CDOCommonView.Optio
   public InternalCDORevision getRevision(CDOID id)
   {
     CDORevisionManager revisionManager = repository.getRevisionManager();
-    return (InternalCDORevision)revisionManager.getRevision(id, normalizedBranchPoint, CDORevision.UNCHUNKED,
-        CDORevision.DEPTH_NONE, true);
+    return (InternalCDORevision)revisionManager.getRevision(id, normalizedBranchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
   }
 
   private List<CDORevision> getRevisions(List<CDOID> ids)
   {
     InternalCDORevisionManager revisionManager = repository.getRevisionManager();
-    return revisionManager.getRevisions(ids, normalizedBranchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE,
-        true);
+    return revisionManager.getRevisions(ids, normalizedBranchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
   }
 
-  public void changeTarget(CDOBranchPoint branchPoint, List<CDOID> invalidObjects,
-      List<CDORevisionDelta> allChangedObjects, List<CDOID> allDetachedObjects)
+  public void changeTarget(CDOBranchPoint branchPoint, List<CDOID> invalidObjects, List<CDORevisionDelta> allChangedObjects, List<CDOID> allDetachedObjects)
   {
     List<CDORevision> oldRevisions = getRevisions(invalidObjects);
     setBranchPoint(branchPoint);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
index a1c413b2ae..fff86f0e83 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
@@ -72,8 +72,7 @@ public class XRefsQueryHandler implements IQueryHandler
       CDOBranch branch = branchPoint.getBranch();
       int maxResults = info.getMaxResults();
 
-      while (!branch.isMainBranch()
-          && (maxResults == CDOQueryInfo.UNLIMITED_RESULTS || context.getResultCount() < maxResults))
+      while (!branch.isMainBranch() && (maxResults == CDOQueryInfo.UNLIMITED_RESULTS || context.getResultCount() < maxResults))
       {
         branchPoint = branch.getBase();
         branch = branchPoint.getBranch();
@@ -88,8 +87,7 @@ public class XRefsQueryHandler implements IQueryHandler
     }
   }
 
-  public static void collectSourceCandidates(IView view, Collection<EClass> concreteTypes,
-      Map<EClass, List<EReference>> sourceCandidates)
+  public static void collectSourceCandidates(IView view, Collection<EClass> concreteTypes, Map<EClass, List<EReference>> sourceCandidates)
   {
     InternalRepository repository = (InternalRepository)view.getRepository();
     CDOPackageRegistry packageRegistry = repository.getPackageRegistry(false);
@@ -114,8 +112,7 @@ public class XRefsQueryHandler implements IQueryHandler
     }
   }
 
-  public static void collectSourceCandidates(CDOPackageInfo packageInfo, Collection<EClass> concreteTypes,
-      Map<EClass, List<EReference>> sourceCandidates)
+  public static void collectSourceCandidates(CDOPackageInfo packageInfo, Collection<EClass> concreteTypes, Map<EClass, List<EReference>> sourceCandidates)
   {
     State state = packageInfo.getPackageUnit().getState();
     if (state == CDOPackageUnit.State.LOADED || state == CDOPackageUnit.State.PROXY)
@@ -131,8 +128,7 @@ public class XRefsQueryHandler implements IQueryHandler
     }
   }
 
-  public static void collectSourceCandidates(EClass eClass, Collection<EClass> concreteTypes,
-      Map<EClass, List<EReference>> sourceCandidates)
+  public static void collectSourceCandidates(EClass eClass, Collection<EClass> concreteTypes, Map<EClass, List<EReference>> sourceCandidates)
   {
     if (!eClass.isAbstract() && !eClass.isInterface())
     {
@@ -143,8 +139,8 @@ public class XRefsQueryHandler implements IQueryHandler
     }
   }
 
-  public static void collectSourceCandidates(EReference eReference, Collection<EClass> concreteTypes,
-      Map<EClass, List<EReference>> sourceCandidates, CDOPackageRegistry packageRegistry)
+  public static void collectSourceCandidates(EReference eReference, Collection<EClass> concreteTypes, Map<EClass, List<EReference>> sourceCandidates,
+      CDOPackageRegistry packageRegistry)
   {
     EClass rootClass = eReference.getEContainingClass();
     collectSourceCandidates(rootClass, eReference, concreteTypes, sourceCandidates);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOCommandProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOCommandProvider.java
index 570505d1ba..942d5bd2f2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOCommandProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOCommandProvider.java
@@ -77,8 +77,7 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand start = new CDOCommand("start", "start repositories from a config file",
-      CDOCommand.parameter("config-file"))
+  private static final CDOCommand start = new CDOCommand("start", "start repositories from a config file", CDOCommand.parameter("config-file"))
   {
     @Override
     public void execute(String[] args) throws Exception
@@ -110,8 +109,8 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand exportXML = new CDOCommand.WithRepository("export",
-      "export the contents of a repository to an XML file", CDOCommand.parameter("export-file"))
+  private static final CDOCommand exportXML = new CDOCommand.WithRepository("export", "export the contents of a repository to an XML file",
+      CDOCommand.parameter("export-file"))
   {
     @Override
     public void execute(InternalRepository repository, String[] args) throws Exception
@@ -134,8 +133,8 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand importXML = new CDOCommand.WithRepository("import",
-      "import the contents of a repository from an XML file", CDOCommand.parameter("import-file"))
+  private static final CDOCommand importXML = new CDOCommand.WithRepository("import", "import the contents of a repository from an XML file",
+      CDOCommand.parameter("import-file"))
   {
     @Override
     public void execute(InternalRepository repository, String[] args) throws Exception
@@ -163,8 +162,7 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand branches = new CDOCommand.WithRepository("branches",
-      "dump the branches of a repository")
+  private static final CDOCommand branches = new CDOCommand.WithRepository("branches", "dump the branches of a repository")
   {
     @Override
     public void execute(InternalRepository repository, String[] args) throws Exception
@@ -183,8 +181,7 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand packages = new CDOCommand.WithRepository("packages",
-      "dump the packages of a repository")
+  private static final CDOCommand packages = new CDOCommand.WithRepository("packages", "dump the packages of a repository")
   {
     @Override
     public void execute(InternalRepository repository, String[] args) throws Exception
@@ -201,8 +198,7 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand sessions = new CDOCommand.WithRepository("sessions",
-      "dump the sessions of a repository")
+  private static final CDOCommand sessions = new CDOCommand.WithRepository("sessions", "dump the sessions of a repository")
   {
     @Override
     public void execute(InternalRepository repository, String[] args) throws Exception
@@ -219,8 +215,7 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand locks = new CDOCommand.WithAccessor("locks", "dump the locks of a repository",
-      CDOCommand.optional("username-prefix"))
+  private static final CDOCommand locks = new CDOCommand.WithAccessor("locks", "dump the locks of a repository", CDOCommand.optional("username-prefix"))
   {
     @Override
     public void execute(InternalRepository repository, IStoreAccessor accessor, String[] args) throws Exception
@@ -243,8 +238,8 @@ public class CDOCommandProvider implements CommandProvider
     }
   };
 
-  private static final CDOCommand deletelocks = new CDOCommand.WithAccessor("deletelocks",
-      "delete a durable locking area of a repository", CDOCommand.parameter("area-id"))
+  private static final CDOCommand deletelocks = new CDOCommand.WithAccessor("deletelocks", "delete a durable locking area of a repository",
+      CDOCommand.parameter("area-id"))
   {
     @Override
     public void execute(InternalRepository repository, IStoreAccessor accessor, String[] args) throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
index b02700c572..4ef5fe8aee 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
@@ -207,8 +207,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex,
-      int fromIndex, int toIndex)
+  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex)
   {
     throw new UnsupportedOperationException();
   }
@@ -242,8 +241,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth)
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     try
     {
@@ -269,8 +267,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     }
   }
 
-  public RefreshSessionResult refresh(long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
+  public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates)
   {
     throw new UnsupportedOperationException();
@@ -294,8 +291,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
+  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
   {
     // TODO: implement EmbeddedClientSessionProtocol.changeView(viewID, branchPoint, invalidObjects, allChangedObjects,
     // allDetachedObjects, monitor)
@@ -388,8 +385,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   }
 
   @Deprecated
-  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch,
-      LockType lockType, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
+      throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
@@ -397,8 +394,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   /**
    * @since 4.1
    */
-  public LockObjectsResult lockObjects2(List<CDORevisionKey> keys, int viewID, CDOBranch viewedBranch, LockType type,
-      boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects2(List<CDORevisionKey> keys, int viewID, CDOBranch viewedBranch, LockType type, boolean recursive, long timeout)
+      throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
@@ -414,14 +411,13 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> keys, CDOBranch viewedBranch,
-      LockType type, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> keys, CDOBranch viewedBranch, LockType type, boolean recursive,
+      long timeout) throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
 
-  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> ids, LockType type,
-      boolean recursive)
+  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> ids, LockType type, boolean recursive)
   {
     throw new UnsupportedOperationException();
   }
@@ -443,8 +439,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     // TODO: implement EmbeddedClientSessionProtocol.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime,
     // handler)
@@ -452,8 +447,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   }
 
   @Deprecated
-  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
+      Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -471,8 +466,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
       CDOCommitData commitData = context.getCommitData();
 
       int transactionID = transaction.getViewID();
-      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession()
-          .getView(transactionID);
+      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession().getView(transactionID);
       serverCommitContext = serverTransaction.createCommitContext();
       serverCommitContext.preWrite();
       serverCommitContext.setAutoReleaseLocksEnabled(transaction.options().isAutoReleaseLocksEnabled());
@@ -529,8 +523,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   }
 
   @Deprecated
-  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
+      Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -595,8 +589,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
+  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo)
   {
     throw new UnsupportedOperationException();
   }
@@ -659,8 +653,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
     throw new UnsupportedOperationException();
   }
 
-  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler,
-      OMMonitor monitor)
+  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java
index 2431c84c83..5a5feae4ea 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java
@@ -62,8 +62,7 @@ public class EmbeddedServerSessionProtocol extends Lifecycle implements ISession
   }
 
   @Deprecated
-  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken)
-      throws Exception
+  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception
   {
     return clientSessionProtocol.handleAuthenticationChallenge(randomToken);
   }
@@ -73,8 +72,7 @@ public class EmbeddedServerSessionProtocol extends Lifecycle implements ISession
     throw new UnsupportedOperationException();
   }
 
-  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation)
-      throws Exception
+  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation) throws Exception
   {
     throw new UnsupportedOperationException();
   }
@@ -91,8 +89,7 @@ public class EmbeddedServerSessionProtocol extends Lifecycle implements ISession
     sendRepositoryStateNotification(oldState, newState, null);
   }
 
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID)
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID)
   {
     EmbeddedClientSession clientSession = clientSessionProtocol.getSession();
     clientSession.handleRepositoryStateChanged(oldState, newState);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
index 3580259792..9ff74da5df 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
@@ -133,8 +133,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
    */
   public MEMStore(int listLimit)
   {
-    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA),
-        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
+    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
         set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
     setRevisionTemporality(RevisionTemporality.AUDITING);
     setRevisionParallelism(RevisionParallelism.BRANCHING);
@@ -285,8 +284,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  public synchronized void loadCommitInfos(final CDOBranch branch, long startTime, final long endTime,
-      CDOCommitInfoHandler handler)
+  public synchronized void loadCommitInfos(final CDOBranch branch, long startTime, final long endTime, CDOCommitInfoHandler handler)
   {
     InternalCDOCommitInfoManager manager = getRepository().getCommitInfoManager();
 
@@ -411,8 +409,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  public synchronized void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public synchronized void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     for (List<InternalCDORevision> list : revisions.values())
     {
@@ -426,8 +423,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  private boolean handleRevision(InternalCDORevision revision, EClass eClass, CDOBranch branch, long timeStamp,
-      boolean exactTime, CDORevisionHandler handler)
+  private boolean handleRevision(InternalCDORevision revision, EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     if (eClass != null && revision.getEClass() != eClass)
     {
@@ -568,8 +564,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  public synchronized void addCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource)
+  public synchronized void addCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource)
   {
     int index = commitInfos.size() - 1;
     while (index >= 0)
@@ -774,8 +769,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  private boolean queryXRefs(QueryXRefsContext context, Set<CDOID> targetIDs, CDOID targetID, CDOID sourceID,
-      EReference sourceReference, int index)
+  private boolean queryXRefs(QueryXRefsContext context, Set<CDOID> targetIDs, CDOID targetID, CDOID sourceID, EReference sourceReference, int index)
   {
     for (CDOID id : targetIDs)
     {
@@ -792,15 +786,13 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     return true;
   }
 
-  public synchronized void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime,
-      long toCommitTime)
+  public synchronized void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
   {
     // TODO: implement MEMStore.rawExport(out, fromBranchID, toBranchID, fromCommitTime, toCommitTime)
     throw new UnsupportedOperationException();
   }
 
-  public synchronized void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime,
-      long toCommitTime, OMMonitor monitor)
+  public synchronized void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor)
   {
     // TODO: implement MEMStore.rawImport(in, fromBranchID, toBranchID, fromCommitTime, toCommitTime, monitor)
     throw new UnsupportedOperationException();
@@ -824,14 +816,12 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
     }
   }
 
-  public synchronized LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public synchronized LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return createLockArea(null, userID, branchPoint, readOnly, locks);
   }
 
-  public synchronized LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint,
-      boolean readOnly, Map<CDOID, LockGrade> locks)
+  public synchronized LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     if (durableLockingID != null)
     {
@@ -1421,8 +1411,7 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
 
     private CDOBranchPoint mergeSource;
 
-    public CommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-        CDOBranchPoint mergeSource)
+    public CommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource)
     {
       super(timeStamp);
       this.branch = branch;
@@ -1439,16 +1428,14 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
 
     public void handle(InternalCDOCommitInfoManager manager, CDOCommitInfoHandler handler)
     {
-      CDOCommitInfo commitInfo = manager.createCommitInfo(branch, getTimeStamp(), previousTimeStamp, userID, comment,
-          mergeSource, null);
+      CDOCommitInfo commitInfo = manager.createCommitInfo(branch, getTimeStamp(), previousTimeStamp, userID, comment, mergeSource, null);
       handler.handleCommitInfo(commitInfo);
     }
 
     @Override
     public String toString()
     {
-      return MessageFormat.format("CommitInfo[{0}, {1}, {2}, {3}, {4}, {5}]", branch, getTimeStamp(), previousTimeStamp,
-          userID, comment, mergeSource);
+      return MessageFormat.format("CommitInfo[{0}, {1}, {2}, {3}, {4}, {5}]", branch, getTimeStamp(), previousTimeStamp, userID, comment, mergeSource);
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
index 0ff7819f42..bcd4b1aacd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
@@ -258,20 +258,17 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
     return store.readChangeSet(segments);
   }
 
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache)
   {
     return store.getRevision(id, branchPoint);
   }
 
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache)
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache)
   {
     return store.getRevisionByVersion(id, branchVersion);
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     store.handleRevisions(eClass, branch, timeStamp, exactTime, handler);
   }
@@ -296,15 +293,14 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
 
   @Deprecated
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+      OMMonitor monitor)
   {
     store.addCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource);
   }
@@ -353,8 +349,7 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
    * @since 2.0
    */
   @Override
-  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor)
+  protected void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor)
   {
     for (InternalCDORevisionDelta revisionDelta : revisionDeltas)
     {
@@ -422,14 +417,12 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
     return null;
   }
 
-  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException
   {
     store.rawExport(out, fromBranchID, toBranchID, fromCommitTime, toCommitTime);
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-      OMMonitor monitor) throws IOException
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException
   {
     store.rawImport(in, fromBranchID, toBranchID, fromCommitTime, toCommitTime, monitor);
   }
@@ -454,14 +447,12 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
     writeClob(id, size, reader);
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, null, monitor);
   }
 
-  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-      CDOBranchPoint mergeSource, OMMonitor monitor)
+  public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, monitor);
   }
@@ -476,14 +467,12 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements Raw2, Durab
     // Do nothing
   }
 
-  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return store.createLockArea(userID, branchPoint, readOnly, locks);
   }
 
-  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     return store.createLockArea(durableLockingID, userID, branchPoint, readOnly, locks);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
index 78a7ee8bcd..5f6cb7b345 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
@@ -109,8 +109,7 @@ public class FailoverParticipant extends SynchronizableRepository implements Int
         return createWriteThroughCommitContext(transaction);
       }
 
-      throw new IllegalStateException(
-          "Only the repository synchronizer is allowed to commit transactions to a backup repository");
+      throw new IllegalStateException("Only the repository synchronizer is allowed to commit transactions to a backup repository");
     }
 
     return createNormalCommitContext(transaction);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/ReplicatorCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/ReplicatorCommitContext.java
index 4d5a7b0245..e98832208f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/ReplicatorCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/ReplicatorCommitContext.java
@@ -116,8 +116,7 @@ public final class ReplicatorCommitContext extends TransactionCommitContext
     // Do nothing
   }
 
-  private static InternalCDOPackageUnit[] getNewPackageUnits(CDOCommitInfo commitInfo,
-      InternalCDOPackageRegistry packageRegistry)
+  private static InternalCDOPackageUnit[] getNewPackageUnits(CDOCommitInfo commitInfo, InternalCDOPackageRegistry packageRegistry)
   {
     List<CDOPackageUnit> list = commitInfo.getNewPackageUnits();
     InternalCDOPackageUnit[] result = new InternalCDOPackageUnit[list.size()];
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
index 7f3f1b55c1..fd11415bce 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
@@ -545,8 +545,7 @@ public abstract class SynchronizableRepository extends Repository.Default implem
   }
 
   @Override
-  public void notifyWriteAccessHandlers(ITransaction transaction, CommitContext commitContext, boolean beforeCommit,
-      OMMonitor monitor)
+  public void notifyWriteAccessHandlers(ITransaction transaction, CommitContext commitContext, boolean beforeCommit, OMMonitor monitor)
   {
     if (beforeCommit && commitContext.getNewPackageUnits().length != 0)
     {
@@ -695,8 +694,7 @@ public abstract class SynchronizableRepository extends Repository.Default implem
   }
 
   @Override
-  public LockObjectsResult lock(InternalView view, LockType lockType, List<CDORevisionKey> revisionKeys,
-      boolean recursive, long timeout)
+  public LockObjectsResult lock(InternalView view, LockType lockType, List<CDORevisionKey> revisionKeys, boolean recursive, long timeout)
   {
     if (view.getBranch().isLocal())
     {
@@ -711,8 +709,8 @@ public abstract class SynchronizableRepository extends Repository.Default implem
     return lockThrough(view, lockType, revisionKeys, false, timeout);
   }
 
-  private LockObjectsResult lockOnMaster(InternalView view, LockType type, List<CDORevisionKey> revKeys,
-      boolean recursive, long timeout) throws InterruptedException
+  private LockObjectsResult lockOnMaster(InternalView view, LockType type, List<CDORevisionKey> revKeys, boolean recursive, long timeout)
+      throws InterruptedException
   {
     // Delegate locking to the master
     InternalCDOSession remoteSession = getSynchronizer().getRemoteSession();
@@ -724,15 +722,13 @@ public abstract class SynchronizableRepository extends Repository.Default implem
       throw new IllegalStateException("Durable locking is not enabled for view " + view);
     }
 
-    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(), type,
-        recursive, timeout);
+    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(), type, recursive, timeout);
 
     if (masterLockingResult.isSuccessful() && masterLockingResult.isWaitForUpdate())
     {
       if (!getSynchronizer().getRemoteSession().options().isPassiveUpdateEnabled())
       {
-        throw new AssertionError(
-            "Master lock result requires clone to wait, but clone does not have passiveUpdates enabled.");
+        throw new AssertionError("Master lock result requires clone to wait, but clone does not have passiveUpdates enabled.");
       }
 
       long requiredTimestamp = masterLockingResult.getRequiredTimestamp();
@@ -745,8 +741,7 @@ public abstract class SynchronizableRepository extends Repository.Default implem
     return masterLockingResult;
   }
 
-  private LockObjectsResult lockThrough(InternalView view, LockType type, List<CDORevisionKey> keys, boolean recursive,
-      long timeout)
+  private LockObjectsResult lockThrough(InternalView view, LockType type, List<CDORevisionKey> keys, boolean recursive, long timeout)
   {
     try
     {
@@ -795,8 +790,7 @@ public abstract class SynchronizableRepository extends Repository.Default implem
     sessionProtocol.delegateUnlockObjects(lockAreaID, objectIDs, lockType, recursive);
   }
 
-  private UnlockObjectsResult unlockThrough(InternalView view, LockType lockType, List<CDOID> objectIDs,
-      boolean recursive)
+  private UnlockObjectsResult unlockThrough(InternalView view, LockType lockType, List<CDOID> objectIDs, boolean recursive)
   {
     unlockOnMaster(view, lockType, objectIDs, recursive);
     return super.unlock(view, lockType, objectIDs, recursive);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
index 3cf63642d4..8d42fa048d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
@@ -685,8 +685,8 @@ public class CDOServerBrowser extends Worker
       }
     }
 
-    protected String showPackage(InternalCDOPackageInfo info, InternalCDOPackageRegistry packageRegistry,
-        CDOServerBrowser browser, String param, PrintStream out, String prefix)
+    protected String showPackage(InternalCDOPackageInfo info, InternalCDOPackageRegistry packageRegistry, CDOServerBrowser browser, String param,
+        PrintStream out, String prefix)
     {
       EPackage ePackage = info.getEPackage();
       out.println("<h3>" + prefix + ePackage.getName() + "&nbsp;&nbsp;[" + ePackage.getNsURI() + "]</h3>");
@@ -905,9 +905,8 @@ public class CDOServerBrowser extends Worker
     /**
      * @since 4.0
      */
-    protected void showRevision(PrintStream pout, CDOServerBrowser browser,
-        Map<CDOBranch, List<CDORevision>> allRevisions, Map<CDOID, List<CDORevision>> ids, String key,
-        InternalRepository repository)
+    protected void showRevision(PrintStream pout, CDOServerBrowser browser, Map<CDOBranch, List<CDORevision>> allRevisions, Map<CDOID, List<CDORevision>> ids,
+        String key, InternalRepository repository)
     {
       CDORevisionKey revisionKey = CDORevisionUtil.parseRevisionKey(key, repository.getBranchManager());
       for (CDORevision revision : allRevisions.get(revisionKey.getBranch()))
@@ -923,8 +922,7 @@ public class CDOServerBrowser extends Worker
     /**
      * @since 4.0
      */
-    protected void showRevision(PrintStream pout, CDOServerBrowser browser, Map<CDOID, List<CDORevision>> ids,
-        InternalCDORevision revision)
+    protected void showRevision(PrintStream pout, CDOServerBrowser browser, Map<CDOID, List<CDORevision>> ids, InternalCDORevision revision)
     {
       String className = revision.getEClass().toString();
       className = className.substring(className.indexOf(' '));
@@ -976,8 +974,7 @@ public class CDOServerBrowser extends Worker
     /**
      * @since 4.0
      */
-    protected Object getRevisionValue(Object value, CDOServerBrowser browser, Map<CDOID, List<CDORevision>> ids,
-        InternalCDORevision context)
+    protected Object getRevisionValue(Object value, CDOServerBrowser browser, Map<CDOID, List<CDORevision>> ids, InternalCDORevision context)
     {
       if (value instanceof CDOID)
       {
@@ -1263,8 +1260,7 @@ public class CDOServerBrowser extends Worker
       out.print("</table>\r\n");
     }
 
-    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser,
-        String param)
+    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser, String param)
     {
       String hex = HexUtil.bytesToHex(id);
       boolean selected = hex.equals(param);
@@ -1363,8 +1359,7 @@ public class CDOServerBrowser extends Worker
       }
     }
 
-    protected boolean showCommitInfo(PrintStream out, CDOCommitInfo commitInfo, CDOServerBrowser browser, String param,
-        boolean auditing)
+    protected boolean showCommitInfo(PrintStream out, CDOCommitInfo commitInfo, CDOServerBrowser browser, String param, boolean auditing)
     {
       String timeStamp = String.valueOf(commitInfo.getTimeStamp());
       boolean selected = timeStamp.equals(param);
@@ -1408,8 +1403,7 @@ public class CDOServerBrowser extends Worker
         }
         else
         {
-          String mergeSourceLabel = browser.escape(mergeSource.getBranch().getPathName()) + "&nbsp;-&nbsp;"
-              + formatTimeStamp(mergeSource.getTimeStamp());
+          String mergeSourceLabel = browser.escape(mergeSource.getBranch().getPathName()) + "&nbsp;-&nbsp;" + formatTimeStamp(mergeSource.getTimeStamp());
           out.print(browser.href(mergeSourceLabel, getName(), "time", String.valueOf(mergeSource.getTimeStamp())));
         }
 
@@ -1427,8 +1421,8 @@ public class CDOServerBrowser extends Worker
       for (CDOIDAndVersion key : commitInfo.getNewObjects())
       {
         CDORevision newObject = (CDORevision)key;
-        out.print("<li>" + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision",
-            CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
+        out.print(
+            "<li>" + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision", CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
       }
 
       out.print("</ul>\r\n");
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
index 3b06c2e94c..9e871ae67b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
@@ -146,8 +146,7 @@ public abstract class CDOServerExporter<OUT>
     }
   }
 
-  protected abstract void startPackageUnit(OUT out, String id, CDOPackageUnit.Type type, long time, String data)
-      throws Exception;
+  protected abstract void startPackageUnit(OUT out, String id, CDOPackageUnit.Type type, long time, String data) throws Exception;
 
   protected abstract void endPackageUnit(OUT out) throws Exception;
 
@@ -184,22 +183,21 @@ public abstract class CDOServerExporter<OUT>
 
   protected void exportRevisions(final OUT out, CDOBranch branch) throws Exception
   {
-    repository.handleRevisions(null, branch, true, CDOBranchPoint.INVALID_DATE, false,
-        new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+    repository.handleRevisions(null, branch, true, CDOBranchPoint.INVALID_DATE, false, new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler()
+    {
+      public boolean handleRevision(CDORevision revision)
+      {
+        try
         {
-          public boolean handleRevision(CDORevision revision)
-          {
-            try
-            {
-              exportRevision(out, revision);
-              return true;
-            }
-            catch (Exception ex)
-            {
-              throw WrappedException.wrap(ex);
-            }
-          }
-        }));
+          exportRevision(out, revision);
+          return true;
+        }
+        catch (Exception ex)
+        {
+          throw WrappedException.wrap(ex);
+        }
+      }
+    }));
   }
 
   protected abstract void exportRevision(OUT out, CDORevision revision) throws Exception;
@@ -428,8 +426,7 @@ public abstract class CDOServerExporter<OUT>
     }
 
     @Override
-    protected void startPackageUnit(XMLOutput out, String id, CDOPackageUnit.Type type, long time, String data)
-        throws Exception
+    protected void startPackageUnit(XMLOutput out, String id, CDOPackageUnit.Type type, long time, String data) throws Exception
     {
       out.element(PACKAGE_UNIT);
       out.attribute(PACKAGE_UNIT_ID, id);
@@ -555,8 +552,7 @@ public abstract class CDOServerExporter<OUT>
       exportFeature(out, feature, FEATURE_TYPE, value);
     }
 
-    protected void exportFeature(XMLOutput out, EStructuralFeature feature, String featureType, Object value)
-        throws SAXException
+    protected void exportFeature(XMLOutput out, EStructuralFeature feature, String featureType, Object value) throws SAXException
     {
       if (value instanceof CDOID)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
index a02bee12d5..99d3876094 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerImporter.java
@@ -153,8 +153,7 @@ public abstract class CDOServerImporter
    */
   public static interface Handler2 extends Handler
   {
-    public void handleCommitInfo(long time, long previous, int branch, String user, String comment,
-        int mergeSourceBranchID, long mergeSourceTime);
+    public void handleCommitInfo(long time, long previous, int branch, String user, String comment, int mergeSourceBranchID, long mergeSourceTime);
   }
 
   /**
@@ -303,8 +302,7 @@ public abstract class CDOServerImporter
       handleCommitInfo(time, previous, branchID, user, comment, 0, CDOBranchPoint.UNSPECIFIED_DATE);
     }
 
-    public void handleCommitInfo(long time, long previous, int branchID, String user, String comment,
-        int mergeSourceBranchID, long mergeSourceTime)
+    public void handleCommitInfo(long time, long previous, int branchID, String user, String comment, int mergeSourceBranchID, long mergeSourceTime)
     {
       CDOBranch branch = repository.getBranchManager().getBranch(branchID);
       if (mergeSourceBranchID != 0 && accessor instanceof Raw2)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index 2467456dc9..0e6b5770fd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -148,8 +148,7 @@ public final class CDOServerUtil
    * @deprecated As of 4.2 the legacy mode is always enabled, use {@link #openView(ISession, CDOBranchPoint, CDORevisionProvider)}.
    */
   @Deprecated
-  public static CDOView openView(ISession session, CDOBranchPoint branchPoint, boolean legacyModeEnabled,
-      CDORevisionProvider revisionProvider)
+  public static CDOView openView(ISession session, CDOBranchPoint branchPoint, boolean legacyModeEnabled, CDORevisionProvider revisionProvider)
   {
     return openView(session, branchPoint, revisionProvider);
   }
@@ -212,8 +211,7 @@ public final class CDOServerUtil
   /**
    * @since 3.0
    */
-  public static IRepositorySynchronizer createRepositorySynchronizer(
-      CDOSessionConfigurationFactory remoteSessionConfigurationFactory)
+  public static IRepositorySynchronizer createRepositorySynchronizer(CDOSessionConfigurationFactory remoteSessionConfigurationFactory)
   {
     RepositorySynchronizer synchronizer = new RepositorySynchronizer();
     synchronizer.setRemoteSessionConfigurationFactory(remoteSessionConfigurationFactory);
@@ -223,8 +221,7 @@ public final class CDOServerUtil
   /**
    * @since 3.0
    */
-  public static ISynchronizableRepository createOfflineClone(String name, IStore store, Map<String, String> props,
-      IRepositorySynchronizer synchronizer)
+  public static ISynchronizableRepository createOfflineClone(String name, IStore store, Map<String, String> props, IRepositorySynchronizer synchronizer)
   {
     OfflineClone repository = new OfflineClone();
     initRepository(repository, name, store, props);
@@ -235,8 +232,8 @@ public final class CDOServerUtil
   /**
    * @since 4.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
-      Map<String, String> props, IRepositorySynchronizer synchronizer, boolean master, boolean allowBackupCommits)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props, IRepositorySynchronizer synchronizer,
+      boolean master, boolean allowBackupCommits)
   {
     FailoverParticipant repository = new FailoverParticipant();
     initRepository(repository, name, store, props);
@@ -253,8 +250,8 @@ public final class CDOServerUtil
   /**
    * @since 3.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
-      Map<String, String> props, IRepositorySynchronizer synchronizer, boolean master)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props, IRepositorySynchronizer synchronizer,
+      boolean master)
   {
     return createFailoverParticipant(name, store, props, synchronizer, master, false);
   }
@@ -262,8 +259,7 @@ public final class CDOServerUtil
   /**
    * @since 4.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
-      Map<String, String> props, IRepositorySynchronizer synchronizer)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props, IRepositorySynchronizer synchronizer)
   {
     return createFailoverParticipant(name, store, props, synchronizer, false);
   }
@@ -271,8 +267,7 @@ public final class CDOServerUtil
   /**
    * @since 4.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
-      Map<String, String> props)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props)
   {
     return createFailoverParticipant(name, store, props, null);
   }
@@ -305,8 +300,7 @@ public final class CDOServerUtil
     return RepositoryFactory.get(container, name);
   }
 
-  public static Element getRepositoryConfig(String repositoryName)
-      throws ParserConfigurationException, SAXException, IOException
+  public static Element getRepositoryConfig(String repositoryName) throws ParserConfigurationException, SAXException, IOException
   {
     File configFile = OMPlatform.INSTANCE.getConfigFile("cdo-server.xml"); //$NON-NLS-1$
 
@@ -345,8 +339,7 @@ public final class CDOServerUtil
     {
     }
 
-    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions,
-        List<CDORevision> additionalRevisions) throws RuntimeException
+    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions, List<CDORevision> additionalRevisions) throws RuntimeException
     {
       List<String> violations = new ArrayList<String>();
       for (CDORevision revision : revisions)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
index ba797c994d..e1ae3e3744 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
@@ -210,8 +210,7 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
      *           to indicate that none of the revisions must be sent to the client. This exception will be visible at
      *           the client side!
      */
-    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions,
-        List<CDORevision> additionalRevisions) throws RuntimeException;
+    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions, List<CDORevision> additionalRevisions) throws RuntimeException;
   }
 
   /**
@@ -241,8 +240,8 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
      *           to indicate that the commit operation must not be executed against the backend store. This exception
      *           will be visible at the client side!
      */
-    public void handleTransactionBeforeCommitting(ITransaction transaction, IStoreAccessor.CommitContext commitContext,
-        OMMonitor monitor) throws RuntimeException;
+    public void handleTransactionBeforeCommitting(ITransaction transaction, IStoreAccessor.CommitContext commitContext, OMMonitor monitor)
+        throws RuntimeException;
 
     /**
      * Provides a way to handle transactions after they have been committed to the backend store.
@@ -257,8 +256,7 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
      *          A monitor that should be used by the implementor to avoid timeouts.
      * @since 3.0
      */
-    public void handleTransactionAfterCommitted(ITransaction transaction, IStoreAccessor.CommitContext commitContext,
-        OMMonitor monitor);
+    public void handleTransactionAfterCommitted(ITransaction transaction, IStoreAccessor.CommitContext commitContext, OMMonitor monitor);
 
     /**
      * An exception that a {@link WriteAccessHandler} may throw to indicate that a
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
index 795982348f..f8d408a2e0 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java
@@ -122,16 +122,14 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @since 4.0
    */
-  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk,
-      CDORevisionCacheAdder cache);
+  public InternalCDORevision readRevision(CDOID id, CDOBranchPoint branchPoint, int listChunk, CDORevisionCacheAdder cache);
 
   /**
    * Reads a revision with the given version in the given branch from the back-end.
    *
    * @since 4.0
    */
-  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk,
-      CDORevisionCacheAdder cache);
+  public InternalCDORevision readRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int listChunk, CDORevisionCacheAdder cache);
 
   /**
    * Passes all revisions of the store to the {@link CDORevisionHandler handler} if <b>all</b> of the following
@@ -151,8 +149,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    *
    * @since 4.0
    */
-  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler);
+  public void handleRevisions(EClass eClass, CDOBranch branch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
 
   /**
    * Returns a set of CDOIDs that have at least one revision in any of the passed branches and time ranges.
@@ -598,8 +595,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
      * @throws UnsupportedOperationException
      *           if this {@link IStoreAccessor.Raw raw store accessor} does not support branching.
      */
-    public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-        throws IOException;
+    public void rawExport(CDODataOutput out, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime) throws IOException;
 
     /**
      * Deserializes backend data that has been serialized by the {@link #rawExport(CDODataOutput, int, int, long, long)
@@ -633,8 +629,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
      * @throws UnsupportedOperationException
      *           if this {@link IStoreAccessor.Raw raw store accessor} does not support branching.
      */
-    public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
-        OMMonitor monitor) throws IOException;
+    public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime, OMMonitor monitor) throws IOException;
 
     /**
      * Stores the given {@link CDOPackageUnit package units} in the backend represented by this
@@ -746,8 +741,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
      *          represented by this {@link IStoreAccessor.Raw raw store accessor}.
      * @see #rawCommit(double, OMMonitor)
      */
-    public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-        OMMonitor monitor);
+    public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor);
 
     /**
      * Deletes the revision identified by the given {@link CDORevisionKey key} from the backend represented by this
@@ -818,8 +812,8 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
      *          represented by this {@link IStoreAccessor.Raw2 raw store accessor}.
      * @see #rawCommit(double, OMMonitor)
      */
-    public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment,
-        CDOBranchPoint mergeSource, OMMonitor monitor);
+    public void rawStore(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+        OMMonitor monitor);
   }
 
   /**
@@ -848,8 +842,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
    */
   public interface DurableLocking2 extends DurableLocking
   {
-    LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-        Map<CDOID, LockGrade> locks);
+    LockArea createLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks);
 
     public void updateLockArea(LockArea lockArea);
   }
@@ -867,11 +860,9 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com
 
     public void readUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, OMMonitor monitor);
 
-    public Object initUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs,
-        long timeStamp, OMMonitor monitor);
+    public Object initUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, Set<CDOID> initializedIDs, long timeStamp, OMMonitor monitor);
 
-    public void finishUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, long timeStamp,
-        Object initResult, List<CDOID> ids);
+    public void finishUnit(IView view, CDOID rootID, CDORevisionHandler revisionHandler, long timeStamp, Object initResult, List<CDOID> ids);
 
     public void writeUnits(Map<CDOID, CDOID> unitMappings, long timeStamp);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
index f9afb80347..4aa1604fca 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
@@ -42,8 +42,7 @@ public final class AuthenticationUtil
    * Wrap an {@code operation} to make an authentication protocol {@linkplain #getAuthenticationProtocol() available}
    * to the thread that invokes it, for the duration of the {@code operation}'s execution.
    */
-  public static <V> Callable<V> authenticatingOperation(IAuthenticationProtocol authenticationProtocol,
-      final Callable<V> operation)
+  public static <V> Callable<V> authenticatingOperation(IAuthenticationProtocol authenticationProtocol, final Callable<V> operation)
   {
     return new AuthenticatingOperation<V>(authenticationProtocol)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
index 148b754687..83d8e90482 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
@@ -303,8 +303,7 @@ public abstract class CDOCommand extends org.eclipse.net4j.util.factory.Factory
       }
     }
 
-    public abstract void execute(InternalRepository repository, IStoreAccessor accessor, String[] args)
-        throws Exception;
+    public abstract void execute(InternalRepository repository, IStoreAccessor accessor, String[] args) throws Exception;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/DurableLockArea.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/DurableLockArea.java
index 2f9ea799bb..3c7603906f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/DurableLockArea.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/DurableLockArea.java
@@ -43,8 +43,7 @@ public class DurableLockArea implements LockArea
 
   private Map<CDOID, LockGrade> locks;
 
-  public DurableLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly,
-      Map<CDOID, LockGrade> locks)
+  public DurableLockArea(String durableLockingID, String userID, CDOBranchPoint branchPoint, boolean readOnly, Map<CDOID, LockGrade> locks)
   {
     this.durableLockingID = durableLockingID;
     this.userID = userID;
@@ -86,8 +85,8 @@ public class DurableLockArea implements LockArea
   @Override
   public String toString()
   {
-    return MessageFormat.format("DurableLockArea\nid={0}\nuser={1}\nbranchPoint={2}\nreadOnly={3}\nlocks={4}",
-        durableLockingID, userID, branchPoint, readOnly, locks);
+    return MessageFormat.format("DurableLockArea\nid={0}\nuser={1}\nbranchPoint={2}\nreadOnly={3}\nlocks={4}", durableLockingID, userID, branchPoint, readOnly,
+        locks);
   }
 
   public static String createDurableLockingID()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAuthenticationProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAuthenticationProtocol.java
index d0c84fc421..3ab9f4bdfd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAuthenticationProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAuthenticationProtocol.java
@@ -41,6 +41,5 @@ public interface IAuthenticationProtocol
    *
    * @throws UnsupportedOperationException if credentials change is not supported
    */
-  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation)
-      throws Exception;
+  public Response sendCredentialsChallenge(Challenge challenge, String userID, CredentialsUpdateOperation operation) throws Exception;
 }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java
index 34082fa9c8..db7e10e3a9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java
@@ -38,24 +38,20 @@ public interface ISessionProtocol extends CDOProtocol, IAuthenticationProtocol
    * @deprecated As of 4.2 {@link #sendAuthenticationChallenge(Challenge)} is called.
    */
   @Deprecated
-  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken)
-      throws Exception;
+  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception;
 
-  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
-      throws Exception;
+  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType) throws Exception;
 
   /**
    * @deprecated
    */
   @Deprecated
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
-      throws Exception;
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState) throws Exception;
 
   /**
    * @since 4.1
    */
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID) throws Exception;
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID) throws Exception;
 
   /**
    * @deprecated As of 4.3 use {@link #sendBranchNotification(InternalCDOBranch, ChangeKind)}.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
index 9697a1068e..2f9834854d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
@@ -63,14 +63,13 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
    * @since 4.0
    */
   @Deprecated
-  public void lock(boolean explicit, LockType type, IView context, Collection<? extends Object> objects, long timeout)
-      throws InterruptedException;
+  public void lock(boolean explicit, LockType type, IView context, Collection<? extends Object> objects, long timeout) throws InterruptedException;
 
   /**
    * @since 4.1
    */
-  public List<LockState<Object, IView>> lock2(boolean explicit, LockType type, IView context,
-      Collection<? extends Object> objects, boolean recursive, long timeout) throws InterruptedException;
+  public List<LockState<Object, IView>> lock2(boolean explicit, LockType type, IView context, Collection<? extends Object> objects, boolean recursive,
+      long timeout) throws InterruptedException;
 
   /**
    * Attempts to release for a given locktype, view and objects.
@@ -85,8 +84,7 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
   /**
    * @since 4.1
    */
-  public List<LockState<Object, IView>> unlock2(boolean explicit, LockType type, IView context,
-      Collection<? extends Object> objects, boolean recursive);
+  public List<LockState<Object, IView>> unlock2(boolean explicit, LockType type, IView context, Collection<? extends Object> objects, boolean recursive);
 
   /**
    * Attempts to release all locks(read and write) for a given view.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
index 6f5ff7b248..3c389f839d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
@@ -66,8 +66,7 @@ import java.util.concurrent.Semaphore;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface InternalRepository extends IRepository, PackageProcessor, PackageLoader, BranchLoader3,
-    RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
+public interface InternalRepository extends IRepository, PackageProcessor, PackageLoader, BranchLoader3, RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
 {
   public void setName(String name);
 
@@ -230,19 +229,15 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
    */
   public void ensureChunks(InternalCDORevision revision);
 
-  public IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature, int chunkStart,
-      int chunkEnd);
+  public IStoreAccessor ensureChunk(InternalCDORevision revision, EStructuralFeature feature, int chunkStart, int chunkEnd);
 
-  public void notifyReadAccessHandlers(InternalSession session, CDORevision[] revisions,
-      List<CDORevision> additionalRevisions);
+  public void notifyReadAccessHandlers(InternalSession session, CDORevision[] revisions, List<CDORevision> additionalRevisions);
 
-  public void notifyWriteAccessHandlers(ITransaction transaction, IStoreAccessor.CommitContext commitContext,
-      boolean beforeCommit, OMMonitor monitor);
+  public void notifyWriteAccessHandlers(ITransaction transaction, IStoreAccessor.CommitContext commitContext, boolean beforeCommit, OMMonitor monitor);
 
   public void replicate(CDOReplicationContext context);
 
-  public CDOReplicationInfo replicateRaw(CDODataOutput out, int lastReplicatedBranchID, long lastReplicatedCommitTime)
-      throws IOException;
+  public CDOReplicationInfo replicateRaw(CDODataOutput out, int lastReplicatedBranchID, long lastReplicatedCommitTime) throws IOException;
 
   public CDOChangeSetData getChangeSet(CDOBranchPoint startPoint, CDOBranchPoint endPoint);
 
@@ -251,8 +246,8 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
    * @deprecated as of 4.6 use {@link #getMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, OMMonitor)}.
    */
   @Deprecated
-  public Set<CDOID> getMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo, OMMonitor monitor);
+  public Set<CDOID> getMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo, OMMonitor monitor);
 
   /**
    * @since 4.6
@@ -278,8 +273,7 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
   /**
    * @since 4.0
    */
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler);
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler);
 
   /**
    * @since 4.0
@@ -311,8 +305,7 @@ public interface InternalRepository extends IRepository, PackageProcessor, Packa
   /**
    * @since 4.1
    */
-  public LockObjectsResult lock(InternalView view, LockType type, List<CDORevisionKey> keys, boolean recursive,
-      long timeout);
+  public LockObjectsResult lock(InternalView view, LockType type, List<CDORevisionKey> keys, boolean recursive, long timeout);
 
   /**
    * @since 4.1
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java
index 3a96d63f20..a3393b17c4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java
@@ -80,11 +80,10 @@ public interface InternalSession extends ISession, CDOIDProvider, CDOPermissionP
 
   public void setSubscribed(boolean subscribed);
 
-  public void collectContainedRevisions(InternalCDORevision revision, CDOBranchPoint branchPoint, int referenceChunk,
-      Set<CDOID> revisions, List<CDORevision> additionalRevisions);
+  public void collectContainedRevisions(InternalCDORevision revision, CDOBranchPoint branchPoint, int referenceChunk, Set<CDOID> revisions,
+      List<CDORevision> additionalRevisions);
 
-  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
-      throws Exception;
+  public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType) throws Exception;
 
   /**
    * @deprecated use
@@ -92,14 +91,12 @@ public interface InternalSession extends ISession, CDOIDProvider, CDOPermissionP
    *             instead
    */
   @Deprecated
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState)
-      throws Exception;
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState) throws Exception;
 
   /**
    * @since 4.1
    */
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID) throws Exception;
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID) throws Exception;
 
   /**
    * @deprecated As of 4.3 use {@link #sendBranchNotification(InternalCDOBranch, ChangeKind)}.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java
index d281d90137..a34028050a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java
@@ -134,8 +134,7 @@ public interface InternalSessionManager extends ISessionManager
   /**
    * @since 4.1
    */
-  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState,
-      CDOID rootResourceID);
+  public void sendRepositoryStateNotification(CDOCommonRepository.State oldState, CDOCommonRepository.State newState, CDOID rootResourceID);
 
   /**
    * @deprecated As of 4.3 use {@link #sendBranchNotification(InternalSession, InternalCDOBranch, ChangeKind)}.
@@ -173,6 +172,5 @@ public interface InternalSessionManager extends ISessionManager
 
   public void sendRemoteSessionNotification(InternalSession sender, byte opcode);
 
-  public List<Integer> sendRemoteMessageNotification(InternalSession sender, CDORemoteSessionMessage message,
-      int[] recipients);
+  public List<Integer> sendRemoteMessageNotification(InternalSession sender, CDORemoteSessionMessage message, int[] recipients);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
index e216835089..6359f56ce8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.cdo.spi.common.CDOReplicationContext;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface InternalSynchronizableRepository extends ISynchronizableRepository, InternalRepository,
-    CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
+public interface InternalSynchronizableRepository
+    extends ISynchronizableRepository, InternalRepository, CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
 {
   public InternalRepositorySynchronizer getSynchronizer();
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalUnitManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalUnitManager.java
index 0bd674cbf4..cf8f1e60c4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalUnitManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalUnitManager.java
@@ -26,8 +26,7 @@ public interface InternalUnitManager extends IUnitManager
 {
   public InternalRepository getRepository();
 
-  public List<InternalCDORevisionDelta> getUnitMoves(InternalCDORevisionDelta[] deltas, CDORevisionProvider before,
-      CDORevisionProvider after);
+  public List<InternalCDORevisionDelta> getUnitMoves(InternalCDORevisionDelta[] deltas, CDORevisionProvider before, CDORevisionProvider after);
 
   public InternalObjectAttacher attachObjects(InternalCommitContext commitContext);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalView.java
index 9de8f79e20..b18824358e 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalView.java
@@ -46,8 +46,7 @@ public interface InternalView extends IView, ILifecycle
   /**
    * @since 4.0
    */
-  public void changeTarget(CDOBranchPoint branchPoint, List<CDOID> invalidObjects,
-      List<CDORevisionDelta> allChangedObjects, List<CDOID> allDetachedObjects);
+  public void changeTarget(CDOBranchPoint branchPoint, List<CDOID> invalidObjects, List<CDORevisionDelta> allChangedObjects, List<CDOID> allDetachedObjects);
 
   public void subscribe(CDOID id);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/LongIDStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/LongIDStore.java
index d370f5d0bc..7e440d4fa5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/LongIDStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/LongIDStore.java
@@ -45,8 +45,8 @@ public abstract class LongIDStore extends Store
   @ExcludeFromDump
   private transient AtomicLong nextLocalObjectID = new AtomicLong(Long.MAX_VALUE);
 
-  public LongIDStore(String type, Set<ChangeFormat> supportedChangeFormats,
-      Set<RevisionTemporality> supportedRevisionTemporalities, Set<RevisionParallelism> supportedRevisionParallelisms)
+  public LongIDStore(String type, Set<ChangeFormat> supportedChangeFormats, Set<RevisionTemporality> supportedRevisionTemporalities,
+      Set<RevisionParallelism> supportedRevisionParallelisms)
   {
     super(type, OBJECT_ID_TYPES, supportedChangeFormats, supportedRevisionTemporalities, supportedRevisionParallelisms);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ObjectWriteAccessHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ObjectWriteAccessHandler.java
index 1c717d4631..7b79652ec7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ObjectWriteAccessHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ObjectWriteAccessHandler.java
@@ -120,8 +120,8 @@ public class ObjectWriteAccessHandler implements WriteAccessHandler
     return dirtyObjects;
   }
 
-  public final void handleTransactionBeforeCommitting(ITransaction transaction,
-      IStoreAccessor.CommitContext commitContext, OMMonitor monitor) throws RuntimeException
+  public final void handleTransactionBeforeCommitting(ITransaction transaction, IStoreAccessor.CommitContext commitContext, OMMonitor monitor)
+      throws RuntimeException
   {
     try
     {
@@ -138,8 +138,7 @@ public class ObjectWriteAccessHandler implements WriteAccessHandler
     }
   }
 
-  public final void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-      OMMonitor monitor)
+  public final void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
   {
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
index 3ecb34f16b..0b371254b4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
@@ -97,8 +97,7 @@ public class RepositoryConfigurator
     return storeFactories;
   }
 
-  public IRepository[] configure(File configFile)
-      throws ParserConfigurationException, SAXException, IOException, CoreException
+  public IRepository[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -111,8 +110,7 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  public IRepository[] configure(Reader configReader)
-      throws ParserConfigurationException, SAXException, IOException, CoreException
+  public IRepository[] configure(Reader configReader) throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -125,8 +123,7 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  protected IRepository[] configure(Document document)
-      throws ParserConfigurationException, SAXException, IOException, CoreException
+  protected IRepository[] configure(Document document) throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     List<IRepository> repositories = new ArrayList<IRepository>();
     NodeList elements = document.getElementsByTagName("repository"); //$NON-NLS-1$
@@ -310,8 +307,7 @@ public class RepositoryConfigurator
    */
   protected IAuthenticator getAuthenticator(String type, String description) throws CoreException
   {
-    IAuthenticator authenticator = (IAuthenticator)container.getElement(AuthenticatorFactory.PRODUCT_GROUP, type,
-        description);
+    IAuthenticator authenticator = (IAuthenticator)container.getElement(AuthenticatorFactory.PRODUCT_GROUP, type, description);
     if (authenticator == null)
     {
       throw new IllegalStateException("Authenticator factory not found: " + type); //$NON-NLS-1$
@@ -397,8 +393,7 @@ public class RepositoryConfigurator
     return factory;
   }
 
-  protected IStore createStore(String repositoryName, Map<String, String> repositoryProperties, Element storeConfig)
-      throws CoreException
+  protected IStore createStore(String repositoryName, Map<String, String> repositoryProperties, Element storeConfig) throws CoreException
   {
     String type = storeConfig.getAttribute("type"); //$NON-NLS-1$
     IStoreFactory storeFactory = getStoreFactory(type);
@@ -436,8 +431,7 @@ public class RepositoryConfigurator
     }
   }
 
-  private static <T> T createExecutableExtension(String extPointName, String elementName, String attributeName,
-      String type) throws CoreException
+  private static <T> T createExecutableExtension(String extPointName, String elementName, String attributeName, String type) throws CoreException
   {
     if (OMPlatform.INSTANCE.isExtensionRegistryAvailable())
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryUserManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryUserManager.java
index cee7b7d4a1..7d42acc58c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryUserManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryUserManager.java
@@ -61,8 +61,7 @@ public abstract class RepositoryUserManager extends Lifecycle implements IUserMa
     // Cann be overridden in subclasses.
   }
 
-  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count)
-      throws SecurityException
+  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count) throws SecurityException
   {
     try
     {
@@ -191,8 +190,7 @@ public abstract class RepositoryUserManager extends Lifecycle implements IUserMa
     {
     }
 
-    public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-        Object element)
+    public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
     {
       if (element instanceof RepositoryUserManager)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java
index dd0c9783e9..cab2a557ef 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java
@@ -129,12 +129,10 @@ public abstract class Store extends Lifecycle implements InternalStore
     checkArg(supportedChangeFormats != null && !supportedChangeFormats.isEmpty(), "Empty supportedChangeFormats"); //$NON-NLS-1$
     this.supportedChangeFormats = supportedChangeFormats;
 
-    checkArg(supportedRevisionTemporalities != null && !supportedRevisionTemporalities.isEmpty(),
-        "Empty supportedRevisionTemporalities"); //$NON-NLS-1$
+    checkArg(supportedRevisionTemporalities != null && !supportedRevisionTemporalities.isEmpty(), "Empty supportedRevisionTemporalities"); //$NON-NLS-1$
     this.supportedRevisionTemporalities = supportedRevisionTemporalities;
 
-    checkArg(supportedRevisionParallelisms != null && !supportedRevisionParallelisms.isEmpty(),
-        "Empty supportedRevisionParallelisms"); //$NON-NLS-1$
+    checkArg(supportedRevisionParallelisms != null && !supportedRevisionParallelisms.isEmpty(), "Empty supportedRevisionParallelisms"); //$NON-NLS-1$
     this.supportedRevisionParallelisms = supportedRevisionParallelisms;
   }
 
@@ -512,8 +510,8 @@ public abstract class Store extends Lifecycle implements InternalStore
   /**
    * @since 3.0
    */
-  public static IStoreAccessor.QueryResourcesContext.ExactMatch createExactMatchContext(final CDOID folderID,
-      final String name, final CDOBranchPoint branchPoint)
+  public static IStoreAccessor.QueryResourcesContext.ExactMatch createExactMatchContext(final CDOID folderID, final String name,
+      final CDOBranchPoint branchPoint)
   {
     return new IStoreAccessor.QueryResourcesContext.ExactMatch()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
index 5dc4bb1854..02f519b839 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
@@ -167,14 +167,13 @@ public abstract class StoreAccessor extends StoreAccessorBase
    * @deprecated As of 4.6 override {@link #writeCommitInfo(CDOBranch, long, long, String, String, CDOBranchPoint, OMMonitor)}.
    */
   @Deprecated
-  protected abstract void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, OMMonitor monitor);
+  protected abstract void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, OMMonitor monitor);
 
   /**
    * @since 4.6
    */
-  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID,
-      String comment, CDOBranchPoint mergeSource, OMMonitor monitor)
+  protected void writeCommitInfo(CDOBranch branch, long timeStamp, long previousTimeStamp, String userID, String comment, CDOBranchPoint mergeSource,
+      OMMonitor monitor)
   {
     writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, monitor);
   }
@@ -182,8 +181,7 @@ public abstract class StoreAccessor extends StoreAccessorBase
   /**
    * @since 4.5
    */
-  protected void writeNewObjectRevisions(InternalCommitContext context, InternalCDORevision[] newObjects,
-      CDOBranch branch, OMMonitor monitor)
+  protected void writeNewObjectRevisions(InternalCommitContext context, InternalCDORevision[] newObjects, CDOBranch branch, OMMonitor monitor)
   {
     writeRevisions(newObjects, branch, monitor);
   }
@@ -191,8 +189,7 @@ public abstract class StoreAccessor extends StoreAccessorBase
   /**
    * @since 4.5
    */
-  protected void writeDirtyObjectRevisions(InternalCommitContext context, InternalCDORevision[] dirtyObjects,
-      CDOBranch branch, OMMonitor monitor)
+  protected void writeDirtyObjectRevisions(InternalCommitContext context, InternalCDORevision[] dirtyObjects, CDOBranch branch, OMMonitor monitor)
   {
     writeRevisions(dirtyObjects, branch, monitor);
   }
@@ -205,8 +202,7 @@ public abstract class StoreAccessor extends StoreAccessorBase
   /**
    * @since 3.0
    */
-  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
-      OMMonitor monitor);
+  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created, OMMonitor monitor);
 
   /**
    * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
index a9516a0933..c5f3724131 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
@@ -320,8 +320,7 @@ public abstract class StoreAccessorBase extends Lifecycle implements IStoreAcces
 
       if (rev.getTimeStamp() != timeStamp)
       {
-        throw new IllegalArgumentException(
-            "Invalid revision time stamp: " + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
+        throw new IllegalArgumentException("Invalid revision time stamp: " + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
       }
 
       InternalCDORevision revision = (InternalCDORevision)rev;
@@ -331,8 +330,7 @@ public abstract class StoreAccessorBase extends Lifecycle implements IStoreAcces
       if (version > CDOBranchVersion.FIRST_VERSION)
       {
         CDOBranchVersion oldVersion = branch.getVersion(version - 1);
-        InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, oldVersion, CDORevision.UNCHUNKED,
-            true);
+        InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, oldVersion, CDORevision.UNCHUNKED, true);
         InternalCDORevisionDelta delta = revision.compare(oldRevision);
         changedObjects.add(delta);
       }
@@ -363,8 +361,7 @@ public abstract class StoreAccessorBase extends Lifecycle implements IStoreAcces
       }
 
       CDOBranchPoint base = branch.getBase();
-      InternalCDORevision revision = revisionManager.getRevision(id, base, CDORevision.UNCHUNKED,
-          CDORevision.DEPTH_NONE, true);
+      InternalCDORevision revision = revisionManager.getRevision(id, base, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
       if (revision == null)
       {
         revision = getRevisionFromBase(id, base.getBranch());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
index 8c1165277d..ffc5da4079 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
@@ -28,8 +28,7 @@ public final class SyncingUtil
   {
   }
 
-  public static InternalView openViewWithLockArea(InternalSession session, InternalLockManager lockManager,
-      CDOBranch viewedBranch, String lockAreaID)
+  public static InternalView openViewWithLockArea(InternalSession session, InternalLockManager lockManager, CDOBranch viewedBranch, String lockAreaID)
   {
     LockArea lockArea;
     InternalView view;
diff --git a/plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.core.prefs
index 1d35a02a69..fb423234f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java
index 2bb0951d49..c00bd75f7d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java
@@ -30,8 +30,8 @@ public abstract class AbstractSetupDBConfig extends DBConfig
 
   private transient DataSource setupDataSource;
 
-  public AbstractSetupDBConfig(String name, boolean supportingAudits, boolean supportingBranches, boolean withRanges,
-      boolean copyOnBranch, IDGenerationLocation idGenerationLocation)
+  public AbstractSetupDBConfig(String name, boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch,
+      IDGenerationLocation idGenerationLocation)
   {
     super(name, supportingAudits, supportingBranches, withRanges, copyOnBranch, idGenerationLocation);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
index 1eb0754de8..4657c4fec8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
@@ -27,8 +27,7 @@ public class AllTestsDBH2Audit extends DBConfigs
     return new AllTestsDBH2Audit().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
-      IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
   {
     // Without ranges
     suite.addScenario(parent, new H2Config(true, false, false, false, idGenerationLocation), JVM, NATIVE);
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
index 167e4cca16..543c589466 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
@@ -26,8 +26,7 @@ public class AllTestsDBH2Branching extends DBConfigs
     return new AllTestsDBH2Branching().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
-      IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
   {
     // Without ranges
     suite.addScenario(parent, new H2Config(true, true, false, false, idGenerationLocation), JVM, NATIVE);
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
index 68990ae80b..ca35927e2f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
@@ -26,8 +26,7 @@ public class AllTestsDBH2NonAudit extends DBConfigs
     return new AllTestsDBH2NonAudit().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
-      IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
   {
     suite.addScenario(parent, new H2Config(false, false, false, false, idGenerationLocation), JVM, NATIVE);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AnyTestManyTimesDB.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AnyTestManyTimesDB.java
index f600c28730..e5ab84fde6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AnyTestManyTimesDB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AnyTestManyTimesDB.java
@@ -38,8 +38,8 @@ public class AnyTestManyTimesDB extends TestSuite implements IConstants
 
   private static final IDGenerationLocation ID_GENERATION_LOCATION = IDGenerationLocation.STORE;
 
-  private static final RepositoryConfig REPOSITORY_CONFIG = new H2Config(SUPPORTING_AUDITS, SUPPORTING_BRANCHES,
-      WITH_RANGES, COPY_ON_BRANCH, ID_GENERATION_LOCATION);
+  private static final RepositoryConfig REPOSITORY_CONFIG = new H2Config(SUPPORTING_AUDITS, SUPPORTING_BRANCHES, WITH_RANGES, COPY_ON_BRANCH,
+      ID_GENERATION_LOCATION);
 
   private static final SessionConfig SESSION_CONFIG = JVM;
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_396743_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_396743_Test.java
index 6410deba7b..bf492ef24b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_396743_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_396743_Test.java
@@ -93,8 +93,7 @@ public class Bugzilla_396743_Test extends AbstractCDOTest
             @Override
             protected void setKeyFields(PreparedStatement stmt, CDORevision revision) throws SQLException
             {
-              if (((IDBPreparedStatement)stmt).getSQL().toUpperCase().startsWith("SELECT")
-                  && revision.getEClass() == getModel1Package().getCompany())
+              if (((IDBPreparedStatement)stmt).getSQL().toUpperCase().startsWith("SELECT") && revision.getEClass() == getModel1Package().getCompany())
               {
                 commitLatch.countDown(); // Let main thread execute a commit
                 awaitReadValues(); // Wait for commit to finish
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
index 7c6ac5b350..cb8b66aa43 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
@@ -121,8 +121,8 @@ public class CustomTypeMappingTest extends AbstractCDOTest
    */
   public static class MyIntToVarcharTypeMapping extends AbstractTypeMapping
   {
-    public static final ITypeMapping.Descriptor DESCRIPTOR = TypeMappingUtil.createDescriptor(
-        "org.eclipse.emf.cdo.tests.db.EIntToVarchar", EcorePackage.eINSTANCE.getEInt(), DBType.VARCHAR);
+    public static final ITypeMapping.Descriptor DESCRIPTOR = TypeMappingUtil.createDescriptor("org.eclipse.emf.cdo.tests.db.EIntToVarchar",
+        EcorePackage.eINSTANCE.getEInt(), DBType.VARCHAR);
 
     public MyIntToVarcharTypeMapping()
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java
index 86a02179e2..f5ea4008db 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java
@@ -49,8 +49,8 @@ public abstract class DBConfig extends RepositoryConfig
 
   private transient IDBAdapter dbAdapter;
 
-  public DBConfig(String name, boolean supportingAudits, boolean supportingBranches, boolean withRanges,
-      boolean copyOnBranch, IDGenerationLocation idGenerationLocation)
+  public DBConfig(String name, boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch,
+      IDGenerationLocation idGenerationLocation)
   {
     super(name, supportingAudits, supportingBranches, idGenerationLocation);
     this.withRanges = withRanges;
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
index 8fb73eb51b..d2f28227fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
@@ -36,8 +36,7 @@ public class H2Config extends DBConfig
 
   private static JdbcDataSource defaultDataSource;
 
-  public H2Config(boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch,
-      IDGenerationLocation idGenerationLocation)
+  public H2Config(boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch, IDGenerationLocation idGenerationLocation)
   {
     super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, withRanges, copyOnBranch, idGenerationLocation);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
index e96b5caf9b..9a59fce96a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java
@@ -523,13 +523,11 @@ public class Net4jDBTest extends AbstractCDOTest
       Class<?> componentType = type.getComponentType();
       if (componentType == byte.class)
       {
-        assertEquals("Error in column " + c + " of type " + dbType, true,
-            Arrays.equals((byte[])expected, (byte[])actual));
+        assertEquals("Error in column " + c + " of type " + dbType, true, Arrays.equals((byte[])expected, (byte[])actual));
       }
       else if (componentType == char.class)
       {
-        assertEquals("Error in column " + c + " with type " + dbType, true,
-            Arrays.equals((char[])expected, (char[])actual));
+        assertEquals("Error in column " + c + " with type " + dbType, true, Arrays.equals((char[])expected, (char[])actual));
       }
       else
       {
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java
index 32a13f1bfe..0d5405be24 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java
@@ -38,8 +38,7 @@ public class PostgresqlConfig extends AbstractSetupDBConfig
 
   private static final long serialVersionUID = 1L;
 
-  public PostgresqlConfig(boolean supportingAudits, boolean supportingBranches,
-      IDGenerationLocation idGenerationLocation)
+  public PostgresqlConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
   {
     super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
index 50bd138a07..f4874d6ee7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
@@ -426,8 +426,7 @@ public class SQLQueryTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter,
-          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter, productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
index 1a713f0a1c..f2c8d20165 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
@@ -52,8 +52,7 @@ public abstract class AbstractCapabilityTest extends TestCase
 
           Statement tx1stmt = transaction1.createStatement();
           tx1stmt.executeUpdate("update status_table set status = 'changed' where trans = 'transaction1'");
-          msg("Read value (transaction 1) is "
-              + select(transaction1, "select status from status_table where trans = 'transaction1'").toUpperCase());
+          msg("Read value (transaction 1) is " + select(transaction1, "select status from status_table where trans = 'transaction1'").toUpperCase());
           sleep(1000);
 
           transaction1.rollback();
@@ -74,8 +73,7 @@ public abstract class AbstractCapabilityTest extends TestCase
 
     transaction2.setAutoCommit(false);
 
-    msg("Read value (transaction 2) is "
-        + select(transaction2, "select status from status_table where trans = 'transaction1'").toUpperCase());
+    msg("Read value (transaction 2) is " + select(transaction2, "select status from status_table where trans = 'transaction1'").toUpperCase());
     msg("----------------------------------------------------------");
     transaction2.rollback();
     transaction2.close();
@@ -103,15 +101,13 @@ public abstract class AbstractCapabilityTest extends TestCase
       DBUtil.close(tx1stmt);
     }
 
-    msg("Read value before rollback is "
-        + select(transaction1, "select status from status_table where trans = 'transaction1'").toUpperCase());
+    msg("Read value before rollback is " + select(transaction1, "select status from status_table where trans = 'transaction1'").toUpperCase());
 
     transaction1.rollback();
     transaction1.close();
 
     Connection view = provider.getConnection();
-    msg("Read value after rollback is "
-        + select(view, "select status from status_table where trans = 'transaction1'").toUpperCase());
+    msg("Read value after rollback is " + select(view, "select status from status_table where trans = 'transaction1'").toUpperCase());
     view.close();
     msg("----------------------------------------------------------");
   }
@@ -170,15 +166,11 @@ public abstract class AbstractCapabilityTest extends TestCase
 
     Connection view = provider.getConnection();
 
-    msg("transaction1: unchanged table record is "
-        + select(view, "select status from status_table where trans = 'transaction1'").toUpperCase());
-    msg("transaction2: unchanged table record is "
-        + select(view, "select status from status_table where trans = 'transaction2'").toUpperCase());
+    msg("transaction1: unchanged table record is " + select(view, "select status from status_table where trans = 'transaction1'").toUpperCase());
+    msg("transaction2: unchanged table record is " + select(view, "select status from status_table where trans = 'transaction2'").toUpperCase());
 
-    msg("transaction1: changed table record is "
-        + select(view, "select status from change_table where trans = 'transaction1'").toUpperCase());
-    msg("transaction2: changed table record is "
-        + select(view, "select status from change_table where trans = 'transaction2'").toUpperCase());
+    msg("transaction1: changed table record is " + select(view, "select status from change_table where trans = 'transaction1'").toUpperCase());
+    msg("transaction2: changed table record is " + select(view, "select status from change_table where trans = 'transaction2'").toUpperCase());
 
     String present = "present";
     try
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
index f6a0bbb394..244ee3d3ba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
@@ -61,8 +61,7 @@ public class Bugzilla_351078_DB_Test extends Bugzilla_351078_Test
       connection = store.getConnection();
 
       ByteArrayOutputStream out = new ByteArrayOutputStream();
-      DBUtil.serializeTable(new ExtendedDataOutputStream(out), connection, table, null,
-          " ORDER BY CDO_SOURCE, CDO_BRANCH, CDO_VERSION_ADDED, CDO_IDX");
+      DBUtil.serializeTable(new ExtendedDataOutputStream(out), connection, table, null, " ORDER BY CDO_SOURCE, CDO_BRANCH, CDO_VERSION_ADDED, CDO_IDX");
 
       return out.toByteArray();
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
index 19c6a784d4..fa3e2e8777 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
@@ -39,8 +39,7 @@ public abstract class DBOfflineConfig extends OfflineConfig
 
   private boolean copyOnBranch;
 
-  public DBOfflineConfig(String name, boolean withRanges, boolean copyOnBranch,
-      IDGenerationLocation idGenerationLocation)
+  public DBOfflineConfig(String name, boolean withRanges, boolean copyOnBranch, IDGenerationLocation idGenerationLocation)
   {
     super(name, idGenerationLocation);
     this.withRanges = withRanges;
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
index 1e12ca3b36..3d9f41e410 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
@@ -281,8 +281,8 @@ public abstract class DBStoreVerifier
       String tableName = mapping.getDBTables().iterator().next().getName();
       TRACER.format("verifyAtMostOneUnrevised: {0} ...", tableName);
 
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", count(1) FROM " + tableName + " WHERE "
-          + IMappingConstants.ATTRIBUTES_REVISED + "= 0 GROUP BY " + IMappingConstants.ATTRIBUTES_ID;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", count(1) FROM " + tableName + " WHERE " + IMappingConstants.ATTRIBUTES_REVISED
+          + "= 0 GROUP BY " + IMappingConstants.ATTRIBUTES_ID;
       TRACER.format("  Executing SQL: {0} ", sql);
 
       ResultSet resultSet = getStatement().executeQuery(sql);
@@ -307,9 +307,8 @@ public abstract class DBStoreVerifier
       String tableName = mapping.getDBTables().iterator().next().getName();
       TRACER.format("verifyUniqueIdVersion: {0} ...", tableName);
 
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION
-          + ", count(1) FROM " + tableName + " GROUP BY " + IMappingConstants.ATTRIBUTES_ID + ","
-          + IMappingConstants.ATTRIBUTES_VERSION;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION + ", count(1) FROM " + tableName + " GROUP BY "
+          + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION;
 
       TRACER.format("  Executing SQL: {0} ", sql);
 
@@ -318,8 +317,7 @@ public abstract class DBStoreVerifier
       {
         while (resultSet.next())
         {
-          Assert.assertEquals("Multiple rows for ID " + resultSet.getLong(1) + "v" + resultSet.getInt(2), true,
-              resultSet.getInt(3) <= 1);
+          Assert.assertEquals("Multiple rows for ID " + resultSet.getLong(1) + "v" + resultSet.getInt(2), true, resultSet.getInt(3) <= 1);
         }
       }
       catch (AssertionFailedError e)
@@ -343,8 +341,7 @@ public abstract class DBStoreVerifier
       }
 
       String tableName = mapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM "
-          + tableName;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM " + tableName;
 
       ArrayList<Pair<Long, Integer>> idVersions = new ArrayList<Pair<Long, Integer>>();
 
@@ -376,9 +373,8 @@ public abstract class DBStoreVerifier
 
       TRACER.format("verifyUniqueIdVersion: {0} for ID{1}v{2} ...", tableName, id, version);
 
-      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE "
-          + IMappingConstants.LIST_REVISION_ID + "=" + id + " AND " + IMappingConstants.LIST_REVISION_VERSION + "="
-          + version + " ORDER BY " + IMappingConstants.LIST_IDX;
+      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID + "=" + id + " AND "
+          + IMappingConstants.LIST_REVISION_VERSION + "=" + version + " ORDER BY " + IMappingConstants.LIST_IDX;
 
       TRACER.format("  Executing SQL: {0} ", sql);
 
@@ -389,14 +385,13 @@ public abstract class DBStoreVerifier
       {
         while (resultSet.next())
         {
-          Assert.assertEquals("Index " + indexShouldBe + " missing for ID" + id + "v" + version, indexShouldBe++,
-              resultSet.getInt(1));
+          Assert.assertEquals("Index " + indexShouldBe + " missing for ID" + id + "v" + version, indexShouldBe++, resultSet.getInt(1));
         }
       }
       catch (AssertionFailedError e)
       {
-        sqlDump("SELECT * FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID + "=" + id + " AND "
-            + IMappingConstants.LIST_REVISION_VERSION + "=" + version + " ORDER BY " + IMappingConstants.LIST_IDX);
+        sqlDump("SELECT * FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID + "=" + id + " AND " + IMappingConstants.LIST_REVISION_VERSION
+            + "=" + version + " ORDER BY " + IMappingConstants.LIST_IDX);
         throw e;
       }
       finally
@@ -465,8 +460,7 @@ public abstract class DBStoreVerifier
     private void verifyUniqueId(IClassMapping mapping) throws Exception
     {
       String tableName = mapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", count(1) FROM " + tableName + " GROUP BY "
-          + IMappingConstants.ATTRIBUTES_ID;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", count(1) FROM " + tableName + " GROUP BY " + IMappingConstants.ATTRIBUTES_ID;
 
       ResultSet resultSet = getStatement().executeQuery(sql);
 
@@ -492,8 +486,7 @@ public abstract class DBStoreVerifier
       }
 
       String tableName = mapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM "
-          + tableName;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM " + tableName;
 
       ArrayList<Pair<Long, Integer>> idVersions = new ArrayList<Pair<Long, Integer>>();
 
@@ -522,8 +515,8 @@ public abstract class DBStoreVerifier
     private void verifyCorrectIndices(IListMapping refMapping, long id) throws Exception
     {
       String tableName = refMapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE "
-          + IMappingConstants.LIST_REVISION_ID + "=" + id + " ORDER BY " + IMappingConstants.LIST_IDX;
+      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID + "=" + id + " ORDER BY "
+          + IMappingConstants.LIST_IDX;
 
       ResultSet resultSet = getStatement().executeQuery(sql);
       int indexShouldBe = 0;
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.db4o/.settings/org.eclipse.jdt.core.prefs
index a53544fe7c..702b60b237 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/.settings/org.eclipse.jdt.core.prefs
@@ -347,7 +347,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
index c0955e67ec..2e090cf8be 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
@@ -122,8 +122,7 @@ public class AuditFeatureMapTest extends AbstractCDOTest
     }
   }
 
-  private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result,
-      FeatureMap featureMap)
+  private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result, FeatureMap featureMap)
   {
     final Map<EStructuralFeature, Class<?>> entryResult = new HashMap<EStructuralFeature, Class<?>>();
     result.put(timeStamp, entryResult);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
index cbddfb3f42..4512fffb35 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
@@ -221,8 +221,7 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
       CDORevisionDelta revisionDelta = revision3.compare(revision2);
       for (CDOFeatureDelta featureDelta : revisionDelta.getFeatureDeltas())
       {
-        System.err
-            .println(featureDelta.getFeature().getName() + " changed through changeType " + featureDelta.getType());
+        System.err.println(featureDelta.getFeature().getName() + " changed through changeType " + featureDelta.getType());
       }
 
       assertEquals("ESC", revision1.getValue(revision1.getEClass().getEStructuralFeature("name")));
@@ -280,8 +279,7 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
     for (Object o : changedObjects)
     {
       final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
-      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
-          .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
+      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
       assertNotNull(cdoFeatureDelta);
       assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
     }
@@ -369,8 +367,7 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
       {
         continue;
       }
-      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
-          .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
+      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
       assertNotNull(cdoFeatureDelta);
       assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
index d64bf70f3a..e49c3720c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
@@ -73,10 +73,8 @@ public class HibernateBugzilla_356181_Test extends AbstractCDOTest
       assertEquals(1, results.size());
       assertEquals(2, cdoResource.getContents().size());
       assertEquals(1, results.size());
-      assertEquals(true,
-          results.get(0).getSourceObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_NonTransient());
-      assertEquals(true,
-          results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
+      assertEquals(true, results.get(0).getSourceObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_NonTransient());
+      assertEquals(true, results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
       session.close();
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
index fe83678c33..7bf0ebbbef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
@@ -136,8 +136,7 @@ public class HibernateLazyLoadTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter,
-          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter, productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
index 2271bb77c9..a8ea9751d6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
@@ -30,7 +30,6 @@ public class HibernateMultiValuedOfAttributeTest extends MultiValuedOfAttributeT
     list.add(10);
     list.add(13);
     list.add(20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(),
-        getModel5Package().getGenListOfInteger_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(), getModel5Package().getGenListOfInteger_Elements());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
index 932867e1f0..16312a2704 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
@@ -154,8 +154,7 @@ public class HibernateQueryTest extends AbstractCDOTest
       // result with arrays are tested below
       // CDOQuery cdoQuery = transaction.createQuery("hql",
       // "select so.id, sum(od.price) from SalesOrder so, OrderDetail od where od.order=so group by so.id");
-      CDOQuery cdoQuery = transaction.createQuery("hql",
-          "select sum(od.price) from SalesOrder so, OrderDetail od where od.order=so group by so.id");
+      CDOQuery cdoQuery = transaction.createQuery("hql", "select sum(od.price) from SalesOrder so, OrderDetail od where od.order=so group by so.id");
       addCacheParameter(cdoQuery);
       final List<Double> results = cdoQuery.getResult(Double.class);
       assertEquals(NUM_OF_SALES_ORDERS * NUM_OF_CUSTOMERS, results.size());
@@ -208,8 +207,7 @@ public class HibernateQueryTest extends AbstractCDOTest
           orderQuery.setParameter("product", product);
           addCacheParameter(orderQuery);
 
-          final boolean hasOrders = productCounter <= productIndex
-              && productIndex < productCounter + NUM_OF_PRODUCTS_CUSTOMER;
+          final boolean hasOrders = productCounter <= productIndex && productIndex < productCounter + NUM_OF_PRODUCTS_CUSTOMER;
           if (hasOrders)
           {
             final List<SalesOrder> sos = orderQuery.getResult(SalesOrder.class);
@@ -258,8 +256,7 @@ public class HibernateQueryTest extends AbstractCDOTest
       final List<OrderDetail> orderDetails = odQuery.getResult(OrderDetail.class);
       for (OrderDetail orderDetail : orderDetails)
       {
-        final CDOQuery orderQuery = transaction.createQuery("hql",
-            "select so from SalesOrder so where :od in elements(so.orderDetails)");
+        final CDOQuery orderQuery = transaction.createQuery("hql", "select so from SalesOrder so where :od in elements(so.orderDetails)");
         orderQuery.setParameter("od", orderDetail);
         final List<SalesOrder> sos = orderQuery.getResult(SalesOrder.class);
         assertEquals(1, sos.size());
@@ -291,8 +288,7 @@ public class HibernateQueryTest extends AbstractCDOTest
       final List<Customer> customers = odQuery.getResult(Customer.class);
       for (Customer customer : customers)
       {
-        final CDOQuery orderQuery = transaction.createQuery("hql",
-            "select so from SalesOrder so where so.customer.id=:customerId");
+        final CDOQuery orderQuery = transaction.createQuery("hql", "select so from SalesOrder so where so.customer.id=:customerId");
         final CDOObject cdoObject = CDOUtil.getCDOObject(customer);
         final CDOID id = cdoObject.cdoID();
         orderQuery.setParameter("customerId", HibernateUtil.getInstance().getIdValue(id));
@@ -321,8 +317,7 @@ public class HibernateQueryTest extends AbstractCDOTest
 
     {
       msg("Query for order details");
-      CDOQuery query = transaction.createQuery("hql",
-          "select od, od.order, od.product.vat, od.price from OrderDetail as od where od.product.vat=:vat");
+      CDOQuery query = transaction.createQuery("hql", "select od, od.order, od.product.vat, od.price from OrderDetail as od where od.product.vat=:vat");
       query.setParameter("vat", VAT.VAT15);
       addCacheParameter(query);
       for (Object[] values : query.getResult(Object[].class))
@@ -457,8 +452,7 @@ public class HibernateQueryTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter,
-          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter, productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
index 851fd867a1..a2931497b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
@@ -28,8 +28,7 @@ public interface HibernateTestFactory extends EFactory
    * <!-- end-user-doc -->
    * @generated
    */
-  HibernateTestFactory eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestFactoryImpl
-      .init();
+  HibernateTestFactory eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Bz356181 Main</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
index bae20cb0c9..84ae569ce7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
@@ -63,8 +63,7 @@ public interface HibernateTestPackage extends EPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  HibernateTestPackage eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl
-      .init();
+  HibernateTestPackage eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl.init();
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl <em>Bz356181 Main</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
index 7b23213bbc..876ea5fcdb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
@@ -141,8 +141,7 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     transient_ = newTransient;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT, oldTransient,
-          transient_));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT, oldTransient, transient_));
     }
   }
 
@@ -167,8 +166,7 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     nonTransient = newNonTransient;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT,
-          oldNonTransient, nonTransient));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT, oldNonTransient, nonTransient));
     }
   }
 
@@ -187,8 +185,7 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
-              oldTransientRef, transientRef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF, oldTransientRef, transientRef));
         }
       }
     }
@@ -216,8 +213,7 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     transientRef = newTransientRef;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
-          oldTransientRef, transientRef));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF, oldTransientRef, transientRef));
     }
   }
 
@@ -236,8 +232,8 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef,
+              transientOtherRef));
         }
       }
     }
@@ -265,8 +261,7 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     transientOtherRef = newTransientOtherRef;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF,
-          oldTransientOtherRef, transientOtherRef));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
index 923cfbc5aa..91fa95272c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
@@ -81,8 +81,7 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN,
-              oldMain, main));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain, main));
         }
       }
     }
@@ -110,8 +109,7 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
     main = newMain;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain,
-          main));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain, main));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
index 6c2298d795..8f2e2a3ab4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
@@ -79,8 +79,8 @@ public class Bz380987_GroupImpl extends EObjectImpl implements Bz380987_Group
   {
     if (people == null)
     {
-      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this,
-          HibernateTestPackage.BZ380987_GROUP__PEOPLE, HibernateTestPackage.BZ380987_PERSON__GROUP);
+      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this, HibernateTestPackage.BZ380987_GROUP__PEOPLE,
+          HibernateTestPackage.BZ380987_PERSON__GROUP);
     }
     return people;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
index 466f495170..f91a0e4429 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
@@ -139,8 +139,8 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
   {
     if (group == null)
     {
-      group = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Group>(Bz380987_Group.class, this,
-          HibernateTestPackage.BZ380987_PERSON__GROUP, HibernateTestPackage.BZ380987_GROUP__PEOPLE);
+      group = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Group>(Bz380987_Group.class, this, HibernateTestPackage.BZ380987_PERSON__GROUP,
+          HibernateTestPackage.BZ380987_GROUP__PEOPLE);
     }
     return group;
   }
@@ -154,8 +154,8 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
   {
     if (places == null)
     {
-      places = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Place>(Bz380987_Place.class, this,
-          HibernateTestPackage.BZ380987_PERSON__PLACES, HibernateTestPackage.BZ380987_PLACE__PEOPLE);
+      places = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Place>(Bz380987_Place.class, this, HibernateTestPackage.BZ380987_PERSON__PLACES,
+          HibernateTestPackage.BZ380987_PLACE__PEOPLE);
     }
     return places;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
index 21774aa029..ed753a1bb0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
@@ -127,8 +127,8 @@ public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
   {
     if (people == null)
     {
-      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this,
-          HibernateTestPackage.BZ380987_PLACE__PEOPLE, HibernateTestPackage.BZ380987_PERSON__PLACES);
+      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this, HibernateTestPackage.BZ380987_PLACE__PEOPLE,
+          HibernateTestPackage.BZ380987_PERSON__PLACES);
     }
     return people;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
index 0e1f8331bd..1e5b1bd92c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
@@ -179,8 +179,8 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     strUnsettableESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
-          oldStrUnsettable, strUnsettable, !oldStrUnsettableESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE, oldStrUnsettable, strUnsettable,
+          !oldStrUnsettableESet));
     }
   }
 
@@ -197,8 +197,8 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     strUnsettableESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
-          oldStrUnsettable, STR_UNSETTABLE_EDEFAULT, oldStrUnsettableESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE, oldStrUnsettable, STR_UNSETTABLE_EDEFAULT,
+          oldStrUnsettableESet));
     }
   }
 
@@ -233,8 +233,7 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     strSettable = newStrSettable;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE,
-          oldStrSettable, strSettable));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE, oldStrSettable, strSettable));
     }
   }
 
@@ -259,8 +258,7 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     enumSettable = newEnumSettable == null ? ENUM_SETTABLE_EDEFAULT : newEnumSettable;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE,
-          oldEnumSettable, enumSettable));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE, oldEnumSettable, enumSettable));
     }
   }
 
@@ -287,8 +285,8 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     enumUnsettableESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
-          oldEnumUnsettable, enumUnsettable, !oldEnumUnsettableESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE, oldEnumUnsettable, enumUnsettable,
+          !oldEnumUnsettableESet));
     }
   }
 
@@ -305,8 +303,8 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     enumUnsettableESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
-          oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT, oldEnumUnsettableESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE, oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT,
+          oldEnumUnsettableESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
index 529836c61d..6270d57de0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
@@ -122,8 +122,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
    */
   public void setRefToP(Bz397682P newRefToP)
   {
-    if (newRefToP != eInternalContainer()
-        || eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null)
+    if (newRefToP != eInternalContainer() || eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null)
     {
       if (EcoreUtil.isAncestor(this, newRefToP))
       {
@@ -136,8 +135,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
       }
       if (newRefToP != null)
       {
-        msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C,
-            Bz397682P.class, msgs);
+        msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
       }
       msgs = basicSetRefToP(newRefToP, msgs);
       if (msgs != null)
@@ -147,8 +145,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP,
-          newRefToP));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP, newRefToP));
     }
   }
 
@@ -167,8 +164,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C,
-              oldRefToC, refToC));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
         }
       }
     }
@@ -196,8 +192,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     refToC = newRefToC;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
     }
   }
 
@@ -273,8 +268,7 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     switch (eContainerFeatureID())
     {
     case HibernateTestPackage.BZ397682_C__REF_TO_P:
-      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class,
-          msgs);
+      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
index 8b9510e2a8..6f8ef596ae 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
@@ -127,8 +127,8 @@ public class Bz397682PImpl extends EObjectImpl implements Bz397682P
   {
     if (listOfC == null)
     {
-      listOfC = new EObjectContainmentWithInverseEList<Bz397682C>(Bz397682C.class, this,
-          HibernateTestPackage.BZ397682_P__LIST_OF_C, HibernateTestPackage.BZ397682_C__REF_TO_P);
+      listOfC = new EObjectContainmentWithInverseEList<Bz397682C>(Bz397682C.class, this, HibernateTestPackage.BZ397682_P__LIST_OF_C,
+          HibernateTestPackage.BZ397682_C__REF_TO_P);
     }
     return listOfC;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
index fe8e5c5183..02bcb5921d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
@@ -102,8 +102,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A
   {
     if (listOfB == null)
     {
-      listOfB = new EObjectContainmentWithInverseEList<Bz398057B>(Bz398057B.class, this,
-          HibernateTestPackage.BZ398057_A__LIST_OF_B, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A);
+      listOfB = new EObjectContainmentWithInverseEList<Bz398057B>(Bz398057B.class, this, HibernateTestPackage.BZ398057_A__LIST_OF_B,
+          HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A);
     }
     return listOfB;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
index 287ad6f486..bf8e365e7e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
@@ -94,8 +94,7 @@ public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
     valueStr = newValueStr;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr,
-          valueStr));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr, valueStr));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
index 9b205f675d..8769279e6a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
@@ -132,8 +132,7 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
    */
   public void setRefToClassA(Bz398057A newRefToClassA)
   {
-    if (newRefToClassA != eInternalContainer()
-        || eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null)
+    if (newRefToClassA != eInternalContainer() || eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null)
     {
       if (EcoreUtil.isAncestor(this, newRefToClassA))
       {
@@ -146,8 +145,7 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
       }
       if (newRefToClassA != null)
       {
-        msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B,
-            Bz398057A.class, msgs);
+        msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class, msgs);
       }
       msgs = basicSetRefToClassA(newRefToClassA, msgs);
       if (msgs != null)
@@ -157,8 +155,7 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A,
-          newRefToClassA, newRefToClassA));
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, newRefToClassA, newRefToClassA));
     }
   }
 
@@ -259,8 +256,7 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
     switch (eContainerFeatureID())
     {
     case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class,
-          msgs);
+      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
index 5eaf6e2831..ca858f3334 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
@@ -52,8 +52,7 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
   {
     try
     {
-      HibernateTestFactory theHibernateTestFactory = (HibernateTestFactory)EPackage.Registry.INSTANCE
-          .getEFactory(HibernateTestPackage.eNS_URI);
+      HibernateTestFactory theHibernateTestFactory = (HibernateTestFactory)EPackage.Registry.INSTANCE.getEFactory(HibernateTestPackage.eNS_URI);
       if (theHibernateTestFactory != null)
       {
         return theHibernateTestFactory;
@@ -305,8 +304,7 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
     Bz387752_Enum result = Bz387752_Enum.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
index eef3570e40..ae88524ed5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
@@ -187,9 +187,8 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     }
 
     // Obtain or create and register package
-    HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof HibernateTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new HibernateTestPackageImpl());
+    HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HibernateTestPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HibernateTestPackageImpl());
 
     isInited = true;
 
@@ -732,109 +731,83 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     bz398057B1EClass.getESuperTypes().add(getBz398057B());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1,
-        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1,
-        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getBz356181_Main_TransientRef(), getBz356181_Transient(), null, "transientRef", null, 0, 1,
-        Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz356181_Main_TransientOtherRef(), getBz356181_NonTransient(), null, "transientOtherRef", null, 0,
-        1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz356181_NonTransient_Main(), getBz356181_Main(), null, "main", null, 0, 1,
-        Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bz387752_MainEClass, Bz387752_Main.class, "Bz387752_Main", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz387752_Main_StrUnsettable(), ecorePackage.getEString(), "strUnsettable", "def_value", 0, 1,
-        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1,
-        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBz387752_Main_EnumSettable(), getBz387752_Enum(), "enumSettable", null, 0, 1, Bz387752_Main.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz387752_Main_EnumUnsettable(), getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
-        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz380987_Group_People(), getBz380987_Person(), getBz380987_Person_Group(), "people", null, 0, -1,
-        Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Place_People(), getBz380987_Person(), getBz380987_Person_Places(), "people", null, 0, -1,
-        Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Person_Group(), getBz380987_Group(), getBz380987_Group_People(), "group", null, 0, -1,
-        Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Person_Places(), getBz380987_Place(), getBz380987_Place_People(), "places", null, 0, -1,
-        Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1, Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1, Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz356181_Main_TransientRef(), getBz356181_Transient(), null, "transientRef", null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz356181_Main_TransientOtherRef(), getBz356181_NonTransient(), null, "transientOtherRef", null, 0, 1, Bz356181_Main.class, IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz356181_NonTransient_Main(), getBz356181_Main(), null, "main", null, 0, 1, Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz387752_MainEClass, Bz387752_Main.class, "Bz387752_Main", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz387752_Main_StrUnsettable(), ecorePackage.getEString(), "strUnsettable", "def_value", 0, 1, Bz387752_Main.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumSettable(), getBz387752_Enum(), "enumSettable", null, 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumUnsettable(), getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz380987_Group_People(), getBz380987_Person(), getBz380987_Person_Group(), "people", null, 0, -1, Bz380987_Group.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Place_People(), getBz380987_Person(), getBz380987_Person_Places(), "people", null, 0, -1, Bz380987_Place.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Group(), getBz380987_Group(), getBz380987_Group_People(), "group", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Places(), getBz380987_Place(), getBz380987_Place_People(), "places", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz398057AEClass, Bz398057A.class, "Bz398057A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz398057A_ListOfB(), getBz398057B(), getBz398057B_RefToClassA(), "listOfB", null, 0, -1,
-        Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz398057A_ListOfB(), getBz398057B(), getBz398057B_RefToClassA(), "listOfB", null, 0, -1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(bz398057A1EClass, Bz398057A1.class, "Bz398057A1", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bz398057A1EClass, Bz398057A1.class, "Bz398057A1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(bz398057BEClass, Bz398057B.class, "Bz398057B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz398057B_RefToClassA(), getBz398057A(), getBz398057A_ListOfB(), "refToClassA", null, 0, 1,
-        Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bz398057B1EClass, Bz398057B1.class, "Bz398057B1", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz398057B1_ValueStr(), ecorePackage.getEString(), "valueStr", null, 0, 1, Bz398057B1.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz398057B_RefToClassA(), getBz398057A(), getBz398057A_ListOfB(), "refToClassA", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz398057B1EClass, Bz398057B1.class, "Bz398057B1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz398057B1_ValueStr(), ecorePackage.getEString(), "valueStr", null, 0, 1, Bz398057B1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz397682PEClass, Bz397682P.class, "Bz397682P", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz397682P_ListOfC(), getBz397682C(), getBz397682C_RefToP(), "listOfC", null, 0, -1,
-        Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682P_ListOfC(), getBz397682C(), getBz397682C_RefToP(), "listOfC", null, 0, -1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz397682CEClass, Bz397682C.class, "Bz397682C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz397682C_RefToP(), getBz397682P(), getBz397682P_ListOfC(), "refToP", null, 0, 1, Bz397682C.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz397682C_RefToC(), getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682C_RefToP(), getBz397682P(), getBz397682P_ListOfC(), "refToP", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682C_RefToC(), getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(bz387752_EnumEEnum, Bz387752_Enum.class, "Bz387752_Enum");
@@ -860,14 +833,11 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     String source = "teneo.jpa";
     addAnnotation(getBz356181_Main_Transient(), source, new String[] { "value", "@Transient" });
     addAnnotation(bz356181_TransientEClass, source, new String[] { "value", "@Transient" });
-    addAnnotation(bz398057AEClass, source,
-        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz398057AEClass, source, new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz398057A_DbId(), source, new String[] { "value", "@Id" });
-    addAnnotation(bz398057BEClass, source,
-        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz398057BEClass, source, new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz398057B_DbId(), source, new String[] { "value", "@Id" });
-    addAnnotation(bz397682PEClass, source,
-        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz397682PEClass, source, new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz397682P_DbId(), source, new String[] { "value", "@Id" });
     addAnnotation(getBz397682C_DbId(), source, new String[] { "value", "@Id" });
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.core.prefs
index 1d35a02a69..fb423234f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index eb655fd836..62f8ccc18b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -154,8 +154,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
     ParameterPassing result = ParameterPassing.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
index 57cbaa59e3..0a8307116f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
@@ -98,8 +98,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
     }
 
     // Obtain or create and register package
-    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
+    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
 
     isInited = true;
 
@@ -275,25 +275,21 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
index 7ab77c57a3..572d1fd16d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
@@ -45,8 +45,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   {
     try
     {
-      MangoFactory theMangoFactory = (MangoFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/mango");
+      MangoFactory theMangoFactory = (MangoFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/mango");
       if (theMangoFactory instanceof MangoFactoryImpl)
       {
         return theMangoFactory;
@@ -164,8 +163,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
     ParameterPassing result = ParameterPassing.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
index d35dc332c7..53e33a0862 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
@@ -103,8 +103,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
     }
 
     // Obtain or create and register package
-    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
+    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
 
     isInited = true;
 
@@ -280,25 +280,21 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(mangoValueListEClass, MangoValueList.class, "MangoValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
index c42fbc1f94..3ad0817dbd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
@@ -133,8 +133,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
     passing = newPassing == null ? PASSING_EDEFAULT : newPassing;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing));
+      eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index 6fc4449361..183a7ada0d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -210,8 +210,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
     VAT result = VAT.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
index 5e8c82d8d3..ba83f39c89 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
@@ -161,8 +161,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     }
 
     // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model1PackageImpl());
+    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model1PackageImpl());
 
     isInited = true;
 
@@ -729,120 +729,94 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
-        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
-        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1,
-        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
-        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_SalesOrders(), getSalesOrder(), getSalesOrder_PurchaseOrders(), "salesOrders", null,
-        0, -1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
-        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_SalesOrders(), "purchaseOrders",
-        null, 0, -1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_SalesOrders(), getSalesOrder(), getSalesOrder_PurchaseOrders(), "salesOrders", null, 0, -1, PurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_SalesOrders(), "purchaseOrders", null, 0, -1, SalesOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
-        Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, Product1.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEAttribute(getProduct1_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1, OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1,
-        OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getProductToOrder_Key(), getProduct1(), 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);
-    initEReference(getProductToOrder_Value(), getSalesOrder(), 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);
+
+    initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getProductToOrder_Key(), getProduct1(), 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);
+    initEReference(getProductToOrder_Value(), getSalesOrder(), 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);
 
     // Initialize enums and add enum literals
     initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT");
@@ -870,8 +844,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getProduct1_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(orderAddressEClass, source, new String[] { "value",
-        "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
+    addAnnotation(orderAddressEClass, source,
+        new String[] { "value", "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
   }
 
 } // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
index 1fa202a953..4c25d1fc83 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
@@ -128,8 +128,7 @@ public class CategoryImpl extends EObjectImpl implements Category
   {
     if (categories == null)
     {
-      categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this,
-          Model1Package.CATEGORY__CATEGORIES);
+      categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this, Model1Package.CATEGORY__CATEGORIES);
     }
     return categories;
   }
@@ -142,8 +141,7 @@ public class CategoryImpl extends EObjectImpl implements Category
   {
     if (products == null)
     {
-      products = new EObjectContainmentEList.Resolving<Product1>(Product1.class, this,
-          Model1Package.CATEGORY__PRODUCTS);
+      products = new EObjectContainmentEList.Resolving<Product1>(Product1.class, this, Model1Package.CATEGORY__PRODUCTS);
     }
     return products;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CompanyImpl.java
index e4bd7d1e3c..6f616f1156 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CompanyImpl.java
@@ -121,8 +121,7 @@ public class CompanyImpl extends AddressImpl implements Company
   {
     if (categories == null)
     {
-      categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this,
-          Model1Package.COMPANY__CATEGORIES);
+      categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this, Model1Package.COMPANY__CATEGORIES);
     }
     return categories;
   }
@@ -135,8 +134,7 @@ public class CompanyImpl extends AddressImpl implements Company
   {
     if (suppliers == null)
     {
-      suppliers = new EObjectContainmentEList.Resolving<Supplier>(Supplier.class, this,
-          Model1Package.COMPANY__SUPPLIERS);
+      suppliers = new EObjectContainmentEList.Resolving<Supplier>(Supplier.class, this, Model1Package.COMPANY__SUPPLIERS);
     }
     return suppliers;
   }
@@ -149,8 +147,7 @@ public class CompanyImpl extends AddressImpl implements Company
   {
     if (customers == null)
     {
-      customers = new EObjectContainmentEList.Resolving<Customer>(Customer.class, this,
-          Model1Package.COMPANY__CUSTOMERS);
+      customers = new EObjectContainmentEList.Resolving<Customer>(Customer.class, this, Model1Package.COMPANY__CUSTOMERS);
     }
     return customers;
   }
@@ -163,8 +160,7 @@ public class CompanyImpl extends AddressImpl implements Company
   {
     if (purchaseOrders == null)
     {
-      purchaseOrders = new EObjectContainmentEList.Resolving<PurchaseOrder>(PurchaseOrder.class, this,
-          Model1Package.COMPANY__PURCHASE_ORDERS);
+      purchaseOrders = new EObjectContainmentEList.Resolving<PurchaseOrder>(PurchaseOrder.class, this, Model1Package.COMPANY__PURCHASE_ORDERS);
     }
     return purchaseOrders;
   }
@@ -177,8 +173,7 @@ public class CompanyImpl extends AddressImpl implements Company
   {
     if (salesOrders == null)
     {
-      salesOrders = new EObjectContainmentEList.Resolving<SalesOrder>(SalesOrder.class, this,
-          Model1Package.COMPANY__SALES_ORDERS);
+      salesOrders = new EObjectContainmentEList.Resolving<SalesOrder>(SalesOrder.class, this, Model1Package.COMPANY__SALES_ORDERS);
     }
     return salesOrders;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CustomerImpl.java
index e5f34c73ce..3ac5f0bd63 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CustomerImpl.java
@@ -88,8 +88,8 @@ public class CustomerImpl extends AddressImpl implements Customer
   {
     if (salesOrders == null)
     {
-      salesOrders = new EObjectWithInverseResolvingEList<SalesOrder>(SalesOrder.class, this,
-          Model1Package.CUSTOMER__SALES_ORDERS, Model1Package.SALES_ORDER__CUSTOMER);
+      salesOrders = new EObjectWithInverseResolvingEList<SalesOrder>(SalesOrder.class, this, Model1Package.CUSTOMER__SALES_ORDERS,
+          Model1Package.SALES_ORDER__CUSTOMER);
     }
     return salesOrders;
   }
@@ -102,8 +102,8 @@ public class CustomerImpl extends AddressImpl implements Customer
   {
     if (orderByProduct == null)
     {
-      orderByProduct = new EcoreEMap<Product1, SalesOrder>(Model1Package.eINSTANCE.getProductToOrder(),
-          ProductToOrderImpl.class, this, Model1Package.CUSTOMER__ORDER_BY_PRODUCT);
+      orderByProduct = new EcoreEMap<Product1, SalesOrder>(Model1Package.eINSTANCE.getProductToOrder(), ProductToOrderImpl.class, this,
+          Model1Package.CUSTOMER__ORDER_BY_PRODUCT);
     }
     return orderByProduct;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
index aae6f9aa4b..55425e026e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
@@ -50,8 +50,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
   {
     try
     {
-      Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0");
+      Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0");
       if (theModel1Factory != null)
       {
         return theModel1Factory;
@@ -260,8 +259,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
   {
     VAT result = VAT.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
index 4f8f7e0d75..22ae0a14dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
@@ -163,9 +163,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     }
 
     // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE
-        .get(Model1Package.eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new Model1PackageImpl());
+    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(Model1Package.eNS_URI) instanceof Model1PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model1PackageImpl());
 
     isInited = true;
 
@@ -728,120 +727,94 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
-        Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
-        "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(), "purchaseOrders", null, 0, -1, Supplier.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
-        0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1,
-        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null, 0, -1, Customer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, 0,
-        -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", null,
-        1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_PurchaseOrders(),
-        "salesOrders", null, 0, -1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, 1,
-        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_SalesOrders(),
-        "purchaseOrders", null, 0, -1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, 0, -1, Order.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPurchaseOrder_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_PurchaseOrders(), "salesOrders", null, 0, -1, PurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_SalesOrders(), "purchaseOrders", null, 0, -1,
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
-        null, 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails", null, 0, -1, Product1.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1, OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1,
-        OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getProductToOrder_Key(), this.getProduct1(), 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);
-    initEReference(getProductToOrder_Value(), this.getSalesOrder(), 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);
+
+    initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getProductToOrder_Key(), this.getProduct1(), 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);
+    initEReference(getProductToOrder_Value(), this.getSalesOrder(), 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);
 
     // Initialize enums and add enum literals
     initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT");
@@ -869,8 +842,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getProduct1_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(orderAddressEClass, source, new String[] { "value",
-        "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
+    addAnnotation(orderAddressEClass, source,
+        new String[] { "value", "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
   }
 
 } // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
index 62f1e2916c..9bd05984f1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
@@ -132,8 +132,8 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
   {
     if (orderDetails == null)
     {
-      orderDetails = new EObjectContainmentWithInverseEList.Resolving<OrderDetail>(OrderDetail.class, this,
-          Model1Package.ORDER_ADDRESS__ORDER_DETAILS, Model1Package.ORDER_DETAIL__ORDER);
+      orderDetails = new EObjectContainmentWithInverseEList.Resolving<OrderDetail>(OrderDetail.class, this, Model1Package.ORDER_ADDRESS__ORDER_DETAILS,
+          Model1Package.ORDER_DETAIL__ORDER);
     }
     return orderDetails;
   }
@@ -177,8 +177,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
    */
   public void setOrder(Order newOrder)
   {
-    if (newOrder != eInternalContainer()
-        || (eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER && newOrder != null))
+    if (newOrder != eInternalContainer() || (eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER && newOrder != null))
     {
       if (EcoreUtil.isAncestor(this, newOrder))
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -208,8 +207,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
       if (product != oldProduct)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct,
-              product));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, product));
       }
     }
     return product;
@@ -234,8 +232,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
     product = newProduct;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, newProduct);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, newProduct);
       if (msgs == null)
         msgs = notification;
       else
@@ -254,18 +251,15 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
     {
       NotificationChain msgs = null;
       if (product != null)
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       if (newProduct != null)
-        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       msgs = basicSetProduct(newProduct, msgs);
       if (msgs != null)
         msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct, newProduct));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct, newProduct));
   }
 
   /**
@@ -307,8 +301,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
     boolean oldTestAttribute = testAttribute;
     testAttribute = newTestAttribute;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE,
-          oldTestAttribute, testAttribute));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE, oldTestAttribute, testAttribute));
   }
 
   /**
@@ -329,8 +322,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
       return basicSetOrder((Order)otherEnd, msgs);
     case Model1Package.ORDER_ADDRESS__PRODUCT:
       if (product != null)
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       return basicSetProduct((Product1)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
index 6da87166ea..b20adb4a12 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
@@ -126,8 +126,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
    */
   public void setOrder(Order newOrder)
   {
-    if (newOrder != eInternalContainer()
-        || (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null))
+    if (newOrder != eInternalContainer() || (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null))
     {
       if (EcoreUtil.isAncestor(this, newOrder))
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -157,8 +156,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
       if (product != oldProduct)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct,
-              product));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, product));
       }
     }
     return product;
@@ -183,8 +181,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     product = newProduct;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, newProduct);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, newProduct);
       if (msgs == null)
         msgs = notification;
       else
@@ -203,18 +200,15 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     {
       NotificationChain msgs = null;
       if (product != null)
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       if (newProduct != null)
-        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       msgs = basicSetProduct(newProduct, msgs);
       if (msgs != null)
         msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
   }
 
   /**
@@ -253,8 +247,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
       return basicSetOrder((Order)otherEnd, msgs);
     case Model1Package.ORDER_DETAIL__PRODUCT:
       if (product != null)
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
+        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs);
       return basicSetProduct((Product1)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderImpl.java
index 2c216d7839..47b7ea753f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderImpl.java
@@ -74,8 +74,8 @@ public abstract class OrderImpl extends EObjectImpl implements Order
   {
     if (orderDetails == null)
     {
-      orderDetails = new EObjectContainmentWithInverseEList.Resolving<OrderDetail>(OrderDetail.class, this,
-          Model1Package.ORDER__ORDER_DETAILS, Model1Package.ORDER_DETAIL__ORDER);
+      orderDetails = new EObjectContainmentWithInverseEList.Resolving<OrderDetail>(OrderDetail.class, this, Model1Package.ORDER__ORDER_DETAILS,
+          Model1Package.ORDER_DETAIL__ORDER);
     }
     return orderDetails;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Product1Impl.java
index 0be0cde012..cab9901780 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Product1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Product1Impl.java
@@ -170,8 +170,8 @@ public class Product1Impl extends EObjectImpl implements Product1
   {
     if (orderDetails == null)
     {
-      orderDetails = new EObjectWithInverseResolvingEList<OrderDetail>(OrderDetail.class, this,
-          Model1Package.PRODUCT1__ORDER_DETAILS, Model1Package.ORDER_DETAIL__PRODUCT);
+      orderDetails = new EObjectWithInverseResolvingEList<OrderDetail>(OrderDetail.class, this, Model1Package.PRODUCT1__ORDER_DETAILS,
+          Model1Package.ORDER_DETAIL__PRODUCT);
     }
     return orderDetails;
   }
@@ -229,8 +229,7 @@ public class Product1Impl extends EObjectImpl implements Product1
     String oldDescription = description;
     description = newDescription;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__DESCRIPTION, oldDescription,
-          description));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__DESCRIPTION, oldDescription, description));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
index 01f7c501ab..f704a823e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/ProductToOrderImpl.java
@@ -130,8 +130,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P
       if (value != oldValue)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue,
-              value));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value));
       }
     }
     return value;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
index 6925d9c70a..497666148e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
@@ -124,8 +124,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
       if (supplier != oldSupplier)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier,
-              supplier));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, supplier));
       }
     }
     return supplier;
@@ -150,8 +149,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
     supplier = newSupplier;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, newSupplier);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, newSupplier);
       if (msgs == null)
         msgs = notification;
       else
@@ -170,18 +168,15 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
     {
       NotificationChain msgs = null;
       if (supplier != null)
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
-            msgs);
+        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs);
       if (newSupplier != null)
-        msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
-            msgs);
+        msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs);
       msgs = basicSetSupplier(newSupplier, msgs);
       if (msgs != null)
         msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, newSupplier,
-          newSupplier));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, newSupplier, newSupplier));
   }
 
   /**
@@ -193,8 +188,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
   {
     if (salesOrders == null)
     {
-      salesOrders = new EObjectWithInverseResolvingEList.ManyInverse<SalesOrder>(SalesOrder.class, this,
-          Model1Package.PURCHASE_ORDER__SALES_ORDERS, Model1Package.SALES_ORDER__PURCHASE_ORDERS);
+      salesOrders = new EObjectWithInverseResolvingEList.ManyInverse<SalesOrder>(SalesOrder.class, this, Model1Package.PURCHASE_ORDER__SALES_ORDERS,
+          Model1Package.SALES_ORDER__PURCHASE_ORDERS);
     }
     return salesOrders;
   }
@@ -211,8 +206,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
     {
     case Model1Package.PURCHASE_ORDER__SUPPLIER:
       if (supplier != null)
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
-            msgs);
+        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs);
       return basicSetSupplier((Supplier)otherEnd, msgs);
     case Model1Package.PURCHASE_ORDER__SALES_ORDERS:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getSalesOrders()).basicAdd(otherEnd, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
index 6e658800d8..46acec3a6a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
@@ -132,8 +132,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
       if (customer != oldCustomer)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer,
-              customer));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, customer));
       }
     }
     return customer;
@@ -158,8 +157,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
     customer = newCustomer;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, newCustomer);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, newCustomer);
       if (msgs == null)
         msgs = notification;
       else
@@ -178,18 +176,15 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
     {
       NotificationChain msgs = null;
       if (customer != null)
-        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
+        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs);
       if (newCustomer != null)
-        msgs = ((InternalEObject)newCustomer).eInverseAdd(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
+        msgs = ((InternalEObject)newCustomer).eInverseAdd(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs);
       msgs = basicSetCustomer(newCustomer, msgs);
       if (msgs != null)
         msgs.dispatch();
     }
     else if (eNotificationRequired())
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer, newCustomer));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer, newCustomer));
   }
 
   /**
@@ -201,8 +196,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
   {
     if (purchaseOrders == null)
     {
-      purchaseOrders = new EObjectWithInverseResolvingEList.ManyInverse<PurchaseOrder>(PurchaseOrder.class, this,
-          Model1Package.SALES_ORDER__PURCHASE_ORDERS, Model1Package.PURCHASE_ORDER__SALES_ORDERS);
+      purchaseOrders = new EObjectWithInverseResolvingEList.ManyInverse<PurchaseOrder>(PurchaseOrder.class, this, Model1Package.SALES_ORDER__PURCHASE_ORDERS,
+          Model1Package.PURCHASE_ORDER__SALES_ORDERS);
     }
     return purchaseOrders;
   }
@@ -219,8 +214,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
     {
     case Model1Package.SALES_ORDER__CUSTOMER:
       if (customer != null)
-        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
+        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs);
       return basicSetCustomer((Customer)otherEnd, msgs);
     case Model1Package.SALES_ORDER__PURCHASE_ORDERS:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getPurchaseOrders()).basicAdd(otherEnd, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
index ee5eb7c86f..4ab07cd0ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
@@ -96,8 +96,8 @@ public class SupplierImpl extends AddressImpl implements Supplier
   {
     if (purchaseOrders == null)
     {
-      purchaseOrders = new EObjectWithInverseResolvingEList<PurchaseOrder>(PurchaseOrder.class, this,
-          Model1Package.SUPPLIER__PURCHASE_ORDERS, Model1Package.PURCHASE_ORDER__SUPPLIER);
+      purchaseOrders = new EObjectWithInverseResolvingEList<PurchaseOrder>(PurchaseOrder.class, this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
+          Model1Package.PURCHASE_ORDER__SUPPLIER);
     }
     return purchaseOrders;
   }
@@ -120,8 +120,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
     boolean oldPreferred = preferred;
     preferred = newPreferred;
     if (eNotificationRequired())
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
index 9949f51e16..8fb5c68c38 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
@@ -203,8 +203,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     }
 
     // Obtain or create and register package
-    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
+    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
 
     isInited = true;
 
@@ -1352,306 +1352,220 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     specialPurchaseOrderEClass.getESuperTypes().add(theModel1Package.getPurchaseOrder());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1,
-        SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress",
-        null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
-        TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress", null, 0, 1, SpecialPurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
-        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
+    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettable1EClass, Unsettable1.class, "Unsettable1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettable1_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", null, 0, 1, Unsettable1.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableString(), ecorePackage.getEString(), "unsettableString", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettable2WithDefaultEClass, Unsettable2WithDefault.class, "Unsettable2WithDefault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettable2WithDefault_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", "true", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", "2009-12-21T15:12:59", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", "3.3", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", "4.4", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", "5", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", "6", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", "7", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString", "\"eike\"", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), "children", null, 0, -1,
+        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        !IS_ORDERED);
+    initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(unsettable1EClass, Unsettable1.class, "Unsettable1", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettable1_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableString(), ecorePackage.getEString(), "unsettableString", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+    initEClass(transientContainerEClass, TransientContainer.class, "TransientContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), "parent", null, 0, 1,
+        TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
+    initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(unsettable2WithDefaultEClass, Unsettable2WithDefault.class, "Unsettable2WithDefault", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettable2WithDefault_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean",
-        "true", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate",
-        "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", "3.3",
-        0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", "4.4", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", "5", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", "6", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", "7", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString",
-        "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
-        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
-        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
-        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(transientContainerEClass, TransientContainer.class, "TransientContainer", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
-        TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
-        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
-        TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", "true", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", "3", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", "\'x\'", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", "1979-03-15T07:12:59", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", "3.3", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", "4.4", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", "6", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", "7", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", "\"eike\"", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", "vat15", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null, "stringToAddressContainmentMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null, "stringToAddressReferenceMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null, "eObjectToEObjectKeyContainedMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null, "eObjectToEObjectBothContainedMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null, "eObjectToEObjectValueContainedMap", null, 0,
+        -1, MapHolder.class, !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, !IS_GENERATED_INSTANCE_CLASS);
+    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);
+    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);
 
-    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(),
-        "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", "3",
-        0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar",
-        "\'x\'", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate",
-        "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEAttribute(getIntegerToStringMap_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);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble",
-        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat",
-        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0,
-        1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", "6",
-        0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort",
-        "7", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString",
-        "\"eike\"", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT",
-        "vat15", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null,
-        "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null,
-        "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0,
-        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null,
-        "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null,
-        "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null,
-        "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !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,
-        !IS_GENERATED_INSTANCE_CLASS);
-    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);
-    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);
+    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToVATMap_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);
+    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT, !IS_INTERFACE,
         !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getIntegerToStringMap_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);
+    initEAttribute(getStringToAddressContainmentMap_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);
+    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), 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);
 
-    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToVATMap_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);
-    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressReferenceMap_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);
+    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), 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);
 
-    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToAddressContainmentMap_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);
-    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), 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);
+    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), 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);
 
-    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToAddressReferenceMap_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);
-    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), 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);
+    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), 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);
 
-    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
         !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap",
-        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap",
-        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(enumListHolderEClass, EnumListHolder.class, "EnumListHolder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEnumListHolder_EnumList(), theModel1Package.getVAT(), "enumList", null, 0, -1,
-        EnumListHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), 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);
+
+    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), 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);
+
+    initEClass(enumListHolderEClass, EnumListHolder.class, "EnumListHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEnumListHolder_EnumList(), theModel1Package.getVAT(), "enumList", null, 0, -1, EnumListHolder.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/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
index 0d346acd87..ce96be60cc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
@@ -97,8 +97,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     key = newKey;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, oldKey, newKey);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, oldKey, newKey);
       if (msgs == null)
       {
         msgs = notification;
@@ -122,13 +121,11 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
       NotificationChain msgs = null;
       if (key != null)
       {
-        msgs = ((InternalEObject)key).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
       }
       if (newKey != null)
       {
-        msgs = ((InternalEObject)newKey).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
       }
       msgs = basicSetTypedKey(newKey, msgs);
       if (msgs != null)
@@ -138,8 +135,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY,
-          newKey, newKey));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, newKey, newKey));
     }
   }
 
@@ -162,8 +158,8 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     value = newValue;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, oldValue, newValue);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, oldValue,
+          newValue);
       if (msgs == null)
       {
         msgs = notification;
@@ -187,13 +183,11 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
       NotificationChain msgs = null;
       if (value != null)
       {
-        msgs = ((InternalEObject)value).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
       }
       if (newValue != null)
       {
-        msgs = ((InternalEObject)newValue).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
       }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
@@ -203,8 +197,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE,
-          newValue, newValue));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, newValue, newValue));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
index 66fe834ad8..b38af51892 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
@@ -97,8 +97,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     key = newKey;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, oldKey, newKey);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, oldKey, newKey);
       if (msgs == null)
       {
         msgs = notification;
@@ -122,13 +121,11 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
       NotificationChain msgs = null;
       if (key != null)
       {
-        msgs = ((InternalEObject)key).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
       }
       if (newKey != null)
       {
-        msgs = ((InternalEObject)newKey).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
       }
       msgs = basicSetTypedKey(newKey, msgs);
       if (msgs != null)
@@ -138,8 +135,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY,
-          newKey, newKey));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, newKey, newKey));
     }
   }
 
@@ -157,8 +153,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value));
         }
       }
     }
@@ -184,8 +179,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     value = newValue;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE,
-          oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
index d69abf98a2..a54def2288 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
@@ -91,8 +91,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey,
-              key));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey, key));
         }
       }
     }
@@ -136,8 +135,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE,
-              oldValue, value));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value));
         }
       }
     }
@@ -163,8 +161,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
     value = newValue;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
index 9cbde2b597..4835999d72 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
@@ -92,8 +92,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key));
         }
       }
     }
@@ -119,8 +118,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     key = newKey;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY,
-          oldKey, key));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key));
     }
   }
 
@@ -143,8 +141,8 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     value = newValue;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, oldValue, newValue);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, oldValue,
+          newValue);
       if (msgs == null)
       {
         msgs = notification;
@@ -168,13 +166,11 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
       NotificationChain msgs = null;
       if (value != null)
       {
-        msgs = ((InternalEObject)value).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
       }
       if (newValue != null)
       {
-        msgs = ((InternalEObject)newValue).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
       }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
@@ -184,8 +180,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE,
-          newValue, newValue));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue, newValue));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
index 30e13450f3..79b011de90 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
@@ -138,8 +138,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
     value = newValue;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
index 05b1e597cd..02f2ab0b6e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
@@ -160,8 +160,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (integerToStringMap == null)
     {
-      integerToStringMap = new EcoreEMap<Integer, String>(Model2Package.eINSTANCE.getIntegerToStringMap(),
-          IntegerToStringMapImpl.class, this, Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP);
+      integerToStringMap = new EcoreEMap<Integer, String>(Model2Package.eINSTANCE.getIntegerToStringMap(), IntegerToStringMapImpl.class, this,
+          Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP);
     }
     return integerToStringMap;
   }
@@ -174,8 +174,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (stringToStringMap == null)
     {
-      stringToStringMap = new EcoreEMap<String, String>(Model2Package.eINSTANCE.getStringToStringMap(),
-          StringToStringMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP);
+      stringToStringMap = new EcoreEMap<String, String>(Model2Package.eINSTANCE.getStringToStringMap(), StringToStringMapImpl.class, this,
+          Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP);
     }
     return stringToStringMap;
   }
@@ -188,8 +188,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (stringToVATMap == null)
     {
-      stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(), StringToVATMapImpl.class,
-          this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP);
+      stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(), StringToVATMapImpl.class, this,
+          Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP);
     }
     return stringToVATMap;
   }
@@ -202,9 +202,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (stringToAddressContainmentMap == null)
     {
-      stringToAddressContainmentMap = new EcoreEMap<String, Address>(
-          Model2Package.eINSTANCE.getStringToAddressContainmentMap(), StringToAddressContainmentMapImpl.class, this,
-          Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP);
+      stringToAddressContainmentMap = new EcoreEMap<String, Address>(Model2Package.eINSTANCE.getStringToAddressContainmentMap(),
+          StringToAddressContainmentMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP);
     }
     return stringToAddressContainmentMap;
   }
@@ -217,9 +216,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (stringToAddressReferenceMap == null)
     {
-      stringToAddressReferenceMap = new EcoreEMap<String, Address>(
-          Model2Package.eINSTANCE.getStringToAddressReferenceMap(), StringToAddressReferenceMapImpl.class, this,
-          Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP);
+      stringToAddressReferenceMap = new EcoreEMap<String, Address>(Model2Package.eINSTANCE.getStringToAddressReferenceMap(),
+          StringToAddressReferenceMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP);
     }
     return stringToAddressReferenceMap;
   }
@@ -232,8 +230,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (eObjectToEObjectMap == null)
     {
-      eObjectToEObjectMap = new EcoreEMap<EObject, EObject>(Model2Package.eINSTANCE.getEObjectToEObjectMap(),
-          EObjectToEObjectMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP);
+      eObjectToEObjectMap = new EcoreEMap<EObject, EObject>(Model2Package.eINSTANCE.getEObjectToEObjectMap(), EObjectToEObjectMapImpl.class, this,
+          Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP);
     }
     return eObjectToEObjectMap;
   }
@@ -246,9 +244,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (eObjectToEObjectKeyContainedMap == null)
     {
-      eObjectToEObjectKeyContainedMap = new EcoreEMap<EObject, EObject>(
-          Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class, this,
-          Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+      eObjectToEObjectKeyContainedMap = new EcoreEMap<EObject, EObject>(Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(),
+          EObjectToEObjectKeyContainedMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
     }
     return eObjectToEObjectKeyContainedMap;
   }
@@ -261,9 +258,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (eObjectToEObjectBothContainedMap == null)
     {
-      eObjectToEObjectBothContainedMap = new EcoreEMap<EObject, EObject>(
-          Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap(), EObjectToEObjectBothContainedMapImpl.class,
-          this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+      eObjectToEObjectBothContainedMap = new EcoreEMap<EObject, EObject>(Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap(),
+          EObjectToEObjectBothContainedMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
     }
     return eObjectToEObjectBothContainedMap;
   }
@@ -276,9 +272,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (eObjectToEObjectValueContainedMap == null)
     {
-      eObjectToEObjectValueContainedMap = new EcoreEMap<EObject, EObject>(
-          Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap(), EObjectToEObjectValueContainedMapImpl.class,
-          this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+      eObjectToEObjectValueContainedMap = new EcoreEMap<EObject, EObject>(Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap(),
+          EObjectToEObjectValueContainedMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
     }
     return eObjectToEObjectValueContainedMap;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
index b61ef64108..10af67d806 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2FactoryImpl.java
@@ -51,8 +51,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
   {
     try
     {
-      Model2Factory theModel2Factory = (Model2Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model2/1.0.0");
+      Model2Factory theModel2Factory = (Model2Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model2/1.0.0");
       if (theModel2Factory != null)
       {
         return theModel2Factory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
index 75875d530a..e650c37f61 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
@@ -203,8 +203,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     }
 
     // Obtain or create and register package
-    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
+    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
 
     isInited = true;
 
@@ -1352,306 +1352,220 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     specialPurchaseOrderEClass.getESuperTypes().add(theModel1Package.getPurchaseOrder());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1,
-        SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress",
-        null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
-        TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress", null, 0, 1, SpecialPurchaseOrder.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
-        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
+    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettable1EClass, Unsettable1.class, "Unsettable1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettable1_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", null, 0, 1, Unsettable1.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableString(), ecorePackage.getEString(), "unsettableString", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable1_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", null, 0, 1, Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettable2WithDefaultEClass, Unsettable2WithDefault.class, "Unsettable2WithDefault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettable2WithDefault_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", "true", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", "2009-12-21T15:12:59", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", "3.3", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", "4.4", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", "5", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", "6", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", "7", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString", "\"eike\"", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1, Unsettable2WithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), "children", null, 0, -1,
+        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        !IS_ORDERED);
+    initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(unsettable1EClass, Unsettable1.class, "Unsettable1", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettable1_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableString(), ecorePackage.getEString(), "unsettableString", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getUnsettable1_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", null, 0, 1,
-        Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+    initEClass(transientContainerEClass, TransientContainer.class, "TransientContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), "parent", null, 0, 1,
+        TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
+    initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(unsettable2WithDefaultEClass, Unsettable2WithDefault.class, "Unsettable2WithDefault", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettable2WithDefault_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean",
-        "true", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate",
-        "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", "3.3",
-        0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", "4.4", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", "5", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", "6", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", "7", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString",
-        "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1,
-        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
-        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
-        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
-        PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(transientContainerEClass, TransientContainer.class, "TransientContainer", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
-        TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
-        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
-        TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1, NotUnsettable.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", "true", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", "3", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", "\'x\'", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", "1979-03-15T07:12:59", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", "3.3", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", "4.4", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", "6", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", "7", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", "\"eike\"", 0, 1,
+        NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNotUnsettableWithDefault_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", "vat15", 0, 1, NotUnsettableWithDefault.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null, "stringToAddressContainmentMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null, "stringToAddressReferenceMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null, "eObjectToEObjectKeyContainedMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null, "eObjectToEObjectBothContainedMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null, "eObjectToEObjectValueContainedMap", null, 0,
+        -1, MapHolder.class, !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, !IS_GENERATED_INSTANCE_CLASS);
+    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);
+    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);
 
-    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(),
-        "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", "3",
-        0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar",
-        "\'x\'", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate",
-        "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+    initEAttribute(getIntegerToStringMap_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);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble",
-        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat",
-        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0,
-        1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", "6",
-        0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort",
-        "7", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString",
-        "\"eike\"", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettableWithDefault_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT",
-        "vat15", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
-        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null,
-        "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null,
-        "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0,
-        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null,
-        "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null,
-        "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null,
-        "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !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,
-        !IS_GENERATED_INSTANCE_CLASS);
-    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);
-    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);
+    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToVATMap_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);
+    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT, !IS_INTERFACE,
         !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getIntegerToStringMap_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);
+    initEAttribute(getStringToAddressContainmentMap_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);
+    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), 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);
 
-    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToVATMap_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);
-    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressReferenceMap_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);
+    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), 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);
 
-    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToAddressContainmentMap_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);
-    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), 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);
+    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), 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);
 
-    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToAddressReferenceMap_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);
-    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), 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);
+    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), 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);
 
-    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
         !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT,
-        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap",
-        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap",
-        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), 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);
-    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), 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);
-
-    initEClass(enumListHolderEClass, EnumListHolder.class, "EnumListHolder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEnumListHolder_EnumList(), theModel1Package.getVAT(), "enumList", null, 0, -1,
-        EnumListHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), 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);
+
+    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), 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);
+    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), 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);
+
+    initEClass(enumListHolderEClass, EnumListHolder.class, "EnumListHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEnumListHolder_EnumList(), theModel1Package.getVAT(), "enumList", null, 0, -1, EnumListHolder.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/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
index 5691e5924a..3a24619478 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
@@ -304,8 +304,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN,
-          oldNotUnsettableBoolean, notUnsettableBoolean));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean, notUnsettableBoolean));
     }
   }
 
@@ -328,8 +328,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE,
-          oldNotUnsettableByte, notUnsettableByte));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte));
     }
   }
 
@@ -352,8 +351,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR,
-          oldNotUnsettableChar, notUnsettableChar));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar));
     }
   }
 
@@ -376,8 +374,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE,
-          oldNotUnsettableDate, notUnsettableDate));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate));
     }
   }
 
@@ -400,8 +397,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE,
-          oldNotUnsettableDouble, notUnsettableDouble));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, notUnsettableDouble));
     }
   }
 
@@ -424,8 +420,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT,
-          oldNotUnsettableFloat, notUnsettableFloat));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat));
     }
   }
 
@@ -448,8 +443,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_INT,
-          oldNotUnsettableInt, notUnsettableInt));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt));
     }
   }
 
@@ -472,8 +466,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG,
-          oldNotUnsettableLong, notUnsettableLong));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong));
     }
   }
 
@@ -496,8 +489,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT,
-          oldNotUnsettableShort, notUnsettableShort));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort));
     }
   }
 
@@ -520,8 +512,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING,
-          oldNotUnsettableString, notUnsettableString));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING, oldNotUnsettableString, notUnsettableString));
     }
   }
 
@@ -544,8 +535,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT,
-          oldNotUnsettableVAT, notUnsettableVAT));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT));
     }
   }
 
@@ -692,8 +682,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR:
       return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE:
-      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null
-          : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
+      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE:
       return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT:
@@ -705,8 +694,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT:
       return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING:
-      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null
-          : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
+      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT:
       return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT;
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
index f6b4425929..9428080154 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
@@ -117,8 +117,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
    * @generated
    * @ordered
    */
-  protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE
-      .createFromString(EcorePackage.eINSTANCE.getEDate(), "1979-03-15T07:12:59");
+  protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString(EcorePackage.eINSTANCE.getEDate(),
+      "1979-03-15T07:12:59");
 
   /**
    * The cached value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!--
@@ -308,8 +308,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean,
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean,
           notUnsettableBoolean));
     }
   }
@@ -333,8 +332,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte,
+          notUnsettableByte));
     }
   }
 
@@ -357,8 +356,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar,
+          notUnsettableChar));
     }
   }
 
@@ -381,8 +380,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, oldNotUnsettableDate,
+          notUnsettableDate));
     }
   }
 
@@ -405,8 +404,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble,
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble,
           notUnsettableDouble));
     }
   }
@@ -430,8 +428,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat,
+          notUnsettableFloat));
     }
   }
 
@@ -454,8 +452,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt));
     }
   }
 
@@ -478,8 +476,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, oldNotUnsettableLong,
+          notUnsettableLong));
     }
   }
 
@@ -502,8 +500,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort,
+          notUnsettableShort));
     }
   }
 
@@ -526,8 +524,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString,
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString,
           notUnsettableString));
     }
   }
@@ -551,8 +548,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT));
     }
   }
 
@@ -699,8 +696,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR:
       return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE:
-      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null
-          : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
+      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE:
       return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT:
@@ -712,8 +708,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT:
       return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING:
-      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null
-          : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
+      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT:
       return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT;
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
index 79029d55d2..fbfc625856 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
@@ -130,8 +130,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE,
-          oldAttrBefore, attrBefore));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE, oldAttrBefore, attrBefore));
     }
   }
 
@@ -143,8 +142,8 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   {
     if (children == null)
     {
-      children = new EObjectContainmentWithInverseEList<TransientContainer>(TransientContainer.class, this,
-          Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, Model2Package.TRANSIENT_CONTAINER__PARENT);
+      children = new EObjectContainmentWithInverseEList<TransientContainer>(TransientContainer.class, this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
+          Model2Package.TRANSIENT_CONTAINER__PARENT);
     }
     return children;
   }
@@ -168,8 +167,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER,
-          oldAttrAfter, attrAfter));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER, oldAttrAfter, attrAfter));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
index fd73243cb0..5f6800da3c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
@@ -104,8 +104,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     discountCode = newDiscountCode;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE,
-          oldDiscountCode, discountCode));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, oldDiscountCode, discountCode));
     }
   }
 
@@ -128,8 +127,8 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     shippingAddress = newShippingAddress;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress,
+          newShippingAddress);
       if (msgs == null)
       {
         msgs = notification;
@@ -153,13 +152,13 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
       NotificationChain msgs = null;
       if (shippingAddress != null)
       {
-        msgs = ((InternalEObject)shippingAddress).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+        msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null,
+            msgs);
       }
       if (newShippingAddress != null)
       {
-        msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+        msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null,
+            msgs);
       }
       msgs = basicSetShippingAddress(newShippingAddress, msgs);
       if (msgs != null)
@@ -169,8 +168,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS,
-          newShippingAddress, newShippingAddress));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, newShippingAddress, newShippingAddress));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
index e183b3ebae..a960f485d3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
@@ -108,8 +108,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     key = newKey;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY,
-          oldKey, key));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, oldKey, key));
     }
   }
 
@@ -132,8 +131,8 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     value = newValue;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, oldValue, newValue);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, oldValue,
+          newValue);
       if (msgs == null)
       {
         msgs = notification;
@@ -157,13 +156,11 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
       NotificationChain msgs = null;
       if (value != null)
       {
-        msgs = ((InternalEObject)value).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
       }
       if (newValue != null)
       {
-        msgs = ((InternalEObject)newValue).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
       }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
@@ -173,8 +170,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE,
-          newValue, newValue));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, newValue, newValue));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
index 3c668bb228..b2b6065419 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
@@ -107,8 +107,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
     key = newKey;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, oldKey,
-          key));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, oldKey, key));
     }
   }
 
@@ -126,8 +125,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value));
         }
       }
     }
@@ -153,8 +151,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
     value = newValue;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE,
-          oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
index 9f84a8f5e4..bb71f29b02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
@@ -138,8 +138,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
     value = newValue;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskContainerImpl.java
index ddb456b05d..d107624d82 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskContainerImpl.java
@@ -74,8 +74,7 @@ public class TaskContainerImpl extends EObjectImpl implements TaskContainer
   {
     if (tasks == null)
     {
-      tasks = new EObjectContainmentWithInverseEList<Task>(Task.class, this, Model2Package.TASK_CONTAINER__TASKS,
-          Model2Package.TASK__TASK_CONTAINER);
+      tasks = new EObjectContainmentWithInverseEList<Task>(Task.class, this, Model2Package.TASK_CONTAINER__TASKS, Model2Package.TASK__TASK_CONTAINER);
     }
     return tasks;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
index 80b8fb5956..d3d8fbf583 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
@@ -123,8 +123,7 @@ public class TaskImpl extends EObjectImpl implements Task
    */
   public void setTaskContainer(TaskContainer newTaskContainer)
   {
-    if (newTaskContainer != eInternalContainer()
-        || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null)
+    if (newTaskContainer != eInternalContainer() || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null)
     {
       if (EcoreUtil.isAncestor(this, newTaskContainer))
       {
@@ -137,8 +136,7 @@ public class TaskImpl extends EObjectImpl implements Task
       }
       if (newTaskContainer != null)
       {
-        msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS,
-            TaskContainer.class, msgs);
+        msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS, TaskContainer.class, msgs);
       }
       msgs = basicSetTaskContainer(newTaskContainer, msgs);
       if (msgs != null)
@@ -148,8 +146,7 @@ public class TaskImpl extends EObjectImpl implements Task
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer,
-          newTaskContainer));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer, newTaskContainer));
     }
   }
 
@@ -172,8 +169,7 @@ public class TaskImpl extends EObjectImpl implements Task
     description = newDescription;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, description));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, description));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
index ee8e68e1e5..ecc804e160 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
@@ -116,8 +116,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE,
-          oldAttrBefore, attrBefore));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE, oldAttrBefore, attrBefore));
     }
   }
 
@@ -150,8 +149,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
    */
   public void setParent(PersistentContainment newParent)
   {
-    if (newParent != eInternalContainer()
-        || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null)
+    if (newParent != eInternalContainer() || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -164,8 +162,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
-            PersistentContainment.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, PersistentContainment.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -175,8 +172,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent,
-          newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent, newParent));
     }
   }
 
@@ -199,8 +195,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, oldAttrAfter,
-          attrAfter));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, oldAttrAfter, attrAfter));
     }
   }
 
@@ -248,8 +243,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     switch (eContainerFeatureID())
     {
     case Model2Package.TRANSIENT_CONTAINER__PARENT:
-      return eInternalContainer().eInverseRemove(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
-          PersistentContainment.class, msgs);
+      return eInternalContainer().eInverseRemove(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, PersistentContainment.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
index bbec436def..689fd6a604 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
@@ -392,8 +392,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableBooleanESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
-          oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean,
+          !oldUnsettableBooleanESet));
     }
   }
 
@@ -409,8 +409,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableBooleanESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
-          oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT,
+          oldUnsettableBooleanESet));
     }
   }
 
@@ -444,8 +444,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableByteESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
-          oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
     }
   }
 
@@ -461,8 +461,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableByteESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
-          oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT,
+          oldUnsettableByteESet));
     }
   }
 
@@ -496,8 +496,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableCharESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
-          oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
     }
   }
 
@@ -513,8 +513,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableCharESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
-          oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT,
+          oldUnsettableCharESet));
     }
   }
 
@@ -548,8 +548,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDateESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
-          oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
     }
   }
 
@@ -565,8 +565,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDateESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
-          oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT,
+          oldUnsettableDateESet));
     }
   }
 
@@ -600,8 +600,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDoubleESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
-          oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble,
+          !oldUnsettableDoubleESet));
     }
   }
 
@@ -617,8 +617,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDoubleESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
-          oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT,
+          oldUnsettableDoubleESet));
     }
   }
 
@@ -652,8 +652,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableFloatESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
-          oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat,
+          !oldUnsettableFloatESet));
     }
   }
 
@@ -669,8 +669,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableFloatESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
-          oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT,
+          oldUnsettableFloatESet));
     }
   }
 
@@ -704,8 +704,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableIntESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt,
-          unsettableInt, !oldUnsettableIntESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
     }
   }
 
@@ -721,8 +720,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableIntESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
-          oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT,
+          oldUnsettableIntESet));
     }
   }
 
@@ -756,8 +755,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableLongESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
-          oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
     }
   }
 
@@ -773,8 +772,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableLongESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
-          oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT,
+          oldUnsettableLongESet));
     }
   }
 
@@ -808,8 +807,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableShortESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
-          oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort,
+          !oldUnsettableShortESet));
     }
   }
 
@@ -825,8 +824,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableShortESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
-          oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT,
+          oldUnsettableShortESet));
     }
   }
 
@@ -860,8 +859,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableStringESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
-          oldUnsettableString, unsettableString, !oldUnsettableStringESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, unsettableString,
+          !oldUnsettableStringESet));
     }
   }
 
@@ -877,8 +876,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableStringESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
-          oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT,
+          oldUnsettableStringESet));
     }
   }
 
@@ -912,8 +911,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableVATESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT,
-          unsettableVAT, !oldUnsettableVATESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
     }
   }
 
@@ -929,8 +927,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableVATESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
-          oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT,
+          oldUnsettableVATESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
index 9f0bea1052..271782885c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
@@ -139,8 +139,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
    * @generated
    * @ordered
    */
-  protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE
-      .createFromString(EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59");
+  protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString(EcorePackage.eINSTANCE.getEDate(),
+      "2009-12-21T15:12:59");
 
   /**
    * The cached value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute.
@@ -396,8 +396,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableBooleanESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
-          oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean,
+          !oldUnsettableBooleanESet));
     }
   }
 
@@ -413,9 +413,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableBooleanESet = false;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
-              oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean,
+          UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
     }
   }
 
@@ -449,8 +448,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableByteESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
-          oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte,
+          !oldUnsettableByteESet));
     }
   }
 
@@ -466,8 +465,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableByteESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
-          oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte,
+          UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
     }
   }
 
@@ -501,8 +500,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableCharESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
-          oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar,
+          !oldUnsettableCharESet));
     }
   }
 
@@ -518,8 +517,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableCharESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
-          oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar,
+          UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
     }
   }
 
@@ -553,8 +552,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDateESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
-          oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate,
+          !oldUnsettableDateESet));
     }
   }
 
@@ -570,8 +569,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDateESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
-          oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate,
+          UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
     }
   }
 
@@ -605,8 +604,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDoubleESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
-          oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble,
+          !oldUnsettableDoubleESet));
     }
   }
 
@@ -622,8 +621,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDoubleESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
-          oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble,
+          UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
     }
   }
 
@@ -657,8 +656,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableFloatESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
-          oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat,
+          !oldUnsettableFloatESet));
     }
   }
 
@@ -674,8 +673,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableFloatESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
-          oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat,
+          UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
     }
   }
 
@@ -709,8 +708,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableIntESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
-          oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, unsettableInt,
+          !oldUnsettableIntESet));
     }
   }
 
@@ -726,8 +725,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableIntESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
-          oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT,
+          oldUnsettableIntESet));
     }
   }
 
@@ -761,8 +760,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableLongESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
-          oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong,
+          !oldUnsettableLongESet));
     }
   }
 
@@ -778,8 +777,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableLongESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
-          oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong,
+          UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
     }
   }
 
@@ -813,8 +812,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableShortESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
-          oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort,
+          !oldUnsettableShortESet));
     }
   }
 
@@ -830,8 +829,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableShortESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
-          oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort,
+          UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
     }
   }
 
@@ -865,8 +864,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableStringESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
-          oldUnsettableString, unsettableString, !oldUnsettableStringESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, unsettableString,
+          !oldUnsettableStringESet));
     }
   }
 
@@ -882,8 +881,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableStringESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
-          oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString,
+          UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
     }
   }
 
@@ -917,8 +916,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableVATESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
-          oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, unsettableVAT,
+          !oldUnsettableVATESet));
     }
   }
 
@@ -934,8 +933,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableVATESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
-          oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT,
+          oldUnsettableVATESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
index be1453c2ba..80cf7f9585 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
@@ -215,8 +215,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     }
 
     // Obtain or create and register package
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
 
     isInited = true;
 
@@ -226,8 +226,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Obtain or create and register interdependencies
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl
-            ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
+        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI)
+            : SubpackagePackage.eINSTANCE);
 
     // Create package meta-data objects
     theModel3Package.createPackageContents();
@@ -920,8 +920,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI);
+    SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
     EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
     EtypesPackage theEtypesPackage = (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI);
 
@@ -937,153 +936,123 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(class1EClass, Class1.class, "Class1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(),
-        "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(), "class2", null, 0, -1, Class1.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(metaRefEClass, MetaRef.class, "MetaRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1,
-        MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMetaRef_EClassRef(), theEcorePackage.getEClass(), null, "eClassRef", null, 0, 1, MetaRef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMetaRef_EReferenceRef(), theEcorePackage.getEReference(), null, "eReferenceRef", null, 0, 1,
-        MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EClassRef(), theEcorePackage.getEClass(), null, "eClassRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EReferenceRef(), theEcorePackage.getEReference(), null, "eReferenceRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
-        NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeEEClass, NodeE.class, "NodeE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getImage_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getImage_Data(), theEtypesPackage.getBlob(), "data", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Data(), theEtypesPackage.getBlob(), "data", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFile_Name(), theEcorePackage.getEString(), "name", null, 0, 1, File.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1,
-        ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getFile_Name(), theEcorePackage.getEString(), "name", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1, ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
     EGenericType g1 = createEGenericType(theEcorePackage.getEJavaClass());
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
-    initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1,
-        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null,
-        0, 1, ClassWithJavaObjectAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1, ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEdgeTarget_OutgoingEdges(), getEdge(), getEdge_SourceNode(), "outgoingEdges", null, 0, -1,
-        EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEdgeTarget_IncomingEdges(), getEdge(), getEdge_TargetNode(), "incomingEdges", null, 0, -1,
-        EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null, 0, 1, ClassWithJavaObjectAttribute.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEdgeTarget_OutgoingEdges(), getEdge(), getEdge_SourceNode(), "outgoingEdges", null, 0, -1, EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdgeTarget_IncomingEdges(), getEdge(), getEdge_TargetNode(), "incomingEdges", null, 0, -1, EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeFEClass, NodeF.class, "NodeF", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(edgeEClass, Edge.class, "Edge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEdge_SourceNode(), getEdgeTarget(), getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1,
-        Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEdge_TargetNode(), getEdgeTarget(), getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1,
-        Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdge_SourceNode(), getEdgeTarget(), getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdge_TargetNode(), getEdgeTarget(), getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDiagram_Edges(), getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getDiagram_EdgeTargets(), getEdgeTarget(), null, "edgeTargets", null, 0, -1, Diagram.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getDiagram_Edges(), getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDiagram_EdgeTargets(), getEdgeTarget(), null, "edgeTargets", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
index dcee6ed93a..4def6a92c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
@@ -75,8 +75,8 @@ public class Class1Impl extends EObjectImpl implements Class1
   {
     if (class2 == null)
     {
-      class2 = new EObjectWithInverseResolvingEList.Unsettable.ManyInverse<Class2>(Class2.class, this,
-          Model3Package.CLASS1__CLASS2, SubpackagePackage.CLASS2__CLASS1);
+      class2 = new EObjectWithInverseResolvingEList.Unsettable.ManyInverse<Class2>(Class2.class, this, Model3Package.CLASS1__CLASS2,
+          SubpackagePackage.CLASS2__CLASS1);
     }
     return class2;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
index f517b6c815..9d1ebc0cfc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
@@ -85,8 +85,7 @@ public class ClassWithJavaClassAttributeImpl extends EObjectImpl implements Clas
     javaClass = newJavaClass;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS,
-          oldJavaClass, javaClass));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS, oldJavaClass, javaClass));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
index 46ba477eaf..4af744a991 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
@@ -95,8 +95,7 @@ public class ClassWithJavaObjectAttributeImpl extends EObjectImpl implements Cla
     javaObject = newJavaObject;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT,
-          oldJavaObject, javaObject));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT, oldJavaObject, javaObject));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/DiagramImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/DiagramImpl.java
index 7628199b6e..59cce9953d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/DiagramImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/DiagramImpl.java
@@ -105,8 +105,7 @@ public class DiagramImpl extends EObjectImpl implements Diagram
   {
     if (edgeTargets == null)
     {
-      edgeTargets = new EObjectContainmentEList<EdgeTarget>(EdgeTarget.class, this,
-          Model3Package.DIAGRAM__EDGE_TARGETS);
+      edgeTargets = new EObjectContainmentEList<EdgeTarget>(EdgeTarget.class, this, Model3Package.DIAGRAM__EDGE_TARGETS);
     }
     return edgeTargets;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeImpl.java
index 0102319cca..689e4118e2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeImpl.java
@@ -93,8 +93,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.EDGE__SOURCE_NODE, oldSourceNode,
-              sourceNode));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.EDGE__SOURCE_NODE, oldSourceNode, sourceNode));
         }
       }
     }
@@ -122,8 +121,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
     sourceNode = newSourceNode;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__SOURCE_NODE,
-          oldSourceNode, newSourceNode);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__SOURCE_NODE, oldSourceNode, newSourceNode);
       if (msgs == null)
       {
         msgs = notification;
@@ -148,13 +146,11 @@ public class EdgeImpl extends EObjectImpl implements Edge
       NotificationChain msgs = null;
       if (sourceNode != null)
       {
-        msgs = ((InternalEObject)sourceNode).eInverseRemove(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)sourceNode).eInverseRemove(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES, EdgeTarget.class, msgs);
       }
       if (newSourceNode != null)
       {
-        msgs = ((InternalEObject)newSourceNode).eInverseAdd(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)newSourceNode).eInverseAdd(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES, EdgeTarget.class, msgs);
       }
       msgs = basicSetSourceNode(newSourceNode, msgs);
       if (msgs != null)
@@ -164,8 +160,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
     }
     else if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__SOURCE_NODE, newSourceNode, newSourceNode));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__SOURCE_NODE, newSourceNode, newSourceNode));
     }
   }
 
@@ -184,8 +179,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.EDGE__TARGET_NODE, oldTargetNode,
-              targetNode));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.EDGE__TARGET_NODE, oldTargetNode, targetNode));
         }
       }
     }
@@ -213,8 +207,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
     targetNode = newTargetNode;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__TARGET_NODE,
-          oldTargetNode, newTargetNode);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__TARGET_NODE, oldTargetNode, newTargetNode);
       if (msgs == null)
       {
         msgs = notification;
@@ -239,13 +232,11 @@ public class EdgeImpl extends EObjectImpl implements Edge
       NotificationChain msgs = null;
       if (targetNode != null)
       {
-        msgs = ((InternalEObject)targetNode).eInverseRemove(this, Model3Package.EDGE_TARGET__INCOMING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)targetNode).eInverseRemove(this, Model3Package.EDGE_TARGET__INCOMING_EDGES, EdgeTarget.class, msgs);
       }
       if (newTargetNode != null)
       {
-        msgs = ((InternalEObject)newTargetNode).eInverseAdd(this, Model3Package.EDGE_TARGET__INCOMING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)newTargetNode).eInverseAdd(this, Model3Package.EDGE_TARGET__INCOMING_EDGES, EdgeTarget.class, msgs);
       }
       msgs = basicSetTargetNode(newTargetNode, msgs);
       if (msgs != null)
@@ -255,8 +246,7 @@ public class EdgeImpl extends EObjectImpl implements Edge
     }
     else if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__TARGET_NODE, newTargetNode, newTargetNode));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.EDGE__TARGET_NODE, newTargetNode, newTargetNode));
     }
   }
 
@@ -273,15 +263,13 @@ public class EdgeImpl extends EObjectImpl implements Edge
     case Model3Package.EDGE__SOURCE_NODE:
       if (sourceNode != null)
       {
-        msgs = ((InternalEObject)sourceNode).eInverseRemove(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)sourceNode).eInverseRemove(this, Model3Package.EDGE_TARGET__OUTGOING_EDGES, EdgeTarget.class, msgs);
       }
       return basicSetSourceNode((EdgeTarget)otherEnd, msgs);
     case Model3Package.EDGE__TARGET_NODE:
       if (targetNode != null)
       {
-        msgs = ((InternalEObject)targetNode).eInverseRemove(this, Model3Package.EDGE_TARGET__INCOMING_EDGES,
-            EdgeTarget.class, msgs);
+        msgs = ((InternalEObject)targetNode).eInverseRemove(this, Model3Package.EDGE_TARGET__INCOMING_EDGES, EdgeTarget.class, msgs);
       }
       return basicSetTargetNode((EdgeTarget)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeTargetImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeTargetImpl.java
index 52e98c8d57..08598d1e61 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeTargetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/EdgeTargetImpl.java
@@ -90,8 +90,7 @@ public class EdgeTargetImpl extends EObjectImpl implements EdgeTarget
   {
     if (outgoingEdges == null)
     {
-      outgoingEdges = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this,
-          Model3Package.EDGE_TARGET__OUTGOING_EDGES, Model3Package.EDGE__SOURCE_NODE);
+      outgoingEdges = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, Model3Package.EDGE_TARGET__OUTGOING_EDGES, Model3Package.EDGE__SOURCE_NODE);
     }
     return outgoingEdges;
   }
@@ -105,8 +104,7 @@ public class EdgeTargetImpl extends EObjectImpl implements EdgeTarget
   {
     if (incomingEdges == null)
     {
-      incomingEdges = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this,
-          Model3Package.EDGE_TARGET__INCOMING_EDGES, Model3Package.EDGE__TARGET_NODE);
+      incomingEdges = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, Model3Package.EDGE_TARGET__INCOMING_EDGES, Model3Package.EDGE__TARGET_NODE);
     }
     return incomingEdges;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
index 5d6eca3633..a1c9b9f3a5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
@@ -99,8 +99,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EPACKAGE_REF,
-              oldEPackageRef, ePackageRef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef, ePackageRef));
         }
       }
     }
@@ -126,8 +125,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     ePackageRef = newEPackageRef;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef,
-          ePackageRef));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef, ePackageRef));
     }
   }
 
@@ -145,8 +143,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__ECLASS_REF, oldEClassRef,
-              eClassRef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__ECLASS_REF, oldEClassRef, eClassRef));
         }
       }
     }
@@ -172,8 +169,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     eClassRef = newEClassRef;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__ECLASS_REF, oldEClassRef, eClassRef));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__ECLASS_REF, oldEClassRef, eClassRef));
     }
   }
 
@@ -191,8 +187,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EREFERENCE_REF,
-              oldEReferenceRef, eReferenceRef));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EREFERENCE_REF, oldEReferenceRef, eReferenceRef));
         }
       }
     }
@@ -218,8 +213,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     eReferenceRef = newEReferenceRef;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EREFERENCE_REF, oldEReferenceRef,
-          eReferenceRef));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EREFERENCE_REF, oldEReferenceRef, eReferenceRef));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3FactoryImpl.java
index 32bdb732cf..92df5dbfb3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3FactoryImpl.java
@@ -55,8 +55,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
   {
     try
     {
-      Model3Factory theModel3Factory = (Model3Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0");
+      Model3Factory theModel3Factory = (Model3Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0");
       if (theModel3Factory != null)
       {
         return theModel3Factory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
index eaa9502c62..7d5b6ee398 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
@@ -215,8 +215,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     }
 
     // Obtain or create and register package
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
 
     isInited = true;
 
@@ -226,8 +226,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Obtain or create and register interdependencies
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl
-            ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
+        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI)
+            : SubpackagePackage.eINSTANCE);
 
     // Create package meta-data objects
     theModel3Package.createPackageContents();
@@ -920,8 +920,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI);
+    SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
     EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
     EtypesPackage theEtypesPackage = (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI);
 
@@ -937,153 +936,123 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(class1EClass, Class1.class, "Class1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(),
-        "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(), "class2", null, 0, -1, Class1.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(metaRefEClass, MetaRef.class, "MetaRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1,
-        MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMetaRef_EClassRef(), theEcorePackage.getEClass(), null, "eClassRef", null, 0, 1, MetaRef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMetaRef_EReferenceRef(), theEcorePackage.getEReference(), null, "eReferenceRef", null, 0, 1,
-        MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EClassRef(), theEcorePackage.getEClass(), null, "eClassRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetaRef_EReferenceRef(), theEcorePackage.getEReference(), null, "eReferenceRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
-        NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeEEClass, NodeE.class, "NodeE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getImage_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getImage_Data(), theEtypesPackage.getBlob(), "data", null, 0, 1, Image.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImage_Data(), theEtypesPackage.getBlob(), "data", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFile_Name(), theEcorePackage.getEString(), "name", null, 0, 1, File.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1,
-        ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getFile_Name(), theEcorePackage.getEString(), "name", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1, ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
     EGenericType g1 = createEGenericType(theEcorePackage.getEJavaClass());
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
-    initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1,
-        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null,
-        0, 1, ClassWithJavaObjectAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1, ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEdgeTarget_OutgoingEdges(), getEdge(), getEdge_SourceNode(), "outgoingEdges", null, 0, -1,
-        EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEdgeTarget_IncomingEdges(), getEdge(), getEdge_TargetNode(), "incomingEdges", null, 0, -1,
-        EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null, 0, 1, ClassWithJavaObjectAttribute.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEdgeTarget_OutgoingEdges(), getEdge(), getEdge_SourceNode(), "outgoingEdges", null, 0, -1, EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdgeTarget_IncomingEdges(), getEdge(), getEdge_TargetNode(), "incomingEdges", null, 0, -1, EdgeTarget.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeFEClass, NodeF.class, "NodeF", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(edgeEClass, Edge.class, "Edge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEdge_SourceNode(), getEdgeTarget(), getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1,
-        Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEdge_TargetNode(), getEdgeTarget(), getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1,
-        Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdge_SourceNode(), getEdgeTarget(), getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEdge_TargetNode(), getEdgeTarget(), getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDiagram_Edges(), getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getDiagram_EdgeTargets(), getEdgeTarget(), null, "edgeTargets", null, 0, -1, Diagram.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getDiagram_Edges(), getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDiagram_EdgeTargets(), getEdgeTarget(), null, "edgeTargets", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
index e56636aa0d..93cbe576fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
@@ -97,8 +97,7 @@ public class NodeBImpl extends EObjectImpl implements NodeB
   {
     if (children == null)
     {
-      children = new EObjectContainmentWithInverseEList<NodeB>(NodeB.class, this, Model3Package.NODE_B__CHILDREN,
-          Model3Package.NODE_B__PARENT);
+      children = new EObjectContainmentWithInverseEList<NodeB>(NodeB.class, this, Model3Package.NODE_B__CHILDREN, Model3Package.NODE_B__PARENT);
     }
     return children;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
index 7d966b813f..a03fd0c44f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
@@ -120,8 +120,7 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   {
     if (children == null)
     {
-      children = new EObjectContainmentWithInverseEList<NodeC>(NodeC.class, this, Model3Package.NODE_C__CHILDREN,
-          Model3Package.NODE_C__PARENT);
+      children = new EObjectContainmentWithInverseEList<NodeC>(NodeC.class, this, Model3Package.NODE_C__CHILDREN, Model3Package.NODE_C__PARENT);
     }
     return children;
   }
@@ -213,8 +212,8 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   {
     if (otherNodes == null)
     {
-      otherNodes = new EObjectWithInverseResolvingEList.ManyInverse<NodeC>(NodeC.class, this,
-          Model3Package.NODE_C__OTHER_NODES, Model3Package.NODE_C__OPPOSITE_NODES);
+      otherNodes = new EObjectWithInverseResolvingEList.ManyInverse<NodeC>(NodeC.class, this, Model3Package.NODE_C__OTHER_NODES,
+          Model3Package.NODE_C__OPPOSITE_NODES);
     }
     return otherNodes;
   }
@@ -227,8 +226,8 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   {
     if (oppositeNodes == null)
     {
-      oppositeNodes = new EObjectWithInverseResolvingEList.ManyInverse<NodeC>(NodeC.class, this,
-          Model3Package.NODE_C__OPPOSITE_NODES, Model3Package.NODE_C__OTHER_NODES);
+      oppositeNodes = new EObjectWithInverseResolvingEList.ManyInverse<NodeC>(NodeC.class, this, Model3Package.NODE_C__OPPOSITE_NODES,
+          Model3Package.NODE_C__OTHER_NODES);
     }
     return oppositeNodes;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
index b81afcbe00..88324c2639 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
@@ -120,8 +120,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
   {
     if (children == null)
     {
-      children = new EObjectContainmentWithInverseEList<NodeD>(NodeD.class, this, Model3Package.NODE_D__CHILDREN,
-          Model3Package.NODE_D__PARENT);
+      children = new EObjectContainmentWithInverseEList<NodeD>(NodeD.class, this, Model3Package.NODE_D__CHILDREN, Model3Package.NODE_D__PARENT);
     }
     return children;
   }
@@ -213,8 +212,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
   {
     if (otherNodes == null)
     {
-      otherNodes = new EObjectWithInverseResolvingEList<NodeD>(NodeD.class, this, Model3Package.NODE_D__OTHER_NODES,
-          Model3Package.NODE_D__OPPOSITE_NODE);
+      otherNodes = new EObjectWithInverseResolvingEList<NodeD>(NodeD.class, this, Model3Package.NODE_D__OTHER_NODES, Model3Package.NODE_D__OPPOSITE_NODE);
     }
     return otherNodes;
   }
@@ -233,8 +231,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_D__OPPOSITE_NODE,
-              oldOppositeNode, oppositeNode));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_D__OPPOSITE_NODE, oldOppositeNode, oppositeNode));
         }
       }
     }
@@ -260,8 +257,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
     oppositeNode = newOppositeNode;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model3Package.NODE_D__OPPOSITE_NODE, oldOppositeNode, newOppositeNode);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__OPPOSITE_NODE, oldOppositeNode, newOppositeNode);
       if (msgs == null)
       {
         msgs = notification;
@@ -285,13 +281,11 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       NotificationChain msgs = null;
       if (oppositeNode != null)
       {
-        msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
-            msgs);
+        msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class, msgs);
       }
       if (newOppositeNode != null)
       {
-        msgs = ((InternalEObject)newOppositeNode).eInverseAdd(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
-            msgs);
+        msgs = ((InternalEObject)newOppositeNode).eInverseAdd(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class, msgs);
       }
       msgs = basicSetOppositeNode(newOppositeNode, msgs);
       if (msgs != null)
@@ -301,8 +295,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__OPPOSITE_NODE, newOppositeNode,
-          newOppositeNode));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__OPPOSITE_NODE, newOppositeNode, newOppositeNode));
     }
   }
 
@@ -329,8 +322,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
     case Model3Package.NODE_D__OPPOSITE_NODE:
       if (oppositeNode != null)
       {
-        msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
-            msgs);
+        msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class, msgs);
       }
       return basicSetOppositeNode((NodeD)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
index e77afa8017..167f203a59 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
@@ -117,8 +117,7 @@ public class NodeEImpl extends EObjectImpl implements NodeE
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_E__MAIN_NODE, oldMainNode,
-              mainNode));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_E__MAIN_NODE, oldMainNode, mainNode));
         }
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
index e9b18c3436..b9e94cb930 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
@@ -36,8 +36,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
   {
     try
     {
-      SubpackageFactory theSubpackageFactory = (SubpackageFactory)EPackage.Registry.INSTANCE
-          .getEFactory(SubpackagePackage.eNS_URI);
+      SubpackageFactory theSubpackageFactory = (SubpackageFactory)EPackage.Registry.INSTANCE.getEFactory(SubpackagePackage.eNS_URI);
       if (theSubpackageFactory != null)
       {
         return theSubpackageFactory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
index 4a4c979ea7..0a7c2a5103 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
@@ -79,9 +79,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
     }
 
     // Obtain or create and register package
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new SubpackagePackageImpl());
+    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SubpackagePackageImpl());
 
     isInited = true;
 
@@ -90,9 +89,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
     EtypesPackage.eINSTANCE.eClass();
 
     // Obtain or create and register interdependencies
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
-            ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
+        ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
 
     // Create package meta-data objects
     theSubpackagePackage.createPackageContents();
@@ -198,9 +196,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
     // Initialize classes and features; add operations and parameters
     initEClass(class2EClass, Class2.class, "Class2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass2_Class1(), theModel3Package.getClass1(), theModel3Package.getClass1_Class2(), "class1",
-        null, 0, -1, Class2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getClass2_Class1(), theModel3Package.getClass1(), theModel3Package.getClass1_Class2(), "class1", null, 0, -1, Class2.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
   }
 
 } // SubpackagePackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/Class2Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/Class2Impl.java
index 024e3dab2b..d50f724977 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/Class2Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/Class2Impl.java
@@ -75,8 +75,7 @@ public class Class2Impl extends EObjectImpl implements Class2
   {
     if (class1 == null)
     {
-      class1 = new EObjectWithInverseResolvingEList.ManyInverse<Class1>(Class1.class, this,
-          SubpackagePackage.CLASS2__CLASS1, Model3Package.CLASS1__CLASS2);
+      class1 = new EObjectWithInverseResolvingEList.ManyInverse<Class1>(Class1.class, this, SubpackagePackage.CLASS2__CLASS1, Model3Package.CLASS1__CLASS2);
     }
     return class1;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
index c1981ba349..8b4445cd0f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
@@ -79,9 +79,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
     }
 
     // Obtain or create and register package
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new SubpackagePackageImpl());
+    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SubpackagePackageImpl());
 
     isInited = true;
 
@@ -90,9 +89,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
     EtypesPackage.eINSTANCE.eClass();
 
     // Obtain or create and register interdependencies
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
-            ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
+        ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
 
     // Create package meta-data objects
     theSubpackagePackage.createPackageContents();
@@ -198,9 +196,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
     // Initialize classes and features; add operations and parameters
     initEClass(class2EClass, Class2.class, "Class2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass2_Class1(), theModel3Package.getClass1(), theModel3Package.getClass1_Class2(), "class1",
-        null, 0, -1, Class2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getClass2_Class1(), theModel3Package.getClass1(), theModel3Package.getClass1_Class2(), "class1", null, 0, -1, Class2.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
   }
 
 } // SubpackagePackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
index dd6e9a92e1..b8b80596d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
@@ -70,8 +70,7 @@ public class ImplMultiRefContainerImpl extends CDOObjectImpl implements ImplMult
   @SuppressWarnings("unchecked")
   public EList<IMultiRefContainedElement> getElements()
   {
-    return (EList<IMultiRefContainedElement>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainer_Elements(),
-        true);
+    return (EList<IMultiRefContainedElement>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainer_Elements(), true);
   }
 
 } // ImplMultiRefContainerImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
index cd8726c8e4..74f42409cc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
@@ -70,8 +70,7 @@ public class ImplMultiRefContainerNPLImpl extends CDOObjectImpl implements ImplM
   @SuppressWarnings("unchecked")
   public EList<IContainedElementNoParentLink> getElements()
   {
-    return (EList<IContainedElementNoParentLink>)eGet(
-        model4interfacesPackage.eINSTANCE.getIMultiRefContainerNPL_Elements(), true);
+    return (EList<IContainedElementNoParentLink>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainerNPL_Elements(), true);
   }
 
 } // ImplMultiRefContainerNPLImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
index 2ac7a5023b..12a527ec58 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
@@ -69,8 +69,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement
    */
   public IMultiRefNonContainer getParent()
   {
-    return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(),
-        true);
+    return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
index a36edb464f..dd0224d455 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
@@ -70,8 +70,7 @@ public class ImplMultiRefNonContainerImpl extends CDOObjectImpl implements ImplM
   @SuppressWarnings("unchecked")
   public EList<IMultiRefNonContainedElement> getElements()
   {
-    return (EList<IMultiRefNonContainedElement>)eGet(
-        model4interfacesPackage.eINSTANCE.getIMultiRefNonContainer_Elements(), true);
+    return (EList<IMultiRefNonContainedElement>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainer_Elements(), true);
   }
 
 } // ImplMultiRefNonContainerImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
index 64c45de8ea..283812153f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
@@ -70,8 +70,7 @@ public class ImplMultiRefNonContainerNPLImpl extends CDOObjectImpl implements Im
   @SuppressWarnings("unchecked")
   public EList<IContainedElementNoParentLink> getElements()
   {
-    return (EList<IContainedElementNoParentLink>)eGet(
-        model4interfacesPackage.eINSTANCE.getIMultiRefNonContainerNPL_Elements(), true);
+    return (EList<IContainedElementNoParentLink>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainerNPL_Elements(), true);
   }
 
 } // ImplMultiRefNonContainerNPLImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
index b79ddab64f..aa8b6a5065 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
@@ -68,8 +68,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl
    */
   public IContainedElementNoParentLink getElement()
   {
-    return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(),
-        true);
+    return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
index c664a544cf..40b069b038 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
@@ -69,8 +69,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen
    */
   public ISingleRefNonContainer getParent()
   {
-    return (ISingleRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(),
-        true);
+    return (ISingleRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
index 11c983a342..c65b3b4f8b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
@@ -68,8 +68,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl
    */
   public ISingleRefNonContainedElement getElement()
   {
-    return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(),
-        true);
+    return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
index a8e5ffd3f6..87c6212342 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
@@ -68,8 +68,7 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I
    */
   public IContainedElementNoParentLink getElement()
   {
-    return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(),
-        true);
+    return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
index fd7405465e..5601487d29 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
@@ -86,8 +86,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem
    */
   public RefMultiNonContainedUnsettable getParent()
   {
-    return (RefMultiNonContainedUnsettable)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(),
-        true);
+    return (RefMultiNonContainedUnsettable)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
index 82b81b1c8f..466a48a13e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
@@ -69,8 +69,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements
   @SuppressWarnings("unchecked")
   public EList<MultiNonContainedUnsettableElement> getElements()
   {
-    return (EList<MultiNonContainedUnsettableElement>)eGet(
-        model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements(), true);
+    return (EList<MultiNonContainedUnsettableElement>)eGet(model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
index 1785719516..341fd63dbb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
@@ -316,8 +316,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     }
 
     // Obtain or create and register package
-    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
+    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
 
     isInited = true;
 
@@ -1100,8 +1100,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    model4interfacesPackage themodel4interfacesPackage = (model4interfacesPackage)EPackage.Registry.INSTANCE
-        .getEPackage(model4interfacesPackage.eNS_URI);
+    model4interfacesPackage themodel4interfacesPackage = (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
 
     // Create type parameters
 
@@ -1109,14 +1108,11 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
     // Add supertypes to classes
     implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer());
-    implSingleRefContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefContainedElement());
+    implSingleRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainedElement());
     implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer());
-    implSingleRefNonContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefNonContainedElement());
+    implSingleRefNonContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainedElement());
     implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer());
-    implMultiRefNonContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
+    implMultiRefNonContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
     implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer());
     implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement());
     implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL());
@@ -1127,210 +1123,170 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     implContainedElementNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getINamedElement());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(),
-        "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), "element", null, 0, 1,
+        RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(),
-        "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(),
-        getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), "parent", null, 0, 1,
+        SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(singleNonContainedElementEClass, SingleNonContainedElement.class, "SingleNonContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(),
-        getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), getSingleNonContainedElement_Parent(), "element", null, 0, 1,
+        RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(singleNonContainedElementEClass, SingleNonContainedElement.class, "SingleNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(),
-        "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), getRefSingleNonContained_Element(), "parent", null, 0, 1,
+        SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent",
-        null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
-        getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), "elements", null, 0, -1,
+        RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
-        "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class,
-        "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(),
-        getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class,
-        "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(),
-        getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent", null, 0, 1,
+        MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
-        RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), getMultiNonContainedElement_Parent(), "elements", null, 0, -1,
+        RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
-        RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), "parent", null, 0, 1,
+        MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1,
-        RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), getMultiNonContainedUnsettableElement_Parent(),
+        "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT,
+    initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0,
-        -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), getRefMultiNonContainedUnsettable_Elements(), "parent",
+        null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, RefSingleContainedNPL.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefSingleContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
-        GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, RefSingleNonContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
-        GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, RefMultiContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefMultiContainedEClass, GenRefMultiContained.class, "GenRefMultiContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, RefMultiNonContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefMultiNonContainedEClass, GenRefMultiNonContained.class, "GenRefMultiNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1, ContainedElementNoOpposite.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainerEClass, ImplSingleRefContainer.class, "ImplSingleRefContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefSingleContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainedElementEClass, ImplSingleRefContainedElement.class,
-        "ImplSingleRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplSingleRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplSingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleNonContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefNonContainerEClass, ImplSingleRefNonContainer.class, "ImplSingleRefNonContainer",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefMultiContainedEClass, GenRefMultiContained.class, "GenRefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefNonContainedElementEClass, ImplSingleRefNonContainedElement.class,
-        "ImplSingleRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplSingleRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genRefMultiNonContainedEClass, GenRefMultiNonContained.class, "GenRefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiNonContained.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefContainerEClass, ImplSingleRefContainer.class, "ImplSingleRefContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class,
-        "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplMultiRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplMultiRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefContainedElementEClass, ImplSingleRefContainedElement.class, "ImplSingleRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplSingleRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplSingleRefContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefContainerEClass, ImplMultiRefContainer.class, "ImplMultiRefContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefNonContainerEClass, ImplSingleRefNonContainer.class, "ImplSingleRefNonContainer", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefContainedElementEClass, ImplMultiRefContainedElement.class, "ImplMultiRefContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplMultiRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefNonContainedElementEClass, ImplSingleRefNonContainedElement.class, "ImplSingleRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplSingleRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplSingleRefNonContainedElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainerNPLEClass, ImplSingleRefContainerNPL.class, "ImplSingleRefContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class, "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplMultiRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplMultiRefNonContainedElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainerEClass, ImplMultiRefContainer.class, "ImplMultiRefContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainedElementEClass, ImplMultiRefContainedElement.class, "ImplMultiRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplMultiRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplMultiRefContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implContainedElementNPLEClass, ImplContainedElementNPL.class, "ImplContainedElementNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefContainerNPLEClass, ImplSingleRefContainerNPL.class, "ImplSingleRefContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1,
-        GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(stringToEObjectEClass, Map.Entry.class, "StringToEObject", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToEObject_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);
-    initEReference(getStringToEObject_Value(), ecorePackage.getEObject(), 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);
+    initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(implContainedElementNPLEClass, ImplContainedElementNPL.class, "ImplContainedElementNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiNUNonContained.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToEObjectEClass, Map.Entry.class, "StringToEObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToEObject_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);
+    initEReference(getStringToEObject_Value(), ecorePackage.getEObject(), 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);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
index ea47b2c79e..ab0791e0fd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
@@ -89,8 +89,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName,
-          name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName, name));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
index 890f76e99c..732ff50b08 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
@@ -74,8 +74,8 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
   {
     if (elements == null)
     {
-      elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(), StringToEObjectImpl.class,
-          this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS);
+      elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(), StringToEObjectImpl.class, this,
+          model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiContainedImpl.java
index 949e65c62b..d98647ee82 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiContainedImpl.java
@@ -75,8 +75,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti
   {
     if (elements == null)
     {
-      elements = new EObjectContainmentEList<EObject>(EObject.class, this,
-          model4Package.GEN_REF_MULTI_CONTAINED__ELEMENTS);
+      elements = new EObjectContainmentEList<EObject>(EObject.class, this, model4Package.GEN_REF_MULTI_CONTAINED__ELEMENTS);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiNonContainedImpl.java
index f7e49b5751..cf0fd91181 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMultiNonContainedImpl.java
@@ -72,8 +72,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu
   {
     if (elements == null)
     {
-      elements = new EObjectResolvingEList<EObject>(EObject.class, this,
-          model4Package.GEN_REF_MULTI_NON_CONTAINED__ELEMENTS);
+      elements = new EObjectResolvingEList<EObject>(EObject.class, this, model4Package.GEN_REF_MULTI_NON_CONTAINED__ELEMENTS);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
index bb5a787495..7836d94b65 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
@@ -83,8 +83,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -108,13 +107,11 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -124,8 +121,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement,
-          newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
index 15b3af955b..55819bff92 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
@@ -77,8 +77,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT,
-              oldElement, element));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element));
         }
       }
     }
@@ -104,8 +103,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
     element = newElement;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT,
-          oldElement, element));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
index 1a25e97137..998a2d6c7d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
@@ -91,8 +91,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
index 03e355a89f..6ac1d6fc94 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
@@ -105,8 +105,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
    */
   public void setParent(IMultiRefContainer newParent)
   {
-    if (newParent != eInternalContainer()
-        || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
+    if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -119,8 +118,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS,
-            IMultiRefContainer.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS, IMultiRefContainer.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -130,8 +128,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -154,8 +151,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME,
-          oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -203,8 +199,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
     switch (eContainerFeatureID())
     {
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT:
-      return eInternalContainer().eInverseRemove(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS,
-          IMultiRefContainer.class, msgs);
+      return eInternalContainer().eInverseRemove(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS, IMultiRefContainer.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainerImpl.java
index a67d4a3a66..a5eb8c97b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainerImpl.java
@@ -76,9 +76,8 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR
   {
     if (elements == null)
     {
-      elements = new EObjectContainmentWithInverseEList<IMultiRefContainedElement>(IMultiRefContainedElement.class,
-          this, model4Package.IMPL_MULTI_REF_CONTAINER__ELEMENTS,
-          model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT__PARENT);
+      elements = new EObjectContainmentWithInverseEList<IMultiRefContainedElement>(IMultiRefContainedElement.class, this,
+          model4Package.IMPL_MULTI_REF_CONTAINER__ELEMENTS, model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT__PARENT);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
index 98d0a3bb3d..c9507343f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
@@ -99,8 +99,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
         }
       }
     }
@@ -126,8 +125,8 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     parent = newParent;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent,
+          newParent);
       if (msgs == null)
       {
         msgs = notification;
@@ -151,13 +150,11 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
       NotificationChain msgs = null;
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this,
-            model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -167,8 +164,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -191,8 +187,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME,
-          oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -208,8 +203,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
       }
       return basicSetParent((IMultiRefNonContainer)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainerImpl.java
index b9960c2381..bdd8ef3e4a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainerImpl.java
@@ -76,9 +76,8 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul
   {
     if (elements == null)
     {
-      elements = new EObjectWithInverseResolvingEList<IMultiRefNonContainedElement>(IMultiRefNonContainedElement.class,
-          this, model4Package.IMPL_MULTI_REF_NON_CONTAINER__ELEMENTS,
-          model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT);
+      elements = new EObjectWithInverseResolvingEList<IMultiRefNonContainedElement>(IMultiRefNonContainedElement.class, this,
+          model4Package.IMPL_MULTI_REF_NON_CONTAINER__ELEMENTS, model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
index 4112654bf9..7d10852ba5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
@@ -95,8 +95,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
    */
   public NotificationChain basicSetParent(ISingleRefContainer newParent, NotificationChain msgs)
   {
-    msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT,
-        msgs);
+    msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, msgs);
     return msgs;
   }
 
@@ -106,8 +105,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
    */
   public void setParent(ISingleRefContainer newParent)
   {
-    if (newParent != eInternalContainer()
-        || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
+    if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -120,8 +118,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT,
-            ISingleRefContainer.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT, ISingleRefContainer.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -131,8 +128,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -155,8 +151,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME,
-          oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -204,8 +199,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
     switch (eContainerFeatureID())
     {
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT:
-      return eInternalContainer().eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT,
-          ISingleRefContainer.class, msgs);
+      return eInternalContainer().eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT, ISingleRefContainer.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
index 7311967bb3..5862882e73 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
@@ -84,8 +84,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -109,13 +108,13 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class,
+            msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this,
-            model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class,
+            msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -125,8 +124,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT,
-          newElement, newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, newElement, newElement));
     }
   }
 
@@ -142,8 +140,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
     case model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT:
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs);
       }
       return basicSetElement((ISingleRefContainedElement)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
index 7271133db6..9be0ef3160 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
@@ -83,8 +83,8 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement,
+          newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -108,13 +108,11 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -124,8 +122,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT,
-          newElement, newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, newElement, newElement));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
index 41eb971377..5d987e0b2f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
@@ -99,8 +99,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
         }
       }
     }
@@ -126,8 +125,8 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     parent = newParent;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent,
+          newParent);
       if (msgs == null)
       {
         msgs = notification;
@@ -151,13 +150,11 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
       NotificationChain msgs = null;
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -167,8 +164,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -191,8 +187,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME,
-          oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -208,8 +203,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
       }
       return basicSetParent((ISingleRefNonContainer)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
index 55d38a4154..708d7d738b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
@@ -79,8 +79,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element));
         }
       }
     }
@@ -106,8 +105,8 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement,
+          newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -131,15 +130,13 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
-            msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT,
+            ISingleRefNonContainedElement.class, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
-            msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT,
+            ISingleRefNonContainedElement.class, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -149,8 +146,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT,
-          newElement, newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, newElement, newElement));
     }
   }
 
@@ -166,9 +162,8 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT:
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
-            msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT,
+            ISingleRefNonContainedElement.class, msgs);
       }
       return basicSetElement((ISingleRefNonContainedElement)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
index 05b5209fad..62ec4926a3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
@@ -77,8 +77,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element));
         }
       }
     }
@@ -104,8 +103,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
     element = newElement;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT,
-          oldElement, element));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
index aaa15ff21b..24fdf37036 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
@@ -94,8 +94,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -128,8 +127,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
    */
   public void setParent(RefMultiContained newParent)
   {
-    if (newParent != eInternalContainer()
-        || eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)
+    if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -142,8 +140,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS,
-            RefMultiContained.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS, RefMultiContained.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -153,8 +150,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__PARENT, newParent,
-          newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -202,8 +198,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
     switch (eContainerFeatureID())
     {
     case model4Package.MULTI_CONTAINED_ELEMENT__PARENT:
-      return eInternalContainer().eInverseRemove(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS,
-          RefMultiContained.class, msgs);
+      return eInternalContainer().eInverseRemove(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS, RefMultiContained.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
index a004d06651..807c1749d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
@@ -103,8 +103,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName,
-          name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -122,8 +121,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT,
-              oldParent, parent));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
         }
       }
     }
@@ -149,8 +147,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     parent = newParent;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
       {
         msgs = notification;
@@ -174,13 +171,11 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
       NotificationChain msgs = null;
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
-            RefMultiNonContained.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs);
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
-            RefMultiNonContained.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -190,8 +185,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -207,8 +201,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
-            RefMultiNonContained.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs);
       }
       return basicSetParent((RefMultiNonContained)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
index a3facda301..1a395c0a42 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
@@ -111,8 +111,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME,
-          oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -130,8 +129,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent));
         }
       }
     }
@@ -159,8 +157,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     parentESet = true;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, newParent, !oldParentESet);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent,
+          newParent, !oldParentESet);
       if (msgs == null)
       {
         msgs = notification;
@@ -184,13 +182,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       NotificationChain msgs = null;
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class,
+            msgs);
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this,
-            model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class,
+            msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -204,8 +202,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       parentESet = true;
       if (eNotificationRequired())
       {
-        eNotify(new ENotificationImpl(this, Notification.SET,
-            model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet));
+        eNotify(
+            new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet));
       }
     }
   }
@@ -222,8 +220,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     parentESet = false;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
-          model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, null, oldParentESet);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent,
+          null, oldParentESet);
       if (msgs == null)
       {
         msgs = notification;
@@ -245,8 +243,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     if (parent != null)
     {
       NotificationChain msgs = null;
-      msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS,
-          RefMultiNonContainedUnsettable.class, msgs);
+      msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class,
+          msgs);
       msgs = basicUnsetParent(msgs);
       if (msgs != null)
       {
@@ -259,8 +257,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       parentESet = false;
       if (eNotificationRequired())
       {
-        eNotify(new ENotificationImpl(this, Notification.UNSET,
-            model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet));
+        eNotify(new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet));
       }
     }
   }
@@ -286,8 +283,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT:
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this,
-            model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class,
+            msgs);
       }
       return basicSetParent((RefMultiNonContainedUnsettable)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiContainedImpl.java
index 073f1bebfb..7010a37748 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiContainedImpl.java
@@ -75,8 +75,8 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai
   {
     if (elements == null)
     {
-      elements = new EObjectContainmentWithInverseEList<MultiContainedElement>(MultiContainedElement.class, this,
-          model4Package.REF_MULTI_CONTAINED__ELEMENTS, model4Package.MULTI_CONTAINED_ELEMENT__PARENT);
+      elements = new EObjectContainmentWithInverseEList<MultiContainedElement>(MultiContainedElement.class, this, model4Package.REF_MULTI_CONTAINED__ELEMENTS,
+          model4Package.MULTI_CONTAINED_ELEMENT__PARENT);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
index 3ef86084ad..8920cd8f9a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
@@ -75,9 +75,8 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
   {
     if (elements == null)
     {
-      elements = new EObjectWithInverseResolvingEList.Unsettable<MultiNonContainedUnsettableElement>(
-          MultiNonContainedUnsettableElement.class, this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS,
-          model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT);
+      elements = new EObjectWithInverseResolvingEList.Unsettable<MultiNonContainedUnsettableElement>(MultiNonContainedUnsettableElement.class, this,
+          model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT);
     }
     return elements;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
index 246e3b3ec7..b25823f33c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
@@ -83,8 +83,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -108,13 +107,11 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT,
-            SingleContainedElement.class, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT,
-            SingleContainedElement.class, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -124,8 +121,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement,
-          newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement));
     }
   }
 
@@ -141,8 +137,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
     case model4Package.REF_SINGLE_CONTAINED__ELEMENT:
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
       }
       return basicSetElement((SingleContainedElement)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
index 3b6f675f2b..4b925ee89f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
@@ -83,8 +83,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -108,13 +107,11 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -124,8 +121,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement,
-          newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement, newElement));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
index bec69a76f7..4178981b93 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
@@ -78,8 +78,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
-              oldElement, element));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element));
         }
       }
     }
@@ -105,8 +104,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     element = newElement;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
       {
         msgs = notification;
@@ -130,13 +128,11 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
       NotificationChain msgs = null;
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
-            SingleNonContainedElement.class, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs);
       }
       if (newElement != null)
       {
-        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
-            SingleNonContainedElement.class, msgs);
+        msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs);
       }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
@@ -146,8 +142,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement,
-          newElement));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement, newElement));
     }
   }
 
@@ -163,8 +158,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT:
       if (element != null)
       {
-        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
-            SingleNonContainedElement.class, msgs);
+        msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs);
       }
       return basicSetElement((SingleNonContainedElement)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
index e2a955e043..80bc2da80b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
@@ -77,8 +77,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT,
-              oldElement, element));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element));
         }
       }
     }
@@ -104,8 +103,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
     element = newElement;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT,
-          oldElement, element));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
index 15ffb89f11..95607bbed3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
@@ -94,8 +94,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -128,8 +127,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
    */
   public void setParent(RefSingleContained newParent)
   {
-    if (newParent != eInternalContainer()
-        || eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)
+    if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -142,8 +140,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT,
-            RefSingleContained.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT, RefSingleContained.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -153,8 +150,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, newParent,
-          newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -202,8 +198,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
     switch (eContainerFeatureID())
     {
     case model4Package.SINGLE_CONTAINED_ELEMENT__PARENT:
-      return eInternalContainer().eInverseRemove(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT,
-          RefSingleContained.class, msgs);
+      return eInternalContainer().eInverseRemove(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT, RefSingleContained.class, msgs);
     }
     return super.eBasicRemoveFromContainerFeature(msgs);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
index 46280a131b..da105b425e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
@@ -103,8 +103,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     name = newName;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName,
-          name));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName, name));
     }
   }
 
@@ -122,8 +121,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
-              oldParent, parent));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
         }
       }
     }
@@ -149,8 +147,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     parent = newParent;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
       {
         msgs = notification;
@@ -174,13 +171,11 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
       NotificationChain msgs = null;
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
-            RefSingleNonContained.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs);
       }
       if (newParent != null)
       {
-        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
-            RefSingleNonContained.class, msgs);
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs);
       }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
@@ -190,8 +185,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
-          newParent, newParent));
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent));
     }
   }
 
@@ -207,8 +201,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
       {
-        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
-            RefSingleNonContained.class, msgs);
+        msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs);
       }
       return basicSetParent((RefSingleNonContained)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4FactoryImpl.java
index a3df5b96f7..51a16c6d54 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4FactoryImpl.java
@@ -72,8 +72,7 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
   {
     try
     {
-      model4Factory themodel4Factory = (model4Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model4/1.0.0");
+      model4Factory themodel4Factory = (model4Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model4/1.0.0");
       if (themodel4Factory != null)
       {
         return themodel4Factory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
index 931ea53d8c..310bc0fa15 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
@@ -316,8 +316,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     }
 
     // Obtain or create and register package
-    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
+    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
 
     isInited = true;
 
@@ -1100,8 +1100,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    model4interfacesPackage themodel4interfacesPackage = (model4interfacesPackage)EPackage.Registry.INSTANCE
-        .getEPackage(model4interfacesPackage.eNS_URI);
+    model4interfacesPackage themodel4interfacesPackage = (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
 
     // Create type parameters
 
@@ -1109,14 +1108,11 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
     // Add supertypes to classes
     implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer());
-    implSingleRefContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefContainedElement());
+    implSingleRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainedElement());
     implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer());
-    implSingleRefNonContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefNonContainedElement());
+    implSingleRefNonContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainedElement());
     implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer());
-    implMultiRefNonContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
+    implMultiRefNonContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
     implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer());
     implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement());
     implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL());
@@ -1127,210 +1123,170 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     implContainedElementNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getINamedElement());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(),
-        "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), "element", null, 0, 1,
+        RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(),
-        "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(),
-        getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), "parent", null, 0, 1,
+        SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(singleNonContainedElementEClass, SingleNonContainedElement.class, "SingleNonContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(),
-        getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), getSingleNonContainedElement_Parent(), "element", null, 0, 1,
+        RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(singleNonContainedElementEClass, SingleNonContainedElement.class, "SingleNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(),
-        "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), getRefSingleNonContained_Element(), "parent", null, 0, 1,
+        SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent",
-        null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
-        getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), "elements", null, 0, -1,
+        RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
-        "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class,
-        "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(),
-        getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class,
-        "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(),
-        getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent", null, 0, 1,
+        MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
-        RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), getMultiNonContainedElement_Parent(), "elements", null, 0, -1,
+        RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
-        RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), "parent", null, 0, 1,
+        MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1,
-        RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), getMultiNonContainedUnsettableElement_Parent(),
+        "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT,
+    initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0,
-        -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), getRefMultiNonContainedUnsettable_Elements(), "parent",
+        null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, RefSingleContainedNPL.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefSingleContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
-        GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, RefSingleNonContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
-        GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, RefMultiContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefMultiContainedEClass, GenRefMultiContained.class, "GenRefMultiContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, RefMultiNonContainedNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefMultiNonContainedEClass, GenRefMultiNonContained.class, "GenRefMultiNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1, ContainedElementNoOpposite.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainerEClass, ImplSingleRefContainer.class, "ImplSingleRefContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefSingleContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainedElementEClass, ImplSingleRefContainedElement.class,
-        "ImplSingleRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplSingleRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplSingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleNonContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefNonContainerEClass, ImplSingleRefNonContainer.class, "ImplSingleRefNonContainer",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefMultiContainedEClass, GenRefMultiContained.class, "GenRefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefNonContainedElementEClass, ImplSingleRefNonContainedElement.class,
-        "ImplSingleRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplSingleRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genRefMultiNonContainedEClass, GenRefMultiNonContained.class, "GenRefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiNonContained.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefContainerEClass, ImplSingleRefContainer.class, "ImplSingleRefContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class,
-        "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplMultiRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplMultiRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefContainedElementEClass, ImplSingleRefContainedElement.class, "ImplSingleRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplSingleRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplSingleRefContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefContainerEClass, ImplMultiRefContainer.class, "ImplMultiRefContainer", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefNonContainerEClass, ImplSingleRefNonContainer.class, "ImplSingleRefNonContainer", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefContainedElementEClass, ImplMultiRefContainedElement.class, "ImplMultiRefContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImplMultiRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ImplMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefNonContainedElementEClass, ImplSingleRefNonContainedElement.class, "ImplSingleRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplSingleRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplSingleRefNonContainedElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implSingleRefContainerNPLEClass, ImplSingleRefContainerNPL.class, "ImplSingleRefContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class, "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplMultiRefNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplMultiRefNonContainedElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainerEClass, ImplMultiRefContainer.class, "ImplMultiRefContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainedElementEClass, ImplMultiRefContainedElement.class, "ImplMultiRefContainedElement", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getImplMultiRefContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, ImplMultiRefContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implContainedElementNPLEClass, ImplContainedElementNPL.class, "ImplContainedElementNPL", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implSingleRefContainerNPLEClass, ImplSingleRefContainerNPL.class, "ImplSingleRefContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1,
-        GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(stringToEObjectEClass, Map.Entry.class, "StringToEObject", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringToEObject_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);
-    initEReference(getStringToEObject_Value(), ecorePackage.getEObject(), 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);
+    initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(implContainedElementNPLEClass, ImplContainedElementNPL.class, "ImplContainedElementNPL", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, GenRefMultiNUNonContained.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToEObjectEClass, Map.Entry.class, "StringToEObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToEObject_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);
+    initEReference(getStringToEObject_Value(), ecorePackage.getEObject(), 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);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
index 1c062a5305..4ca19f4c73 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
@@ -660,8 +660,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class.
@@ -712,8 +711,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!--
@@ -722,8 +720,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class.
@@ -774,8 +771,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 0;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class.
@@ -784,8 +780,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class.
@@ -846,8 +841,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class.
@@ -900,8 +894,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT
-      + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class.
@@ -954,8 +947,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT
-      + 0;
+  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class.
@@ -981,8 +973,7 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT
-      + 1;
+  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
index da47252730..fa19bbcb31 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
@@ -659,8 +659,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class.
@@ -711,8 +710,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!--
@@ -721,8 +719,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class.
@@ -773,8 +770,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 0;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
 
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class.
@@ -783,8 +779,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class.
@@ -845,8 +840,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT
-      + 1;
+  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class.
@@ -899,8 +893,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT
-      + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class.
@@ -953,8 +946,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT
-      + 0;
+  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class.
@@ -980,8 +972,7 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT
-      + 1;
+  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
index 1f67047898..57b8b2e310 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
@@ -35,8 +35,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
   {
     try
     {
-      model4interfacesFactory themodel4interfacesFactory = (model4interfacesFactory)EPackage.Registry.INSTANCE
-          .getEFactory(model4interfacesPackage.eNS_URI);
+      model4interfacesFactory themodel4interfacesFactory = (model4interfacesFactory)EPackage.Registry.INSTANCE.getEFactory(model4interfacesPackage.eNS_URI);
       if (themodel4interfacesFactory != null)
       {
         return themodel4interfacesFactory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
index 116e2370f2..d777fde7be 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -168,8 +168,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new model4interfacesPackageImpl());
+        .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4interfacesPackageImpl());
 
     isInited = true;
 
@@ -534,91 +533,74 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
-        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), getISingleRefContainedElement_Parent(), "element", null, 0, 1,
+        ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
-        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
-        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), "parent", null, 0, 1,
+        ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
-        "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
-        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), getISingleRefNonContainedElement_Parent(), "element", null, 0, 1,
+        ISingleRefNonContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
+    initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
-        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), getISingleRefNonContainer_Element(), "parent", null, 0, 1,
+        ISingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), getIMultiRefContainedElement_Parent(), "elements", null, 0, -1,
+        IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
-        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
-        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), "parent", null, 0, 1,
+        IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
-        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1,
+        IMultiRefNonContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE,
+    initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), getIMultiRefNonContainer_Elements(), "parent", null, 0, 1,
+        IMultiRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getINamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, INamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iContainedElementNoParentLinkEClass, IContainedElementNoParentLink.class, "IContainedElementNoParentLink", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1, ISingleRefContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1, ISingleRefNonContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, -1, IMultiRefContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getINamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, INamedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iContainedElementNoParentLinkEClass, IContainedElementNoParentLink.class,
-        "IContainedElementNoParentLink", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1,
-        ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
-        1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
-        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
-        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, -1, IMultiRefNonContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
index dc28fffac4..d150e1f802 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
@@ -168,8 +168,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new model4interfacesPackageImpl());
+        .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4interfacesPackageImpl());
 
     isInited = true;
 
@@ -534,91 +533,74 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
-        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), getISingleRefContainedElement_Parent(), "element", null, 0, 1,
+        ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
-        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
-        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), "parent", null, 0, 1,
+        ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
-        "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
-        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), getISingleRefNonContainedElement_Parent(), "element", null, 0, 1,
+        ISingleRefNonContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
+    initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
-        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), getISingleRefNonContainer_Element(), "parent", null, 0, 1,
+        ISingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), getIMultiRefContainedElement_Parent(), "elements", null, 0, -1,
+        IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
-        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
-        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), "parent", null, 0, 1,
+        IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
-        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+    initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1,
+        IMultiRefNonContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE,
+    initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), getIMultiRefNonContainer_Elements(), "parent", null, 0, 1,
+        IMultiRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getINamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, INamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iContainedElementNoParentLinkEClass, IContainedElementNoParentLink.class, "IContainedElementNoParentLink", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1, ISingleRefContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1, ISingleRefNonContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, -1, IMultiRefContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getINamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, INamedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iContainedElementNoParentLinkEClass, IContainedElementNoParentLink.class,
-        "IContainedElementNoParentLink", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1,
-        ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
-        IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
-        1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
-        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
-        IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
-        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, -1, IMultiRefNonContainerNPL.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesFactory.java
index 2d11bb75ad..655dd5398e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesFactory.java
@@ -26,8 +26,7 @@ public interface model4interfacesFactory extends org.eclipse.emf.cdo.tests.model
    *
    * @generated
    */
-  model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl.model4interfacesFactoryImpl
-      .init();
+  model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl.model4interfacesFactoryImpl.init();
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
index 7aa4202248..2e1a2aa870 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
@@ -29,8 +29,7 @@ import org.eclipse.emf.ecore.EReference;
  * @model kind="package"
  * @generated
  */
-public interface model4interfacesPackage
-    extends EPackage, org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
+public interface model4interfacesPackage extends EPackage, org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
 {
   /**
    * The package name.
@@ -58,8 +57,7 @@ public interface model4interfacesPackage
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  model4interfacesPackage eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl.model4interfacesPackageImpl
-      .init();
+  model4interfacesPackage eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl.model4interfacesPackageImpl.init();
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
index 6baafb938d..4c4f00e19d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
@@ -25,8 +25,7 @@ public interface model4interfacesFactory extends EFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl
-      .init();
+  model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl.init();
 
   /**
    * Returns the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
index 7c53259fe8..98b35b5140 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
@@ -56,8 +56,7 @@ public interface model4interfacesPackage extends EPackage
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  model4interfacesPackage eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl
-      .init();
+  model4interfacesPackage eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl.init();
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
index 4d2408b0dc..e697197130 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
@@ -206,8 +206,8 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     }
 
     // Obtain or create and register package
-    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
+    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
 
     isInited = true;
 
@@ -718,107 +718,81 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
-        TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(managerEClass, Manager.class, "Manager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(doctorEClass, Doctor.class, "Doctor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genListOfStringEClass, GenListOfString.class, "GenListOfString", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfString_Elements(), ecorePackage.getEString(), "elements", null, 0, -1,
-        GenListOfString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntEClass, GenListOfInt.class, "GenListOfInt", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfInt_Elements(), ecorePackage.getEInt(), "elements", null, 0, -1, GenListOfInt.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntegerEClass, GenListOfInteger.class, "GenListOfInteger", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfInteger_Elements(), ecorePackage.getEIntegerObject(), "elements", null, 0, -1,
-        GenListOfInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfLongEClass, GenListOfLong.class, "GenListOfLong", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfLong_Elements(), ecorePackage.getELong(), "elements", null, 0, -1, GenListOfLong.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfBooleanEClass, GenListOfBoolean.class, "GenListOfBoolean", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfBoolean_Elements(), ecorePackage.getEBoolean(), "elements", null, 0, -1,
-        GenListOfBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfShortEClass, GenListOfShort.class, "GenListOfShort", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfShort_Elements(), ecorePackage.getEShort(), "elements", null, 0, -1,
-        GenListOfShort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfFloatEClass, GenListOfFloat.class, "GenListOfFloat", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfFloat_Elements(), ecorePackage.getEFloat(), "elements", null, 0, -1,
-        GenListOfFloat.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfDoubleEClass, GenListOfDouble.class, "GenListOfDouble", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfDouble_Elements(), ecorePackage.getEDouble(), "elements", null, 0, -1,
-        GenListOfDouble.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfDateEClass, GenListOfDate.class, "GenListOfDate", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfDate_Elements(), ecorePackage.getEDate(), "elements", null, 0, -1, GenListOfDate.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfCharEClass, GenListOfChar.class, "GenListOfChar", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfChar_Elements(), ecorePackage.getEChar(), "elements", null, 0, -1, GenListOfChar.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntArrayEClass, GenListOfIntArray.class, "GenListOfIntArray", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfIntArray_Elements(), getIntArray(), "elements", null, 0, -1, GenListOfIntArray.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfStringEClass, GenListOfString.class, "GenListOfString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfString_Elements(), ecorePackage.getEString(), "elements", null, 0, -1, GenListOfString.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getParent_Children(), getChild(), getChild_Parent(), "children", null, 0, -1, Parent.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getParent_Favourite(), getChild(), getChild_PreferredBy(), "favourite", null, 0, 1, Parent.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getParent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parent.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfIntEClass, GenListOfInt.class, "GenListOfInt", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfInt_Elements(), ecorePackage.getEInt(), "elements", null, 0, -1, GenListOfInt.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChild_Parent(), getParent(), getParent_Children(), "parent", null, 0, 1, Child.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getChild_PreferredBy(), getParent(), getParent_Favourite(), "preferredBy", null, 0, 1, Child.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getChild_Name(), ecorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT,
+    initEClass(genListOfIntegerEClass, GenListOfInteger.class, "GenListOfInteger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfInteger_Elements(), ecorePackage.getEIntegerObject(), "elements", null, 0, -1, GenListOfInteger.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(withCustomTypeEClass, WithCustomType.class, "WithCustomType", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getWithCustomType_Value(), getCustomType(), "value", null, 0, 1, WithCustomType.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfLongEClass, GenListOfLong.class, "GenListOfLong", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfLong_Elements(), ecorePackage.getELong(), "elements", null, 0, -1, GenListOfLong.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfBooleanEClass, GenListOfBoolean.class, "GenListOfBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfBoolean_Elements(), ecorePackage.getEBoolean(), "elements", null, 0, -1, GenListOfBoolean.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfShortEClass, GenListOfShort.class, "GenListOfShort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfShort_Elements(), ecorePackage.getEShort(), "elements", null, 0, -1, GenListOfShort.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfFloatEClass, GenListOfFloat.class, "GenListOfFloat", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfFloat_Elements(), ecorePackage.getEFloat(), "elements", null, 0, -1, GenListOfFloat.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfDoubleEClass, GenListOfDouble.class, "GenListOfDouble", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfDouble_Elements(), ecorePackage.getEDouble(), "elements", null, 0, -1, GenListOfDouble.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfDateEClass, GenListOfDate.class, "GenListOfDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfDate_Elements(), ecorePackage.getEDate(), "elements", null, 0, -1, GenListOfDate.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfCharEClass, GenListOfChar.class, "GenListOfChar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfChar_Elements(), ecorePackage.getEChar(), "elements", null, 0, -1, GenListOfChar.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfIntArrayEClass, GenListOfIntArray.class, "GenListOfIntArray", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfIntArray_Elements(), getIntArray(), "elements", null, 0, -1, GenListOfIntArray.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getParent_Children(), getChild(), getChild_Parent(), "children", null, 0, -1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Favourite(), getChild(), getChild_PreferredBy(), "favourite", null, 0, 1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getParent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChild_Parent(), getParent(), getParent_Children(), "parent", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getChild_PreferredBy(), getParent(), getParent_Favourite(), "preferredBy", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getChild_Name(), ecorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(withCustomTypeEClass, WithCustomType.class, "WithCustomType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getWithCustomType_Value(), getCustomType(), "value", null, 0, 1, WithCustomType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(intArrayEDataType, int[].class, "IntArray", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
index c0eba19b0f..dd789881ac 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
@@ -165,8 +165,7 @@ public class ChildImpl extends EObjectImpl implements Child
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.CHILD__PREFERRED_BY, oldPreferredBy,
-              preferredBy));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.CHILD__PREFERRED_BY, oldPreferredBy, preferredBy));
         }
       }
     }
@@ -194,8 +193,7 @@ public class ChildImpl extends EObjectImpl implements Child
     preferredBy = newPreferredBy;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY,
-          oldPreferredBy, newPreferredBy);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY, oldPreferredBy, newPreferredBy);
       if (msgs == null)
       {
         msgs = notification;
@@ -234,8 +232,7 @@ public class ChildImpl extends EObjectImpl implements Child
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY, newPreferredBy,
-          newPreferredBy));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY, newPreferredBy, newPreferredBy));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
index 9c9948ddb3..2dd751869d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
@@ -54,8 +54,7 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   {
     try
     {
-      Model5Factory theModel5Factory = (Model5Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model5/1.0.0");
+      Model5Factory theModel5Factory = (Model5Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model5/1.0.0");
       if (theModel5Factory != null)
       {
         return theModel5Factory;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
index 3cd8a4d620..23b9fe4c07 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
@@ -206,8 +206,8 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     }
 
     // Obtain or create and register package
-    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
+    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
 
     isInited = true;
 
@@ -718,107 +718,81 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
-        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
-        TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(managerEClass, Manager.class, "Manager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(doctorEClass, Doctor.class, "Doctor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(genListOfStringEClass, GenListOfString.class, "GenListOfString", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfString_Elements(), ecorePackage.getEString(), "elements", null, 0, -1,
-        GenListOfString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntEClass, GenListOfInt.class, "GenListOfInt", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfInt_Elements(), ecorePackage.getEInt(), "elements", null, 0, -1, GenListOfInt.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntegerEClass, GenListOfInteger.class, "GenListOfInteger", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfInteger_Elements(), ecorePackage.getEIntegerObject(), "elements", null, 0, -1,
-        GenListOfInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfLongEClass, GenListOfLong.class, "GenListOfLong", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfLong_Elements(), ecorePackage.getELong(), "elements", null, 0, -1, GenListOfLong.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfBooleanEClass, GenListOfBoolean.class, "GenListOfBoolean", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfBoolean_Elements(), ecorePackage.getEBoolean(), "elements", null, 0, -1,
-        GenListOfBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfShortEClass, GenListOfShort.class, "GenListOfShort", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfShort_Elements(), ecorePackage.getEShort(), "elements", null, 0, -1,
-        GenListOfShort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfFloatEClass, GenListOfFloat.class, "GenListOfFloat", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfFloat_Elements(), ecorePackage.getEFloat(), "elements", null, 0, -1,
-        GenListOfFloat.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfDoubleEClass, GenListOfDouble.class, "GenListOfDouble", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfDouble_Elements(), ecorePackage.getEDouble(), "elements", null, 0, -1,
-        GenListOfDouble.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfDateEClass, GenListOfDate.class, "GenListOfDate", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfDate_Elements(), ecorePackage.getEDate(), "elements", null, 0, -1, GenListOfDate.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfCharEClass, GenListOfChar.class, "GenListOfChar", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfChar_Elements(), ecorePackage.getEChar(), "elements", null, 0, -1, GenListOfChar.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(genListOfIntArrayEClass, GenListOfIntArray.class, "GenListOfIntArray", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfIntArray_Elements(), getIntArray(), "elements", null, 0, -1, GenListOfIntArray.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfStringEClass, GenListOfString.class, "GenListOfString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfString_Elements(), ecorePackage.getEString(), "elements", null, 0, -1, GenListOfString.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getParent_Children(), getChild(), getChild_Parent(), "children", null, 0, -1, Parent.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getParent_Favourite(), getChild(), getChild_PreferredBy(), "favourite", null, 0, 1, Parent.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getParent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parent.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfIntEClass, GenListOfInt.class, "GenListOfInt", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfInt_Elements(), ecorePackage.getEInt(), "elements", null, 0, -1, GenListOfInt.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChild_Parent(), getParent(), getParent_Children(), "parent", null, 0, 1, Child.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getChild_PreferredBy(), getParent(), getParent_Favourite(), "preferredBy", null, 0, 1, Child.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getChild_Name(), ecorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT,
+    initEClass(genListOfIntegerEClass, GenListOfInteger.class, "GenListOfInteger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfInteger_Elements(), ecorePackage.getEIntegerObject(), "elements", null, 0, -1, GenListOfInteger.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(withCustomTypeEClass, WithCustomType.class, "WithCustomType", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getWithCustomType_Value(), getCustomType(), "value", null, 0, 1, WithCustomType.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(genListOfLongEClass, GenListOfLong.class, "GenListOfLong", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfLong_Elements(), ecorePackage.getELong(), "elements", null, 0, -1, GenListOfLong.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfBooleanEClass, GenListOfBoolean.class, "GenListOfBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfBoolean_Elements(), ecorePackage.getEBoolean(), "elements", null, 0, -1, GenListOfBoolean.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfShortEClass, GenListOfShort.class, "GenListOfShort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfShort_Elements(), ecorePackage.getEShort(), "elements", null, 0, -1, GenListOfShort.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfFloatEClass, GenListOfFloat.class, "GenListOfFloat", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfFloat_Elements(), ecorePackage.getEFloat(), "elements", null, 0, -1, GenListOfFloat.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfDoubleEClass, GenListOfDouble.class, "GenListOfDouble", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfDouble_Elements(), ecorePackage.getEDouble(), "elements", null, 0, -1, GenListOfDouble.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfDateEClass, GenListOfDate.class, "GenListOfDate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfDate_Elements(), ecorePackage.getEDate(), "elements", null, 0, -1, GenListOfDate.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfCharEClass, GenListOfChar.class, "GenListOfChar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfChar_Elements(), ecorePackage.getEChar(), "elements", null, 0, -1, GenListOfChar.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(genListOfIntArrayEClass, GenListOfIntArray.class, "GenListOfIntArray", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getGenListOfIntArray_Elements(), getIntArray(), "elements", null, 0, -1, GenListOfIntArray.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getParent_Children(), getChild(), getChild_Parent(), "children", null, 0, -1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Favourite(), getChild(), getChild_PreferredBy(), "favourite", null, 0, 1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getParent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChild_Parent(), getParent(), getParent_Children(), "parent", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getChild_PreferredBy(), getParent(), getParent_Favourite(), "preferredBy", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getChild_Name(), ecorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(withCustomTypeEClass, WithCustomType.class, "WithCustomType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getWithCustomType_Value(), getCustomType(), "value", null, 0, 1, WithCustomType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(intArrayEDataType, int[].class, "IntArray", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
index c5148828a2..ad18ee8840 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
@@ -114,8 +114,7 @@ public class ParentImpl extends EObjectImpl implements Parent
   {
     if (children == null)
     {
-      children = new EObjectContainmentWithInverseEList<Child>(Child.class, this, Model5Package.PARENT__CHILDREN,
-          Model5Package.CHILD__PARENT);
+      children = new EObjectContainmentWithInverseEList<Child>(Child.class, this, Model5Package.PARENT__CHILDREN, Model5Package.CHILD__PARENT);
     }
     return children;
   }
@@ -135,8 +134,7 @@ public class ParentImpl extends EObjectImpl implements Parent
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.PARENT__FAVOURITE, oldFavourite,
-              favourite));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.PARENT__FAVOURITE, oldFavourite, favourite));
         }
       }
     }
@@ -164,8 +162,7 @@ public class ParentImpl extends EObjectImpl implements Parent
     favourite = newFavourite;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE,
-          oldFavourite, newFavourite);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, oldFavourite, newFavourite);
       if (msgs == null)
       {
         msgs = notification;
@@ -204,8 +201,7 @@ public class ParentImpl extends EObjectImpl implements Parent
     }
     else if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, newFavourite, newFavourite));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, newFavourite, newFavourite));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
index 039950b9d4..52e6dd4380 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
@@ -91,13 +91,11 @@ public class IsLoadingTestFixture
 
   public void assertReportedLoading(Resource resource, EObject object)
   {
-    Assert.assertEquals("Object did not report loading: " + object, true,
-        getObjectsReportedLoading(resource).contains(object));
+    Assert.assertEquals("Object did not report loading: " + object, true, getObjectsReportedLoading(resource).contains(object));
   }
 
   public void assertNotReportedLoading(Resource resource, EObject object)
   {
-    Assert.assertEquals("Object reported loading: " + object, false,
-        getObjectsReportedLoading(resource).contains(object));
+    Assert.assertEquals("Object reported loading: " + object, false, getObjectsReportedLoading(resource).contains(object));
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
index 07aa88cf78..8297850ee3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
@@ -449,8 +449,7 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
     MyEnum result = MyEnum.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
index 563653071c..d68fb5cbb0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
@@ -270,8 +270,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     }
 
     // Obtain or create and register package
-    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
 
     isInited = true;
 
@@ -1346,130 +1346,91 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1,
-        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1,
-        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1,
-        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
-        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1,
-        UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1,
-        UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-    initEClass(propertiesMapEClass, PropertiesMap.class, "PropertiesMap", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
-        PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
-        PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(propertiesMapEntryEClass, Map.Entry.class, "PropertiesMapEntry", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMapEntry_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);
-    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), 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);
-
-    initEClass(propertiesMapEntryValueEClass, PropertiesMapEntryValue.class, "PropertiesMapEntryValue", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMapEntryValue_Label(), ecorePackage.getEString(), "label", null, 0, 1,
-        PropertiesMapEntryValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1, ReferenceObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1, ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1, ContainmentObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1, ContainmentObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1, UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1, UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+    initEClass(propertiesMapEClass, PropertiesMap.class, "PropertiesMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1, PropertiesMap.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1, PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(propertiesMapEntryEClass, Map.Entry.class, "PropertiesMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMapEntry_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);
+    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), 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);
+
+    initEClass(propertiesMapEntryValueEClass, PropertiesMapEntryValue.class, "PropertiesMapEntryValue", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMapEntryValue_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMapEntryValue.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(dEClass, org.eclipse.emf.cdo.tests.model6.D.class, "D", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1,
-        org.eclipse.emf.cdo.tests.model6.D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(gEClass, org.eclipse.emf.cdo.tests.model6.G.class, "G", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(dEClass, org.eclipse.emf.cdo.tests.model6.D.class, "D", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1, org.eclipse.emf.cdo.tests.model6.D.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(gEClass, org.eclipse.emf.cdo.tests.model6.G.class, "G", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isAttributeModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -1477,135 +1438,99 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isListModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(holderEClass, Holder.class, "Holder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(thingEClass, Thing.class, "Thing", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(holdableEClass, Holdable.class, "Holdable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHoldable_Name(), ecorePackage.getEString(), "name", null, 1, 1, Holdable.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getHoldable_Name(), ecorePackage.getEString(), "name", null, 1, 1, Holdable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1, HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1,
-        HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(emptyStringDefaultEClass, EmptyStringDefault.class, "EmptyStringDefault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEmptyStringDefault_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1, EmptyStringDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(emptyStringDefaultEClass, EmptyStringDefault.class, "EmptyStringDefault", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(emptyStringDefaultUnsettableEClass, EmptyStringDefaultUnsettable.class, "EmptyStringDefaultUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEmptyStringDefault_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1,
-        EmptyStringDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(emptyStringDefaultUnsettableEClass, EmptyStringDefaultUnsettable.class, "EmptyStringDefaultUnsettable",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEmptyStringDefaultUnsettable_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1,
-        EmptyStringDefaultUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(unsettableAttributesEClass, UnsettableAttributes.class, "UnsettableAttributes", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettableAttributes_AttrBigDecimal(), ecorePackage.getEBigDecimal(), "attrBigDecimal", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBigInteger(), ecorePackage.getEBigInteger(), "attrBigInteger", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBoolean(), ecorePackage.getEBoolean(), "attrBoolean", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBooleanObject(), ecorePackage.getEBooleanObject(), "attrBooleanObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByte(), ecorePackage.getEByte(), "attrByte", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByteArray(), ecorePackage.getEByteArray(), "attrByteArray", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByteObject(), ecorePackage.getEByteObject(), "attrByteObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrChar(), ecorePackage.getEChar(), "attrChar", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrCharacterObject(), ecorePackage.getECharacterObject(),
-        "attrCharacterObject", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDate(), ecorePackage.getEDate(), "attrDate", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDouble(), ecorePackage.getEDouble(), "attrDouble", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDoubleObject(), ecorePackage.getEDoubleObject(), "attrDoubleObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrFloat(), ecorePackage.getEFloat(), "attrFloat", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrFloatObject(), ecorePackage.getEFloatObject(), "attrFloatObject", null,
-        0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrInt(), ecorePackage.getEInt(), "attrInt", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrIntegerObject(), ecorePackage.getEIntegerObject(), "attrIntegerObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getEmptyStringDefaultUnsettable_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1, EmptyStringDefaultUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettableAttributesEClass, UnsettableAttributes.class, "UnsettableAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettableAttributes_AttrBigDecimal(), ecorePackage.getEBigDecimal(), "attrBigDecimal", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBigInteger(), ecorePackage.getEBigInteger(), "attrBigInteger", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBoolean(), ecorePackage.getEBoolean(), "attrBoolean", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBooleanObject(), ecorePackage.getEBooleanObject(), "attrBooleanObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByte(), ecorePackage.getEByte(), "attrByte", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByteArray(), ecorePackage.getEByteArray(), "attrByteArray", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByteObject(), ecorePackage.getEByteObject(), "attrByteObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrChar(), ecorePackage.getEChar(), "attrChar", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrCharacterObject(), ecorePackage.getECharacterObject(), "attrCharacterObject", null, 0, 1,
+        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDate(), ecorePackage.getEDate(), "attrDate", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDouble(), ecorePackage.getEDouble(), "attrDouble", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDoubleObject(), ecorePackage.getEDoubleObject(), "attrDoubleObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrFloat(), ecorePackage.getEFloat(), "attrFloat", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrFloatObject(), ecorePackage.getEFloatObject(), "attrFloatObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrInt(), ecorePackage.getEInt(), "attrInt", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrIntegerObject(), ecorePackage.getEIntegerObject(), "attrIntegerObject", null, 0, 1, UnsettableAttributes.class,
+        !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(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class,
+    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0, 1, UnsettableAttributes.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrLong(), ecorePackage.getELong(), "attrLong", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrLongObject(), ecorePackage.getELongObject(), "attrLongObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrShort(), ecorePackage.getEShort(), "attrShort", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrShortObject(), ecorePackage.getEShortObject(), "attrShortObject", null,
-        0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrString(), ecorePackage.getEString(), "attrString", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(canReferenceLegacyEClass, CanReferenceLegacy.class, "CanReferenceLegacy", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCanReferenceLegacy_SingleContainment(), ecorePackage.getEObject(), null, "singleContainment",
-        null, 0, 1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment",
-        null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0,
-        1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference",
-        null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrLong(), ecorePackage.getELong(), "attrLong", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrLongObject(), ecorePackage.getELongObject(), "attrLongObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrShort(), ecorePackage.getEShort(), "attrShort", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrShortObject(), ecorePackage.getEShortObject(), "attrShortObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrString(), ecorePackage.getEString(), "attrString", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(canReferenceLegacyEClass, CanReferenceLegacy.class, "CanReferenceLegacy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCanReferenceLegacy_SingleContainment(), ecorePackage.getEObject(), null, "singleContainment", null, 0, 1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment", null, 0, -1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0, 1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference", null, 0, -1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(myEnumEEnum, MyEnum.class, "MyEnum");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
index feb5598bbc..0a314a3366 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
@@ -76,8 +76,7 @@ public class BImpl extends EObjectImpl implements B
       if (ownedC != oldOwnedC)
       {
         InternalEObject newOwnedC = (InternalEObject)ownedC;
-        NotificationChain msgs = oldOwnedC.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
-            null);
+        NotificationChain msgs = oldOwnedC.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, null);
         if (newOwnedC.eInternalContainer() == null)
         {
           msgs = newOwnedC.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs);
@@ -115,8 +114,7 @@ public class BImpl extends EObjectImpl implements B
     ownedC = newOwnedC;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C,
-          oldOwnedC, newOwnedC);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C, oldOwnedC, newOwnedC);
       if (msgs == null)
       {
         msgs = notification;
@@ -140,13 +138,11 @@ public class BImpl extends EObjectImpl implements B
       NotificationChain msgs = null;
       if (ownedC != null)
       {
-        msgs = ((InternalEObject)ownedC).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
-            msgs);
+        msgs = ((InternalEObject)ownedC).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs);
       }
       if (newOwnedC != null)
       {
-        msgs = ((InternalEObject)newOwnedC).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
-            msgs);
+        msgs = ((InternalEObject)newOwnedC).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs);
       }
       msgs = basicSetOwnedC(newOwnedC, msgs);
       if (msgs != null)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
index 510de0aa77..b6dac25bc0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
@@ -125,8 +125,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     attributeOptional = newAttributeOptional;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL,
-          oldAttributeOptional, attributeOptional));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL, oldAttributeOptional, attributeOptional));
     }
   }
 
@@ -149,8 +148,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     attributeRequired = newAttributeRequired;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED,
-          oldAttributeRequired, attributeRequired));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED, oldAttributeRequired, attributeRequired));
     }
   }
 
@@ -242,11 +240,9 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     switch (featureID)
     {
     case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:
-      return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null
-          : !ATTRIBUTE_OPTIONAL_EDEFAULT.equals(attributeOptional);
+      return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null : !ATTRIBUTE_OPTIONAL_EDEFAULT.equals(attributeOptional);
     case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:
-      return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null
-          : !ATTRIBUTE_REQUIRED_EDEFAULT.equals(attributeRequired);
+      return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null : !ATTRIBUTE_REQUIRED_EDEFAULT.equals(attributeRequired);
     case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:
       return attributeList != null && !attributeList.isEmpty();
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
index bfd3c32d21..672bc838d0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
@@ -120,12 +120,11 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       if (singleContainment != oldSingleContainment)
       {
         InternalEObject newSingleContainment = (InternalEObject)singleContainment;
-        NotificationChain msgs = oldSingleContainment.eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, null);
+        NotificationChain msgs = oldSingleContainment.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT,
+            null, null);
         if (newSingleContainment.eInternalContainer() == null)
         {
-          msgs = newSingleContainment.eInverseAdd(this,
-              EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+          msgs = newSingleContainment.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
         }
         if (msgs != null)
         {
@@ -133,8 +132,8 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
         }
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, oldSingleContainment, singleContainment));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, oldSingleContainment,
+              singleContainment));
         }
       }
     }
@@ -162,8 +161,8 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     singleContainment = newSingleContainment;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, oldSingleContainment, newSingleContainment);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT,
+          oldSingleContainment, newSingleContainment);
       if (msgs == null)
       {
         msgs = notification;
@@ -188,13 +187,13 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       NotificationChain msgs = null;
       if (singleContainment != null)
       {
-        msgs = ((InternalEObject)singleContainment).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+        msgs = ((InternalEObject)singleContainment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null,
+            msgs);
       }
       if (newSingleContainment != null)
       {
-        msgs = ((InternalEObject)newSingleContainment).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+        msgs = ((InternalEObject)newSingleContainment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null,
+            msgs);
       }
       msgs = basicSetSingleContainment(newSingleContainment, msgs);
       if (msgs != null)
@@ -204,8 +203,8 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT,
-          newSingleContainment, newSingleContainment));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, newSingleContainment, newSingleContainment));
     }
   }
 
@@ -218,8 +217,7 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
   {
     if (multipleContainment == null)
     {
-      multipleContainment = new EObjectContainmentEList.Resolving<EObject>(EObject.class, this,
-          Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT);
+      multipleContainment = new EObjectContainmentEList.Resolving<EObject>(EObject.class, this, Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT);
     }
     return multipleContainment;
   }
@@ -239,8 +237,7 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE, oldSingleReference, singleReference));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE, oldSingleReference, singleReference));
         }
       }
     }
@@ -268,8 +265,7 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     singleReference = newSingleReference;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE,
-          oldSingleReference, singleReference));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE, oldSingleReference, singleReference));
     }
   }
 
@@ -282,8 +278,7 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
   {
     if (multipleReference == null)
     {
-      multipleReference = new EObjectResolvingEList<EObject>(EObject.class, this,
-          Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE);
+      multipleReference = new EObjectResolvingEList<EObject>(EObject.class, this, Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE);
     }
     return multipleReference;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
index 1926f92047..90389cbdd1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
@@ -91,12 +91,11 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
       if (containmentOptional != oldContainmentOptional)
       {
         InternalEObject newContainmentOptional = (InternalEObject)containmentOptional;
-        NotificationChain msgs = oldContainmentOptional.eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, null);
+        NotificationChain msgs = oldContainmentOptional.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
+            null, null);
         if (newContainmentOptional.eInternalContainer() == null)
         {
-          msgs = newContainmentOptional.eInverseAdd(this,
-              EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+          msgs = newContainmentOptional.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
         }
         if (msgs != null)
         {
@@ -104,8 +103,8 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
         }
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, containmentOptional));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional,
+              containmentOptional));
         }
       }
     }
@@ -132,8 +131,8 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
     containmentOptional = newContainmentOptional;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, newContainmentOptional);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
+          oldContainmentOptional, newContainmentOptional);
       if (msgs == null)
       {
         msgs = notification;
@@ -157,13 +156,13 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
       NotificationChain msgs = null;
       if (containmentOptional != null)
       {
-        msgs = ((InternalEObject)containmentOptional).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+        msgs = ((InternalEObject)containmentOptional).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
+            null, msgs);
       }
       if (newContainmentOptional != null)
       {
-        msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+        msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
+            null, msgs);
       }
       msgs = basicSetContainmentOptional(newContainmentOptional, msgs);
       if (msgs != null)
@@ -173,8 +172,8 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
-          newContainmentOptional, newContainmentOptional));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, newContainmentOptional,
+          newContainmentOptional));
     }
   }
 
@@ -186,8 +185,7 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
   {
     if (containmentList == null)
     {
-      containmentList = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this,
-          Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST);
+      containmentList = new EObjectContainmentEList.Resolving<BaseObject>(BaseObject.class, this, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST);
     }
     return containmentList;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
index 822d32c508..931956e05a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
@@ -82,8 +82,7 @@ public class DImpl extends EObjectImpl implements D
     data = newData;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, oldData,
-          newData);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, oldData, newData);
       if (msgs == null)
       {
         msgs = notification;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
index d4d7fb8e2f..45ada5cc79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
@@ -95,8 +95,7 @@ public class EmptyStringDefaultImpl extends EObjectImpl implements EmptyStringDe
     attribute = newAttribute;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT__ATTRIBUTE, oldAttribute,
-          attribute));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT__ATTRIBUTE, oldAttribute, attribute));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
index 64de727a9d..e48d559e9d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
@@ -106,8 +106,8 @@ public class EmptyStringDefaultUnsettableImpl extends EObjectImpl implements Emp
     attributeESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE,
-          oldAttribute, attribute, !oldAttributeESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE, oldAttribute, attribute, !oldAttributeESet));
     }
   }
 
@@ -124,8 +124,8 @@ public class EmptyStringDefaultUnsettableImpl extends EObjectImpl implements Emp
     attributeESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE,
-          oldAttribute, ATTRIBUTE_EDEFAULT, oldAttributeESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE, oldAttribute, ATTRIBUTE_EDEFAULT,
+          oldAttributeESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
index 1505f99c76..51acd13e25 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
@@ -197,8 +197,7 @@ public class GImpl extends EObjectImpl implements G
       {
         if (eNotificationRequired())
         {
-          eNotify(
-              new ENotificationImpl(this, Notification.RESOLVE, Model6Package.G__REFERENCE, oldReference, reference));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.G__REFERENCE, oldReference, reference));
         }
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
index 6e6363dfda..782e005e77 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
@@ -106,8 +106,7 @@ public class HasNillableAttributeImpl extends EObjectImpl implements HasNillable
     nillableESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE, oldNillable,
-          nillable, !oldNillableESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE, oldNillable, nillable, !oldNillableESet));
     }
   }
 
@@ -124,8 +123,7 @@ public class HasNillableAttributeImpl extends EObjectImpl implements HasNillable
     nillableESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE,
-          oldNillable, NILLABLE_EDEFAULT, oldNillableESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE, oldNillable, NILLABLE_EDEFAULT, oldNillableESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
index c0173cfec2..31efe7abca 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
@@ -63,8 +63,7 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
   {
     try
     {
-      Model6Factory theModel6Factory = (Model6Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model6/1.0.0");
+      Model6Factory theModel6Factory = (Model6Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model6/1.0.0");
       if (theModel6Factory != null)
       {
         return theModel6Factory;
@@ -450,8 +449,7 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
     MyEnum result = MyEnum.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
index e9d80b79d7..515adcbeb9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
@@ -270,8 +270,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     }
 
     // Obtain or create and register package
-    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
 
     isInited = true;
 
@@ -1346,130 +1346,91 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     // Initialize classes and features; add operations and parameters
     initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1,
-        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1,
-        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1,
-        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1,
-        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
-        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1,
-        UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1,
-        UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-    initEClass(propertiesMapEClass, PropertiesMap.class, "PropertiesMap", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
-        PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
-        PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(propertiesMapEntryEClass, Map.Entry.class, "PropertiesMapEntry", !IS_ABSTRACT, !IS_INTERFACE,
-        !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMapEntry_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);
-    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), 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);
-
-    initEClass(propertiesMapEntryValueEClass, PropertiesMapEntryValue.class, "PropertiesMapEntryValue", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPropertiesMapEntryValue_Label(), ecorePackage.getEString(), "label", null, 0, 1,
-        PropertiesMapEntryValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1, BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1, ReferenceObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1, ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1, ContainmentObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1, ContainmentObject.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1, UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1, UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+    initEClass(propertiesMapEClass, PropertiesMap.class, "PropertiesMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1, PropertiesMap.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1, PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(propertiesMapEntryEClass, Map.Entry.class, "PropertiesMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMapEntry_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);
+    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), 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);
+
+    initEClass(propertiesMapEntryValueEClass, PropertiesMapEntryValue.class, "PropertiesMapEntryValue", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPropertiesMapEntryValue_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMapEntryValue.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(dEClass, org.eclipse.emf.cdo.tests.model6.D.class, "D", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1,
-        org.eclipse.emf.cdo.tests.model6.D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(gEClass, org.eclipse.emf.cdo.tests.model6.G.class, "G", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(dEClass, org.eclipse.emf.cdo.tests.model6.D.class, "D", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1, org.eclipse.emf.cdo.tests.model6.D.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(gEClass, org.eclipse.emf.cdo.tests.model6.G.class, "G", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isAttributeModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -1477,135 +1438,99 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isListModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(holderEClass, Holder.class, "Holder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(thingEClass, Thing.class, "Thing", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(holdableEClass, Holdable.class, "Holdable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHoldable_Name(), ecorePackage.getEString(), "name", null, 1, 1, Holdable.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getHoldable_Name(), ecorePackage.getEString(), "name", null, 1, 1, Holdable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1, HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1,
-        HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEClass(emptyStringDefaultEClass, EmptyStringDefault.class, "EmptyStringDefault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getEmptyStringDefault_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1, EmptyStringDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(emptyStringDefaultEClass, EmptyStringDefault.class, "EmptyStringDefault", !IS_ABSTRACT, !IS_INTERFACE,
+    initEClass(emptyStringDefaultUnsettableEClass, EmptyStringDefaultUnsettable.class, "EmptyStringDefaultUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEmptyStringDefault_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1,
-        EmptyStringDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(emptyStringDefaultUnsettableEClass, EmptyStringDefaultUnsettable.class, "EmptyStringDefaultUnsettable",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEmptyStringDefaultUnsettable_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1,
-        EmptyStringDefaultUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(unsettableAttributesEClass, UnsettableAttributes.class, "UnsettableAttributes", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnsettableAttributes_AttrBigDecimal(), ecorePackage.getEBigDecimal(), "attrBigDecimal", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBigInteger(), ecorePackage.getEBigInteger(), "attrBigInteger", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBoolean(), ecorePackage.getEBoolean(), "attrBoolean", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrBooleanObject(), ecorePackage.getEBooleanObject(), "attrBooleanObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByte(), ecorePackage.getEByte(), "attrByte", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByteArray(), ecorePackage.getEByteArray(), "attrByteArray", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrByteObject(), ecorePackage.getEByteObject(), "attrByteObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrChar(), ecorePackage.getEChar(), "attrChar", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrCharacterObject(), ecorePackage.getECharacterObject(),
-        "attrCharacterObject", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDate(), ecorePackage.getEDate(), "attrDate", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDouble(), ecorePackage.getEDouble(), "attrDouble", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrDoubleObject(), ecorePackage.getEDoubleObject(), "attrDoubleObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrFloat(), ecorePackage.getEFloat(), "attrFloat", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrFloatObject(), ecorePackage.getEFloatObject(), "attrFloatObject", null,
-        0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrInt(), ecorePackage.getEInt(), "attrInt", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrIntegerObject(), ecorePackage.getEIntegerObject(), "attrIntegerObject",
-        null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getEmptyStringDefaultUnsettable_Attribute(), ecorePackage.getEString(), "attribute", "", 0, 1, EmptyStringDefaultUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(unsettableAttributesEClass, UnsettableAttributes.class, "UnsettableAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnsettableAttributes_AttrBigDecimal(), ecorePackage.getEBigDecimal(), "attrBigDecimal", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBigInteger(), ecorePackage.getEBigInteger(), "attrBigInteger", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBoolean(), ecorePackage.getEBoolean(), "attrBoolean", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrBooleanObject(), ecorePackage.getEBooleanObject(), "attrBooleanObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByte(), ecorePackage.getEByte(), "attrByte", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByteArray(), ecorePackage.getEByteArray(), "attrByteArray", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrByteObject(), ecorePackage.getEByteObject(), "attrByteObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrChar(), ecorePackage.getEChar(), "attrChar", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrCharacterObject(), ecorePackage.getECharacterObject(), "attrCharacterObject", null, 0, 1,
+        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDate(), ecorePackage.getEDate(), "attrDate", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDouble(), ecorePackage.getEDouble(), "attrDouble", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrDoubleObject(), ecorePackage.getEDoubleObject(), "attrDoubleObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrFloat(), ecorePackage.getEFloat(), "attrFloat", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrFloatObject(), ecorePackage.getEFloatObject(), "attrFloatObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrInt(), ecorePackage.getEInt(), "attrInt", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrIntegerObject(), ecorePackage.getEIntegerObject(), "attrIntegerObject", null, 0, 1, UnsettableAttributes.class,
+        !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(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class,
+    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0, 1, UnsettableAttributes.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrLong(), ecorePackage.getELong(), "attrLong", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrLongObject(), ecorePackage.getELongObject(), "attrLongObject", null, 0,
-        1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrShort(), ecorePackage.getEShort(), "attrShort", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrShortObject(), ecorePackage.getEShortObject(), "attrShortObject", null,
-        0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettableAttributes_AttrString(), ecorePackage.getEString(), "attrString", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(canReferenceLegacyEClass, CanReferenceLegacy.class, "CanReferenceLegacy", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCanReferenceLegacy_SingleContainment(), ecorePackage.getEObject(), null, "singleContainment",
-        null, 0, 1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment",
-        null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0,
-        1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference",
-        null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrLong(), ecorePackage.getELong(), "attrLong", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrLongObject(), ecorePackage.getELongObject(), "attrLongObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrShort(), ecorePackage.getEShort(), "attrShort", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrShortObject(), ecorePackage.getEShortObject(), "attrShortObject", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrString(), ecorePackage.getEString(), "attrString", null, 0, 1, UnsettableAttributes.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(canReferenceLegacyEClass, CanReferenceLegacy.class, "CanReferenceLegacy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCanReferenceLegacy_SingleContainment(), ecorePackage.getEObject(), null, "singleContainment", null, 0, 1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment", null, 0, -1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0, 1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference", null, 0, -1, CanReferenceLegacy.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(myEnumEEnum, MyEnum.class, "MyEnum");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
index 25be2c47b1..4ed5ec03a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
@@ -77,8 +77,7 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU
   {
     if (myEnum == null)
     {
-      myEnum = new EDataTypeUniqueEList.Unsettable<MyEnum>(MyEnum.class, this,
-          Model6Package.MY_ENUM_LIST_UNSETTABLE__MY_ENUM);
+      myEnum = new EDataTypeUniqueEList.Unsettable<MyEnum>(MyEnum.class, this, Model6Package.MY_ENUM_LIST_UNSETTABLE__MY_ENUM);
     }
     return myEnum;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
index 5b808c5941..c103cee968 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
@@ -129,12 +129,10 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
       if (value != oldValue)
       {
         InternalEObject newValue = (InternalEObject)value;
-        NotificationChain msgs = oldValue.eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, null);
+        NotificationChain msgs = oldValue.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, null);
         if (newValue.eInternalContainer() == null)
         {
-          msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null,
-              msgs);
+          msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
         }
         if (msgs != null)
         {
@@ -142,8 +140,7 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
         }
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue,
-              value));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, value));
         }
       }
     }
@@ -171,8 +168,7 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
     value = newValue;
     if (eNotificationRequired())
     {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, newValue);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, newValue);
       if (msgs == null)
       {
         msgs = notification;
@@ -197,13 +193,11 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
       NotificationChain msgs = null;
       if (value != null)
       {
-        msgs = ((InternalEObject)value).eInverseRemove(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
       }
       if (newValue != null)
       {
-        msgs = ((InternalEObject)newValue).eInverseAdd(this,
-            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
       }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
@@ -213,8 +207,7 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
     }
     else if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, newValue, newValue));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, newValue, newValue));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
index d858edd868..127077bddd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
@@ -95,8 +95,7 @@ public class PropertiesMapEntryValueImpl extends EObjectImpl implements Properti
     label = newLabel;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY_VALUE__LABEL, oldLabel,
-          label));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY_VALUE__LABEL, oldLabel, label));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
index 9be213ec55..fc798bb9d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
@@ -137,8 +137,8 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap
   {
     if (persistentMap == null)
     {
-      persistentMap = new EcoreEMap<String, PropertiesMapEntryValue>(Model6Package.eINSTANCE.getPropertiesMapEntry(),
-          PropertiesMapEntryImpl.class, this, Model6Package.PROPERTIES_MAP__PERSISTENT_MAP);
+      persistentMap = new EcoreEMap<String, PropertiesMapEntryValue>(Model6Package.eINSTANCE.getPropertiesMapEntry(), PropertiesMapEntryImpl.class, this,
+          Model6Package.PROPERTIES_MAP__PERSISTENT_MAP);
     }
     return persistentMap;
   }
@@ -152,8 +152,8 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap
   {
     if (transientMap == null)
     {
-      transientMap = new EcoreEMap<String, PropertiesMapEntryValue>(Model6Package.eINSTANCE.getPropertiesMapEntry(),
-          PropertiesMapEntryImpl.class, this, Model6Package.PROPERTIES_MAP__TRANSIENT_MAP);
+      transientMap = new EcoreEMap<String, PropertiesMapEntryValue>(Model6Package.eINSTANCE.getPropertiesMapEntry(), PropertiesMapEntryImpl.class, this,
+          Model6Package.PROPERTIES_MAP__TRANSIENT_MAP);
     }
     return transientMap;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
index 02f48bbccb..78f145d8bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
@@ -95,8 +95,8 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,
-              oldReferenceOptional, referenceOptional));
+          eNotify(
+              new ENotificationImpl(this, Notification.RESOLVE, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL, oldReferenceOptional, referenceOptional));
         }
       }
     }
@@ -122,8 +122,7 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
     referenceOptional = newReferenceOptional;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,
-          oldReferenceOptional, referenceOptional));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL, oldReferenceOptional, referenceOptional));
     }
   }
 
@@ -135,8 +134,7 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
   {
     if (referenceList == null)
     {
-      referenceList = new EObjectResolvingEList<BaseObject>(BaseObject.class, this,
-          Model6Package.REFERENCE_OBJECT__REFERENCE_LIST);
+      referenceList = new EObjectResolvingEList<BaseObject>(BaseObject.class, this, Model6Package.REFERENCE_OBJECT__REFERENCE_LIST);
     }
     return referenceList;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java
index a24b02b2d1..75daa67f86 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java
@@ -85,8 +85,7 @@ public class UnorderedListImpl extends EObjectImpl implements UnorderedList
   {
     if (contained == null)
     {
-      contained = new EObjectContainmentEList.Resolving<UnorderedList>(UnorderedList.class, this,
-          Model6Package.UNORDERED_LIST__CONTAINED);
+      contained = new EObjectContainmentEList.Resolving<UnorderedList>(UnorderedList.class, this, Model6Package.UNORDERED_LIST__CONTAINED);
     }
     return contained;
   }
@@ -99,8 +98,7 @@ public class UnorderedListImpl extends EObjectImpl implements UnorderedList
   {
     if (referenced == null)
     {
-      referenced = new EObjectResolvingEList<UnorderedList>(UnorderedList.class, this,
-          Model6Package.UNORDERED_LIST__REFERENCED);
+      referenced = new EObjectResolvingEList<UnorderedList>(UnorderedList.class, this, Model6Package.UNORDERED_LIST__REFERENCED);
     }
     return referenced;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
index 7dff88e6bc..a78cf8e5d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
@@ -760,8 +760,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigDecimalESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL,
-          oldAttrBigDecimal, attrBigDecimal, !oldAttrBigDecimalESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL, oldAttrBigDecimal, attrBigDecimal,
+          !oldAttrBigDecimalESet));
     }
   }
 
@@ -778,8 +778,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigDecimalESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL,
-          oldAttrBigDecimal, ATTR_BIG_DECIMAL_EDEFAULT, oldAttrBigDecimalESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL, oldAttrBigDecimal,
+          ATTR_BIG_DECIMAL_EDEFAULT, oldAttrBigDecimalESet));
     }
   }
 
@@ -816,8 +816,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigIntegerESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER,
-          oldAttrBigInteger, attrBigInteger, !oldAttrBigIntegerESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER, oldAttrBigInteger, attrBigInteger,
+          !oldAttrBigIntegerESet));
     }
   }
 
@@ -834,8 +834,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigIntegerESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER,
-          oldAttrBigInteger, ATTR_BIG_INTEGER_EDEFAULT, oldAttrBigIntegerESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER, oldAttrBigInteger,
+          ATTR_BIG_INTEGER_EDEFAULT, oldAttrBigIntegerESet));
     }
   }
 
@@ -872,8 +872,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBooleanESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN,
-          oldAttrBoolean, attrBoolean, !oldAttrBooleanESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN, oldAttrBoolean, attrBoolean, !oldAttrBooleanESet));
     }
   }
 
@@ -890,8 +890,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBooleanESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN,
-          oldAttrBoolean, ATTR_BOOLEAN_EDEFAULT, oldAttrBooleanESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN, oldAttrBoolean, ATTR_BOOLEAN_EDEFAULT,
+          oldAttrBooleanESet));
     }
   }
 
@@ -928,8 +928,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBooleanObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT,
-          oldAttrBooleanObject, attrBooleanObject, !oldAttrBooleanObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT, oldAttrBooleanObject, attrBooleanObject,
+          !oldAttrBooleanObjectESet));
     }
   }
 
@@ -946,8 +946,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBooleanObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT,
-          oldAttrBooleanObject, ATTR_BOOLEAN_OBJECT_EDEFAULT, oldAttrBooleanObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT, oldAttrBooleanObject,
+          ATTR_BOOLEAN_OBJECT_EDEFAULT, oldAttrBooleanObjectESet));
     }
   }
 
@@ -984,8 +984,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE, oldAttrByte,
-          attrByte, !oldAttrByteESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE, oldAttrByte, attrByte, !oldAttrByteESet));
     }
   }
 
@@ -1002,8 +1001,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE,
-          oldAttrByte, ATTR_BYTE_EDEFAULT, oldAttrByteESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE, oldAttrByte, ATTR_BYTE_EDEFAULT, oldAttrByteESet));
     }
   }
 
@@ -1040,8 +1039,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteArrayESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY,
-          oldAttrByteArray, attrByteArray, !oldAttrByteArrayESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY, oldAttrByteArray, attrByteArray,
+          !oldAttrByteArrayESet));
     }
   }
 
@@ -1058,8 +1057,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteArrayESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY,
-          oldAttrByteArray, ATTR_BYTE_ARRAY_EDEFAULT, oldAttrByteArrayESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY, oldAttrByteArray, ATTR_BYTE_ARRAY_EDEFAULT,
+          oldAttrByteArrayESet));
     }
   }
 
@@ -1096,8 +1095,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT,
-          oldAttrByteObject, attrByteObject, !oldAttrByteObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT, oldAttrByteObject, attrByteObject,
+          !oldAttrByteObjectESet));
     }
   }
 
@@ -1114,8 +1113,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT,
-          oldAttrByteObject, ATTR_BYTE_OBJECT_EDEFAULT, oldAttrByteObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT, oldAttrByteObject,
+          ATTR_BYTE_OBJECT_EDEFAULT, oldAttrByteObjectESet));
     }
   }
 
@@ -1152,8 +1151,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrCharESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR, oldAttrChar,
-          attrChar, !oldAttrCharESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR, oldAttrChar, attrChar, !oldAttrCharESet));
     }
   }
 
@@ -1170,8 +1168,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrCharESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR,
-          oldAttrChar, ATTR_CHAR_EDEFAULT, oldAttrCharESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR, oldAttrChar, ATTR_CHAR_EDEFAULT, oldAttrCharESet));
     }
   }
 
@@ -1208,8 +1206,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrCharacterObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT,
-          oldAttrCharacterObject, attrCharacterObject, !oldAttrCharacterObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT, oldAttrCharacterObject,
+          attrCharacterObject, !oldAttrCharacterObjectESet));
     }
   }
 
@@ -1226,9 +1224,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrCharacterObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(
-          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT,
-              oldAttrCharacterObject, ATTR_CHARACTER_OBJECT_EDEFAULT, oldAttrCharacterObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT, oldAttrCharacterObject,
+          ATTR_CHARACTER_OBJECT_EDEFAULT, oldAttrCharacterObjectESet));
     }
   }
 
@@ -1265,8 +1262,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDateESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE, oldAttrDate,
-          attrDate, !oldAttrDateESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE, oldAttrDate, attrDate, !oldAttrDateESet));
     }
   }
 
@@ -1283,8 +1279,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDateESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE,
-          oldAttrDate, ATTR_DATE_EDEFAULT, oldAttrDateESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE, oldAttrDate, ATTR_DATE_EDEFAULT, oldAttrDateESet));
     }
   }
 
@@ -1321,8 +1317,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDoubleESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE,
-          oldAttrDouble, attrDouble, !oldAttrDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE, oldAttrDouble, attrDouble, !oldAttrDoubleESet));
     }
   }
 
@@ -1339,8 +1334,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDoubleESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE,
-          oldAttrDouble, ATTR_DOUBLE_EDEFAULT, oldAttrDoubleESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE, oldAttrDouble, ATTR_DOUBLE_EDEFAULT,
+          oldAttrDoubleESet));
     }
   }
 
@@ -1377,8 +1372,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDoubleObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT,
-          oldAttrDoubleObject, attrDoubleObject, !oldAttrDoubleObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT, oldAttrDoubleObject, attrDoubleObject,
+          !oldAttrDoubleObjectESet));
     }
   }
 
@@ -1395,8 +1390,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDoubleObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT,
-          oldAttrDoubleObject, ATTR_DOUBLE_OBJECT_EDEFAULT, oldAttrDoubleObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT, oldAttrDoubleObject,
+          ATTR_DOUBLE_OBJECT_EDEFAULT, oldAttrDoubleObjectESet));
     }
   }
 
@@ -1433,8 +1428,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloatESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT,
-          oldAttrFloat, attrFloat, !oldAttrFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT, oldAttrFloat, attrFloat, !oldAttrFloatESet));
     }
   }
 
@@ -1451,8 +1445,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloatESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT,
-          oldAttrFloat, ATTR_FLOAT_EDEFAULT, oldAttrFloatESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT, oldAttrFloat, ATTR_FLOAT_EDEFAULT,
+          oldAttrFloatESet));
     }
   }
 
@@ -1489,8 +1483,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloatObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT,
-          oldAttrFloatObject, attrFloatObject, !oldAttrFloatObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT, oldAttrFloatObject, attrFloatObject,
+          !oldAttrFloatObjectESet));
     }
   }
 
@@ -1507,8 +1501,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloatObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT,
-          oldAttrFloatObject, ATTR_FLOAT_OBJECT_EDEFAULT, oldAttrFloatObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT, oldAttrFloatObject,
+          ATTR_FLOAT_OBJECT_EDEFAULT, oldAttrFloatObjectESet));
     }
   }
 
@@ -1545,8 +1539,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrIntESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt,
-          attrInt, !oldAttrIntESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt, attrInt, !oldAttrIntESet));
     }
   }
 
@@ -1563,8 +1556,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrIntESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt,
-          ATTR_INT_EDEFAULT, oldAttrIntESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt, ATTR_INT_EDEFAULT, oldAttrIntESet));
     }
   }
 
@@ -1601,8 +1593,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrIntegerObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT,
-          oldAttrIntegerObject, attrIntegerObject, !oldAttrIntegerObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT, oldAttrIntegerObject, attrIntegerObject,
+          !oldAttrIntegerObjectESet));
     }
   }
 
@@ -1619,8 +1611,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrIntegerObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT,
-          oldAttrIntegerObject, ATTR_INTEGER_OBJECT_EDEFAULT, oldAttrIntegerObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT, oldAttrIntegerObject,
+          ATTR_INTEGER_OBJECT_EDEFAULT, oldAttrIntegerObjectESet));
     }
   }
 
@@ -1657,8 +1649,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaClassESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS,
-          oldAttrJavaClass, attrJavaClass, !oldAttrJavaClassESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS, oldAttrJavaClass, attrJavaClass,
+          !oldAttrJavaClassESet));
     }
   }
 
@@ -1675,8 +1667,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaClassESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS,
-          oldAttrJavaClass, null, oldAttrJavaClassESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS, oldAttrJavaClass, null, oldAttrJavaClassESet));
     }
   }
 
@@ -1713,8 +1705,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT,
-          oldAttrJavaObject, attrJavaObject, !oldAttrJavaObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT, oldAttrJavaObject, attrJavaObject,
+          !oldAttrJavaObjectESet));
     }
   }
 
@@ -1731,8 +1723,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT,
-          oldAttrJavaObject, ATTR_JAVA_OBJECT_EDEFAULT, oldAttrJavaObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT, oldAttrJavaObject,
+          ATTR_JAVA_OBJECT_EDEFAULT, oldAttrJavaObjectESet));
     }
   }
 
@@ -1769,8 +1761,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLongESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG, oldAttrLong,
-          attrLong, !oldAttrLongESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG, oldAttrLong, attrLong, !oldAttrLongESet));
     }
   }
 
@@ -1787,8 +1778,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLongESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG,
-          oldAttrLong, ATTR_LONG_EDEFAULT, oldAttrLongESet));
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG, oldAttrLong, ATTR_LONG_EDEFAULT, oldAttrLongESet));
     }
   }
 
@@ -1825,8 +1816,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLongObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT,
-          oldAttrLongObject, attrLongObject, !oldAttrLongObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT, oldAttrLongObject, attrLongObject,
+          !oldAttrLongObjectESet));
     }
   }
 
@@ -1843,8 +1834,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLongObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT,
-          oldAttrLongObject, ATTR_LONG_OBJECT_EDEFAULT, oldAttrLongObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT, oldAttrLongObject,
+          ATTR_LONG_OBJECT_EDEFAULT, oldAttrLongObjectESet));
     }
   }
 
@@ -1881,8 +1872,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShortESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT,
-          oldAttrShort, attrShort, !oldAttrShortESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT, oldAttrShort, attrShort, !oldAttrShortESet));
     }
   }
 
@@ -1899,8 +1889,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShortESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT,
-          oldAttrShort, ATTR_SHORT_EDEFAULT, oldAttrShortESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT, oldAttrShort, ATTR_SHORT_EDEFAULT,
+          oldAttrShortESet));
     }
   }
 
@@ -1937,8 +1927,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShortObjectESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT,
-          oldAttrShortObject, attrShortObject, !oldAttrShortObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT, oldAttrShortObject, attrShortObject,
+          !oldAttrShortObjectESet));
     }
   }
 
@@ -1955,8 +1945,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShortObjectESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT,
-          oldAttrShortObject, ATTR_SHORT_OBJECT_EDEFAULT, oldAttrShortObjectESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT, oldAttrShortObject,
+          ATTR_SHORT_OBJECT_EDEFAULT, oldAttrShortObjectESet));
     }
   }
 
@@ -1993,8 +1983,7 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrStringESet = true;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING,
-          oldAttrString, attrString, !oldAttrStringESet));
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING, oldAttrString, attrString, !oldAttrStringESet));
     }
   }
 
@@ -2011,8 +2000,8 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrStringESet = false;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING,
-          oldAttrString, ATTR_STRING_EDEFAULT, oldAttrStringESet));
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING, oldAttrString, ATTR_STRING_EDEFAULT,
+          oldAttrStringESet));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
index 3a40ca1208..f3ac1bdd24 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mongodb;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -20,5 +20,5 @@ Import-Package: com.mongodb;version="[2.0.0,3.0.0)",
  org.bson.io;version="[2.0.0,3.0.0)",
  org.bson.types;version="[2.0.0,3.0.0)",
  org.bson.util;version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.400";x-internal:=true,
- org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.400";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.500";x-internal:=true,
+ org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
index b485afdb25..8658882e10 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
@@ -101,8 +101,7 @@ public class MongoDBInitialTest extends AbstractCDOTest
     msg("Getting resource");
     resource = transaction.getResource(getResourcePath("/test1"), true);
     assertNotNull(resource);
-    assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")),
-        resource.getURI());
+    assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), resource.getURI());
     assertEquals(transaction.getResourceSet(), resource.getResourceSet());
     assertEquals(1, transaction.getResourceSet().getResources().size());
     assertEquals(CDOState.CLEAN, resource.cdoState());
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
index 9f46331def..49b82ba483 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
@@ -57,8 +57,7 @@ public class CDOSessionsViewTest extends AbstractCDOUITest<SWTWorkbenchBot>
     assertInstanceOf(CDOSessionsView.class, view);
 
     // activeView.toolbarButton(OpenSessionDialog.TITLE).click();
-    activeView.toolbarButton(org.eclipse.emf.cdo.internal.ui.messages.Messages.getString("OpenSessionAction.0"))
-        .click();
+    activeView.toolbarButton(org.eclipse.emf.cdo.internal.ui.messages.Messages.getString("OpenSessionAction.0")).click();
 
     SWTBotShell openSessionDialog = getBot().shell("Open Session");
     openSessionDialog.activate();
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
index 25e1f12044..c34896d50d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
@@ -386,7 +386,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
index 7f0a47401b..246833ecc7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.uml;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.2.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[4.0.0,6.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.300"
+Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.400"
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
index 2b7af1adde..0515b3cac5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
@@ -40,8 +40,7 @@ import org.eclipse.uml2.uml.resource.UMLResource;
 @Requires(ModelConfig.CAPABILITY_LEGACY)
 public class DynamicProfileTest extends AbstractCDOTest
 {
-  private final EPackage stuffPackage = EPackage.Registry.INSTANCE
-      .getEPackage("http://www.eclipse.org/cdo/tests/schema/stuff/1.0");
+  private final EPackage stuffPackage = EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/cdo/tests/schema/stuff/1.0");
 
   private final EFactory originalStuffFactory = stuffPackage.getEFactoryInstance();
 
@@ -94,8 +93,7 @@ public class DynamicProfileTest extends AbstractCDOTest
 
     // verify that using the UML API to access the applied stereotype works as usual
     assertEquals("Stereotype doesn't appear to be applied.", true, aClass.isStereotypeApplied(conceptStereotype));
-    assertEquals("Wrong stereotype EClass.",
-        transaction.getResourceSet().getPackageRegistry().getEPackage(MY_PROFILE_URI).getEClassifier(S_CONCEPT),
+    assertEquals("Wrong stereotype EClass.", transaction.getResourceSet().getPackageRegistry().getEPackage(MY_PROFILE_URI).getEClassifier(S_CONCEPT),
         aClass.getStereotypeApplication(conceptStereotype).eClass());
   }
 
@@ -154,8 +152,7 @@ public class DynamicProfileTest extends AbstractCDOTest
 
     // don't have the version of UML2 API that fixes problems in name-based look-up of stereotypes.
     // The main point is that commit didn't fail on unresolved proxies in the Ecore definition
-    assertSame("Wrong base element reference.", aClass,
-        stereotypeApplication.eGet(stereotypeApplication.eClass().getEStructuralFeature("base_Classifier")));
+    assertSame("Wrong base element reference.", aClass, stereotypeApplication.eGet(stereotypeApplication.eClass().getEStructuralFeature("base_Classifier")));
   }
 
   //
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/LegacyDynamicPackageTest.java b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/LegacyDynamicPackageTest.java
index 2ed0cea8b1..cd7d43c714 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/LegacyDynamicPackageTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/LegacyDynamicPackageTest.java
@@ -37,8 +37,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 @Requires(ModelConfig.CAPABILITY_LEGACY)
 public class LegacyDynamicPackageTest extends AbstractCDOTest
 {
-  private final EPackage stuffPackage = EPackage.Registry.INSTANCE
-      .getEPackage("http://www.eclipse.org/cdo/tests/schema/stuff/1.0");
+  private final EPackage stuffPackage = EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/cdo/tests/schema/stuff/1.0");
 
   private final EFactory originalStuffFactory = stuffPackage.getEFactoryInstance();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
index e7354c459c..c5664049f9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -396,7 +396,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
index 3ff9f15551..80f611cb87 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
@@ -92,8 +92,8 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
     }
 
     // Obtain or create and register package
-    BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BasePackageImpl());
+    BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BasePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BasePackageImpl());
 
     isInited = true;
 
@@ -253,23 +253,20 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
 
     // Initialize classes and features; add operations and parameters
     initEClass(baseClassEClass, BaseClass.class, "BaseClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBaseClass_Couter(), ecorePackage.getEInt(), "couter", null, 0, 1, BaseClass.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBaseClass_Couter(), ecorePackage.getEInt(), "couter", null, 0, 1, BaseClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(baseClassEClass, null, "increment", 0, 1, IS_UNIQUE, IS_ORDERED);
 
     initEClass(documentEClass, Document.class, "Document", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDocument_Root(), getElement(), null, "root", null, 0, 1, Document.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getDocument_Root(), getElement(), null, "root", null, 0, 1, Document.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(elementEClass, Element.class, "Element", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getElement_Subelements(), getElement(), getElement_Parent(), "subelements", null, 0, -1,
-        Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getElement_Parent(), getElement(), getElement_Subelements(), "parent", null, 0, 1, Element.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getElement_Subelements(), getElement(), getElement_Parent(), "subelements", null, 0, -1, Element.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getElement_Parent(), getElement(), getElement_Subelements(), "parent", null, 0, 1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
index 99a637adc9..f266ffd6c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java
@@ -36,8 +36,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory
   {
     try
     {
-      DerivedFactory theDerivedFactory = (DerivedFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.fernuni-hagen.de/ST/dummy/derived.ecore");
+      DerivedFactory theDerivedFactory = (DerivedFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.fernuni-hagen.de/ST/dummy/derived.ecore");
       if (theDerivedFactory != null)
       {
         return theDerivedFactory;
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
index d026b5b25a..887a298bb8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
@@ -78,9 +78,8 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
     }
 
     // Obtain or create and register package
-    DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new DerivedPackageImpl());
+    DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DerivedPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DerivedPackageImpl());
 
     isInited = true;
 
@@ -183,8 +182,7 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
     derivedClassEClass.getESuperTypes().add(theBasePackage.getBaseClass());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(derivedClassEClass, DerivedClass.class, "DerivedClass", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
+    initEClass(derivedClassEClass, DerivedClass.class, "DerivedClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     addEOperation(derivedClassEClass, null, "decrement", 0, 1, IS_UNIQUE, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
index 35d9cc7c11..5c73f89849 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfaceFactoryImpl.java
@@ -35,8 +35,7 @@ public class InterfaceFactoryImpl extends EFactoryImpl implements InterfaceFacto
   {
     try
     {
-      InterfaceFactory theInterfaceFactory = (InterfaceFactory)EPackage.Registry.INSTANCE
-          .getEFactory("uuid://interface");
+      InterfaceFactory theInterfaceFactory = (InterfaceFactory)EPackage.Registry.INSTANCE.getEFactory("uuid://interface");
       if (theInterfaceFactory != null)
       {
         return theInterfaceFactory;
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
index 26800c43ca..c18ea16293 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
@@ -78,9 +78,8 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
     }
 
     // Obtain or create and register package
-    InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new InterfacePackageImpl());
+    InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InterfacePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InterfacePackageImpl());
 
     isInited = true;
 
@@ -187,10 +186,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(iInterfaceEClass, IInterface.class, "IInterface", IS_ABSTRACT, IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIInterface_Test(), ecorePackage.getEString(), "test", null, 0, 1, IInterface.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(iInterfaceEClass, IInterface.class, "IInterface", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIInterface_Test(), ecorePackage.getEString(), "test", null, 0, 1, IInterface.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/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
index 377c5075db..1e865e7a7d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
@@ -36,8 +36,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
   {
     try
     {
-      ReferenceFactory theReferenceFactory = (ReferenceFactory)EPackage.Registry.INSTANCE
-          .getEFactory("uuid://reference");
+      ReferenceFactory theReferenceFactory = (ReferenceFactory)EPackage.Registry.INSTANCE.getEFactory("uuid://reference");
       if (theReferenceFactory != null)
       {
         return theReferenceFactory;
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
index 1652cd197e..f2f29b8a05 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
@@ -79,9 +79,8 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
     }
 
     // Obtain or create and register package
-    ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new ReferencePackageImpl());
+    ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferencePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReferencePackageImpl());
 
     isInited = true;
 
@@ -185,8 +184,7 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    InterfacePackage theInterfacePackage = (InterfacePackage)EPackage.Registry.INSTANCE
-        .getEPackage(InterfacePackage.eNS_URI);
+    InterfacePackage theInterfacePackage = (InterfacePackage)EPackage.Registry.INSTANCE.getEPackage(InterfacePackage.eNS_URI);
 
     // Create type parameters
 
@@ -196,9 +194,8 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
 
     // Initialize classes and features; add operations and parameters
     initEClass(referenceEClass, Reference.class, "Reference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReference_Ref(), theInterfacePackage.getIInterface(), null, "ref", null, 0, 1, Reference.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getReference_Ref(), theInterfacePackage.getIInterface(), null, "ref", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
index 330f3cd70e..16fcbd2cad 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
@@ -379,14 +379,12 @@ public abstract class AbstractCDOTest extends ConfigTest
     }
   }
 
-  protected static CDOCommitInfo commitAndSync(CDOTransaction transaction, CDOUpdatable... updatables)
-      throws CommitException
+  protected static CDOCommitInfo commitAndSync(CDOTransaction transaction, CDOUpdatable... updatables) throws CommitException
   {
     return commitAndSync(transaction, null, updatables);
   }
 
-  protected static CDOCommitInfo commitAndSync(CDOTransaction transaction, String comment, CDOUpdatable... updatables)
-      throws CommitException
+  protected static CDOCommitInfo commitAndSync(CDOTransaction transaction, String comment, CDOUpdatable... updatables) throws CommitException
   {
     final RuntimeException[] exception = { null };
     IListener listener = new IListener()
@@ -426,8 +424,7 @@ public abstract class AbstractCDOTest extends ConfigTest
           {
             if (exception[0] == null)
             {
-              exception[0] = new TimeoutRuntimeException(
-                  updatable.toString() + " did not receive an update of " + info);
+              exception[0] = new TimeoutRuntimeException(updatable.toString() + " did not receive an update of " + info);
             }
 
             break;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java
index e88e725d65..300195de85 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java
@@ -104,8 +104,8 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest
     return false;
   }
 
-  protected static void checkEvent(final TestListener listener, final int newPackageUnits, final int newObjects,
-      final int changedObjects, final int detachedObjects) throws InterruptedException
+  protected static void checkEvent(final TestListener listener, final int newPackageUnits, final int newObjects, final int changedObjects,
+      final int detachedObjects) throws InterruptedException
   {
     try
     {
@@ -129,8 +129,7 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest
             }
           }
 
-          return counts[0] >= newPackageUnits && counts[1] >= newObjects && counts[2] >= changedObjects
-              && counts[3] >= detachedObjects;
+          return counts[0] >= newPackageUnits && counts[1] >= newObjects && counts[2] >= changedObjects && counts[3] >= detachedObjects;
         }
       }.assertNoTimeOut();
 
@@ -161,14 +160,12 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest
     }
   }
 
-  protected static void checkRevision(CDORevision revision, CDOBranch branch,
-      Map<CDOBranch, List<CDORevision>> allRevisions, String location)
+  protected static void checkRevision(CDORevision revision, CDOBranch branch, Map<CDOBranch, List<CDORevision>> allRevisions, String location)
   {
     List<CDORevision> revisions = allRevisions.get(branch);
     for (CDORevision rev : revisions)
     {
-      if (rev.getID() == revision.getID() && rev.getBranch().getID() == revision.getBranch().getID()
-          && rev.getVersion() == revision.getVersion())
+      if (rev.getID() == revision.getID() && rev.getBranch().getID() == revision.getBranch().getID() && rev.getVersion() == revision.getVersion())
       {
         return;
       }
@@ -177,8 +174,7 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest
     fail("Revision missing from " + location + ": " + revision);
   }
 
-  protected static void checkRevisions(InternalRepository repository, long timeStamp, int expectedRevisions)
-      throws InterruptedException
+  protected static void checkRevisions(InternalRepository repository, long timeStamp, int expectedRevisions) throws InterruptedException
   {
     long lastCommitTimeStamp = repository.getLastCommitTimeStamp();
     while (lastCommitTimeStamp < timeStamp)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index 163c929ecf..9b65265207 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -548,17 +548,13 @@ public class AttributeTest extends AbstractCDOTest
 
     assertEquals(true, points.containsAll(points));
 
-    assertEquals(true, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
-    assertEquals(true,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
 
-    assertEquals(false, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
-    assertEquals(false,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(0, 0) })));
 
@@ -570,17 +566,13 @@ public class AttributeTest extends AbstractCDOTest
     points = polygon.getPoints();
     assertEquals(true, points.containsAll(points));
 
-    assertEquals(true, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
-    assertEquals(true,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
 
-    assertEquals(false, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
-    assertEquals(false,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(0, 0) })));
 
@@ -589,17 +581,13 @@ public class AttributeTest extends AbstractCDOTest
     points = polygon.getPoints();
     assertEquals(true, points.containsAll(points));
 
-    assertEquals(true, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
-    assertEquals(true,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
 
-    assertEquals(false, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
-    assertEquals(false,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(0, 0) })));
 
@@ -612,17 +600,13 @@ public class AttributeTest extends AbstractCDOTest
     points = polygon.getPoints();
     assertEquals(true, points.containsAll(points));
 
-    assertEquals(true, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
-    assertEquals(true,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
+    assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(9, 0) })));
     assertEquals(true, points.containsAll(Arrays.asList(new Point[] { new Point(9, 0) })));
 
-    assertEquals(false, points.containsAll(
-        Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
-    assertEquals(false,
-        points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(3, 4), new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
+    assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(5, 6), new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(7, 8), new Point(0, 0) })));
     assertEquals(false, points.containsAll(Arrays.asList(new Point[] { new Point(0, 0) })));
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
index 77f5f03b04..2fd8b7c5ab 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
@@ -305,8 +305,7 @@ public class BranchingTest extends AbstractCDOTest
     assertEquals(mainBranch.getBasePath(), new CDOBranchPoint[] { mainBranch.getBase() });
     assertEquals(testing1.getBasePath(), new CDOBranchPoint[] { mainBranch.getBase(), testing1.getBase() });
     assertEquals(testing2.getBasePath(), new CDOBranchPoint[] { mainBranch.getBase(), testing2.getBase() });
-    assertEquals(subsub.getBasePath(),
-        new CDOBranchPoint[] { mainBranch.getBase(), testing1.getBase(), subsub.getBase() });
+    assertEquals(subsub.getBasePath(), new CDOBranchPoint[] { mainBranch.getBase(), testing1.getBase(), subsub.getBase() });
     session.close();
   }
 
@@ -995,20 +994,19 @@ public class BranchingTest extends AbstractCDOTest
     final List<CDORevision> revisions = new ArrayList<CDORevision>();
 
     CDOSessionProtocol sessionProtocol = ((InternalCDOSession)session).getSessionProtocol();
-    sessionProtocol.handleRevisions(null, subBranch, false, CDOBranchPoint.UNSPECIFIED_DATE, false,
-        new CDORevisionHandler()
+    sessionProtocol.handleRevisions(null, subBranch, false, CDOBranchPoint.UNSPECIFIED_DATE, false, new CDORevisionHandler()
+    {
+      public boolean handleRevision(CDORevision revision)
+      {
+        if (revision.getEClass() == getModel1Package().getProduct1())
         {
-          public boolean handleRevision(CDORevision revision)
-          {
-            if (revision.getEClass() == getModel1Package().getProduct1())
-            {
-              fail("Product1 has been detached and should not be passed in here");
-            }
-
-            revisions.add(revision);
-            return true;
-          }
-        });
+          fail("Product1 has been detached and should not be passed in here");
+        }
+
+        revisions.add(revision);
+        return true;
+      }
+    });
 
     assertEquals(3, revisions.size());
   }
@@ -1251,8 +1249,7 @@ public class BranchingTest extends AbstractCDOTest
     System.out.println();
     System.out.println();
     System.out.println(label);
-    System.out
-        .println("===============================================================================================");
+    System.out.println("===============================================================================================");
     CDORevisionUtil.dumpAllRevisions(revisions, System.out);
     System.out.println();
     System.out.println();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
index 48a1895f43..42d8e7c6a6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
@@ -70,8 +70,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
 
     final CDOTransaction transaction2 = session.openTransaction();
 
-    final Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
     category1B.setName("CHANGED NAME");
     assertEquals(0, adapter.getNotifications().length);
 
@@ -134,8 +133,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
 
     final CDOTransaction transaction2 = session.openTransaction();
 
-    final Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
     category1B.setName("CHANGED NAME");
     assertEquals(0, adapter.getNotifications().length);
 
@@ -197,8 +195,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
     CDOSession session2 = openSession();
     CDOTransaction transaction2 = session2.openTransaction();
 
-    Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
     category1B.setName("CHANGED NAME");
     assertEquals(0, adapter.getNotifications().length);
 
@@ -259,8 +256,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
     CDOSession session2 = openSession();
     CDOTransaction transaction2 = session2.openTransaction();
 
-    Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
     category1B.setName("CHANGED NAME");
     assertEquals(0, adapter.getNotifications().length);
 
@@ -338,8 +334,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
     final CDOTransaction transaction2 = session2.openTransaction();
     transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
 
-    final Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
 
     msg("Changing name");
     category1B.setName("CHANGED NAME");
@@ -406,10 +401,8 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
     final CDOSession session2 = openSession();
     final CDOTransaction transaction2 = session2.openTransaction();
 
-    final Category category1B = (Category)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
-    final Company company1B = (Company)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
+    final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true));
+    final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
 
     msg("Changing name");
     category1B.setName("CHANGED NAME");
@@ -496,8 +489,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
     final CDOSession session2 = openSession();
     final CDOTransaction transaction2 = session2.openTransaction();
 
-    final Company company1B = (Company)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
+    final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true));
 
     msg("Changing name");
     company1B.setName("TEST1");
@@ -603,8 +595,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
       {
         for (Notification notification : adapter.getNotifications())
         {
-          if (notification.getEventType() == Notification.REMOVE
-              && notification.getFeature() == getModel1Package().getCompany_Categories())
+          if (notification.getEventType() == Notification.REMOVE && notification.getFeature() == getModel1Package().getCompany_Categories())
           {
             oldValue[0] = notification.getOldValue();
             return true;
@@ -739,8 +730,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest
       {
         for (Notification notification : adapter.getNotifications())
         {
-          if (notification.getEventType() == Notification.REMOVE
-              && notification.getFeature() == getModel1Package().getProduct1_OrderDetails())
+          if (notification.getEventType() == Notification.REMOVE && notification.getFeature() == getModel1Package().getProduct1_OrderDetails())
           {
             oldValue[0] = notification.getOldValue();
             return true;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
index 032c6ecb55..86314759e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
@@ -104,8 +104,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -147,8 +146,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -169,8 +167,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
 
     List<CDOCommitInfo> infos = handler.getInfos();
 
@@ -193,8 +190,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -211,8 +207,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -226,8 +221,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -252,8 +246,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -275,9 +268,8 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(
-        getRepository().getBranchManager().getBranch(transaction.getBranch().getID()), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(getRepository().getBranchManager().getBranch(transaction.getBranch().getID()),
+        CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -299,9 +291,8 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(
-        getRepository().getBranchManager().getBranch(transaction.getBranch().getID()), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(getRepository().getBranchManager().getBranch(transaction.getBranch().getID()),
+        CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -322,9 +313,8 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(
-        getRepository().getBranchManager().getBranch(transaction.getBranch().getID()), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(getRepository().getBranchManager().getBranch(transaction.getBranch().getID()),
+        CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(1, infos.size());
@@ -341,8 +331,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -356,8 +345,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(
-        getRepository(REPO_NAME).getBranchManager().getBranch(transaction.getBranch().getID()),
+    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(getRepository(REPO_NAME).getBranchManager().getBranch(transaction.getBranch().getID()),
         CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
@@ -383,9 +371,8 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(
-        getRepository().getBranchManager().getBranch(transaction.getBranch().getID()), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(getRepository().getBranchManager().getBranch(transaction.getBranch().getID()),
+        CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -406,8 +393,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -427,8 +413,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -449,8 +434,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -464,8 +448,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -480,8 +463,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository(REPO_NAME).getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -504,8 +486,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    getRepository().getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -523,8 +504,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -564,8 +544,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -586,8 +565,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -603,8 +581,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -616,8 +593,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -639,8 +615,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -659,8 +634,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -679,8 +653,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -699,8 +672,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(1, infos.size());
@@ -716,8 +688,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -729,8 +700,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -752,8 +722,7 @@ public class CommitInfoTest extends AbstractCDOTest
     CDOCommitInfo commitInfo = transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(transaction.getBranch(), CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(2, infos.size()); // Initial root resource commit + 1
@@ -772,8 +741,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -791,8 +759,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -811,8 +778,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -826,8 +792,7 @@ public class CommitInfoTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
 
@@ -840,8 +805,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -862,8 +826,7 @@ public class CommitInfoTest extends AbstractCDOTest
     transaction.commit();
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(wrong, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
     List<CDOCommitInfo> infos = handler.getInfos();
 
     assertEquals(0, infos.size());
@@ -887,8 +850,7 @@ public class CommitInfoTest extends AbstractCDOTest
     }
 
     Handler handler = new Handler();
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, handler);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, handler);
 
     List<CDOCommitInfo> infos = handler.getInfos();
 
@@ -986,8 +948,7 @@ public class CommitInfoTest extends AbstractCDOTest
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     TextCommitInfoLog log = new TextCommitInfoLog(baos);
 
-    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE,
-        CDOBranchPoint.UNSPECIFIED_DATE, log);
+    session.getCommitInfoManager().getCommitInfos(null, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, log);
 
     System.out.println(baos.toString());
   }
@@ -1000,13 +961,11 @@ public class CommitInfoTest extends AbstractCDOTest
 
     getRepository().addHandler(new IRepository.WriteAccessHandler()
     {
-      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor) throws RuntimeException
+      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
       {
       }
 
-      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor)
+      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
       {
         log.handleCommitInfo(commitContext.createCommitInfo());
       }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitPerformanceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitPerformanceTest.java
index 6ca235010e..5809faebe9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitPerformanceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitPerformanceTest.java
@@ -104,8 +104,7 @@ public class CommitPerformanceTest extends AbstractCDOTest
         {
           Product1 product = getModel1Factory().createProduct1();
           product.setName("Awesome Product " + i + "/" + j + "/" + k);
-          product
-              .setDescription("This descriptive text is the same for all products in all categories of all companies.");
+          product.setDescription("This descriptive text is the same for all products in all categories of all companies.");
           product.setVat(VAT.VAT15);
           category.getProducts().add(product);
         }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
index e54e1ccf73..88068417c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
@@ -511,8 +511,7 @@ public class ComplexTest extends AbstractCDOTest
 
     assertEquals(element0_, container.getElement());
     assertEquals(container, element0_.getParent());
-    assertEquals("IfcimplSingleNonContainedBidirectional-Element-0",
-        ((ImplSingleRefNonContainedElement)element0_).getName());
+    assertEquals("IfcimplSingleNonContainedBidirectional-Element-0", ((ImplSingleRefNonContainedElement)element0_).getName());
     assertEquals(resource1, container.eResource());
     assertEquals(resource1, element0_.eResource());
 
@@ -569,10 +568,8 @@ public class ComplexTest extends AbstractCDOTest
     assertEquals(element1_, container.getElements().get(1));
     assertEquals(container, element0_.getParent());
     assertEquals(container, element1_.getParent());
-    assertEquals("IfcimplMultiNonContainedBidirectional-Element-0",
-        ((ImplMultiRefNonContainedElement)element0_).getName());
-    assertEquals("IfcimplMultiNonContainedBidirectional-Element-1",
-        ((ImplMultiRefNonContainedElement)element1_).getName());
+    assertEquals("IfcimplMultiNonContainedBidirectional-Element-0", ((ImplMultiRefNonContainedElement)element0_).getName());
+    assertEquals("IfcimplMultiNonContainedBidirectional-Element-1", ((ImplMultiRefNonContainedElement)element1_).getName());
     assertEquals(resource1, container.eResource());
     assertEquals(resource1, element0_.eResource());
     assertEquals(resource1, element1_.eResource());
@@ -935,8 +932,7 @@ public class ComplexTest extends AbstractCDOTest
 
     assertEquals(element0_, container.getElement());
     assertEquals(container, element0_.getParent());
-    assertEquals("CrossResourceIfcimplSingleNonContainedBidirectional-Element-0",
-        ((ImplSingleRefNonContainedElement)element0_).getName());
+    assertEquals("CrossResourceIfcimplSingleNonContainedBidirectional-Element-0", ((ImplSingleRefNonContainedElement)element0_).getName());
     assertEquals(resource1, container.eResource());
     assertEquals(resource2, element0_.eResource());
 
@@ -970,10 +966,8 @@ public class ComplexTest extends AbstractCDOTest
     assertEquals(element1_, container.getElements().get(1));
     assertEquals(container, element0_.getParent());
     assertEquals(container, element1_.getParent());
-    assertEquals("CrossResourceIfcimplMultiNonContainedBidirectional-Element-0",
-        ((ImplMultiRefNonContainedElement)element0_).getName());
-    assertEquals("CrossResourceIfcimplMultiNonContainedBidirectional-Element-1",
-        ((ImplMultiRefNonContainedElement)element1_).getName());
+    assertEquals("CrossResourceIfcimplMultiNonContainedBidirectional-Element-0", ((ImplMultiRefNonContainedElement)element0_).getName());
+    assertEquals("CrossResourceIfcimplMultiNonContainedBidirectional-Element-1", ((ImplMultiRefNonContainedElement)element1_).getName());
     assertEquals(resource1, container.eResource());
     assertEquals(resource2, element0_.eResource());
     assertEquals(resource2, element1_.eResource());
@@ -1001,8 +995,7 @@ public class ComplexTest extends AbstractCDOTest
     IContainedElementNoParentLink element0_ = (IContainedElementNoParentLink)resource2.getContents().get(0);
 
     assertEquals(element0_, container.getElement());
-    assertEquals("CrossResourceIfcimplSingleNonContainedUnidirectional-Element-0",
-        ((INamedElement)element0_).getName());
+    assertEquals("CrossResourceIfcimplSingleNonContainedUnidirectional-Element-0", ((INamedElement)element0_).getName());
     assertEquals(resource1, container.eResource());
     assertEquals(resource2, element0_.eResource());
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
index 51a66e0143..385c15e924 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
@@ -392,8 +392,7 @@ public class ContainmentTest extends AbstractCDOTest
     assertEquals(resource1.getContents().get(0), order.eContainer());
     resource2.getContents().remove(order);
 
-    Order order2 = (Order)CDOUtil
-        .getEObject((EObject)container.eGet(container.eClass().getEStructuralFeature("proxyElement")));
+    Order order2 = (Order)CDOUtil.getEObject((EObject)container.eGet(container.eClass().getEStructuralFeature("proxyElement")));
     assertSame(order, order2);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
index 945a21514c..8452712d64 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
@@ -100,8 +100,7 @@ public class EMFCompareTest extends AbstractCDOTest
     company.setName("Eclipse");
     transaction.commit();
 
-    Comparison comparison = CDOCompareUtil.compare(CDOUtil.getCDOObject(transaction.getRootResource()),
-        session.openView(commit2), null);
+    Comparison comparison = CDOCompareUtil.compare(CDOUtil.getCDOObject(transaction.getRootResource()), session.openView(commit2), null);
     dump(comparison);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
index efc1eb61e5..4db5bd3da0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFComplianceTest.java
@@ -35,8 +35,7 @@ public class EMFComplianceTest extends AbstractOMTest
 
     assertEquals(EresourcePackage.eINSTANCE.getCDOResource_ResourceSet(),
         EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__RESOURCE_SET));
-    assertEquals(EresourcePackage.eINSTANCE.getCDOResource_URI(),
-        EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__URI));
+    assertEquals(EresourcePackage.eINSTANCE.getCDOResource_URI(), EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__URI));
     assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Contents(),
         EresourcePackage.eINSTANCE.getCDOResource().getEStructuralFeature(Resource.RESOURCE__CONTENTS));
     assertEquals(EresourcePackage.eINSTANCE.getCDOResource_Modified(),
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java
index 085f4c060c..9f3079780e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java
@@ -472,8 +472,7 @@ public class IndexReconstructionTest extends AbstractCDOTest
           int[] indices = ((CDOListFeatureDeltaImpl)featureDelta).reconstructAddedIndices().getElement2();
           for (int i = 1; i <= indices[0]; i++)
           {
-            ReconstructedIndex expectedIndex = new ReconstructedIndex(revisionDelta.getID(), featureDelta.getFeature(),
-                indices[i]);
+            ReconstructedIndex expectedIndex = new ReconstructedIndex(revisionDelta.getID(), featureDelta.getFeature(), indices[i]);
             if (!expectedIndices.remove(expectedIndex))
             {
               System.out.println("Reconstructed but not expected ids: " + expectedIndex);
@@ -535,8 +534,7 @@ public class IndexReconstructionTest extends AbstractCDOTest
     @Override
     public String toString()
     {
-      return MessageFormat.format("{0}: {1}.{2}={3}", id, feature.getEContainingClass().getName(), feature.getName(),
-          index);
+      return MessageFormat.format("{0}: {1}.{2}={3}", id, feature.getEContainingClass().getName(), feature.getName(), index);
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
index e08903a806..8d70a93cfa 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
@@ -173,8 +173,7 @@ public class InitialTest extends AbstractCDOTest
     supplier.setName("Stepper");
     resource.getContents().add(supplier);
 
-    assertEquals("Stepper",
-        CDOUtil.getCDOObject(supplier).cdoRevision().data().get(getModel1Package().getAddress_Name(), 0));
+    assertEquals("Stepper", CDOUtil.getCDOObject(supplier).cdoRevision().data().get(getModel1Package().getAddress_Name(), 0));
 
     CDOCommitInfo commit = transaction.commit();
     assertEquals(CDOState.CLEAN, resource.cdoState());
@@ -284,8 +283,7 @@ public class InitialTest extends AbstractCDOTest
       CDOTransaction transaction = session.openTransaction();
       CDOResource resource = transaction.getResource(getResourcePath("/test1"), true);
       assertNotNull(resource);
-      assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")),
-          resource.getURI());
+      assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), resource.getURI());
       assertEquals(transaction.getResourceSet(), resource.getResourceSet());
       assertEquals(1, transaction.getResourceSet().getResources().size());
       assertEquals(transaction, resource.cdoView());
@@ -299,11 +297,9 @@ public class InitialTest extends AbstractCDOTest
 
     {
       CDOTransaction transaction = session.openTransaction();
-      CDOResource resource = (CDOResource)transaction.getResourceSet()
-          .getResource(CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
+      CDOResource resource = (CDOResource)transaction.getResourceSet().getResource(CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
       assertNotNull(resource);
-      assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")),
-          resource.getURI());
+      assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), resource.getURI());
       assertEquals(transaction.getResourceSet(), resource.getResourceSet());
       assertEquals(1, transaction.getResourceSet().getResources().size());
       assertEquals(transaction, resource.cdoView());
@@ -471,8 +467,7 @@ public class InitialTest extends AbstractCDOTest
     OrderAddress orderAddress = getModel1Factory().createOrderAddress();
     resource.getContents().add(orderAddress);
 
-    assertEquals(getModel1Package().getAddress_City().getFeatureID(),
-        getModel1Package().getOrderDetail_Price().getFeatureID());
+    assertEquals(getModel1Package().getAddress_City().getFeatureID(), getModel1Package().getOrderDetail_Price().getFeatureID());
 
     orderAddress.setCity("ALLO");
     orderAddress.setPrice(2.8f);
@@ -495,8 +490,7 @@ public class InitialTest extends AbstractCDOTest
     session = openSession();
     transaction = session.openTransaction();
 
-    orderAddress = (OrderAddress)CDOUtil
-        .getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
+    orderAddress = (OrderAddress)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
     assertEquals(2.8f, orderAddress.getPrice());
     assertEquals("ALLO", orderAddress.getCity());
 
@@ -507,8 +501,7 @@ public class InitialTest extends AbstractCDOTest
     session = openSession();
 
     transaction = session.openTransaction();
-    orderAddress = (OrderAddress)CDOUtil
-        .getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
+    orderAddress = (OrderAddress)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
 
     assertEquals(2.8f, orderAddress.getPrice());
     assertEquals("ALLO", orderAddress.getCity());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
index f155344bc3..02597ece18 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
@@ -827,10 +827,8 @@ public class InvalidationTest extends AbstractCDOTest
     if (isRemoveRevision)
     {
       clearCache(getRepository().getRevisionManager());
-      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(),
-          resourceA.cdoRevision().getBranch().getVersion(1));
-      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(),
-          resourceA.cdoRevision().getBranch().getVersion(2));
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(), resourceA.cdoRevision().getBranch().getVersion(1));
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(), resourceA.cdoRevision().getBranch().getVersion(2));
     }
 
     assertEquals(0, testAdapter.getNotifications().length);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java
index f7e3dfe4c6..90dcd97b2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java
@@ -258,8 +258,7 @@ public class LockingNotificationsTest extends AbstractLockingTest
     session.close();
   }
 
-  private void withExplicitRelease(CDOSession session1, CDOView controlView, boolean mustReceiveNotifications)
-      throws CommitException
+  private void withExplicitRelease(CDOSession session1, CDOView controlView, boolean mustReceiveNotifications) throws CommitException
   {
     TestListener2 controlViewListener = new TestListener2(CDOViewLocksChangedEvent.class);
     controlView.addListener(controlViewListener);
@@ -392,8 +391,7 @@ public class LockingNotificationsTest extends AbstractLockingTest
     }
   }
 
-  private void withAutoRelease(CDOSession session, CDOView controlView, boolean mustReceiveNotifications)
-      throws CommitException
+  private void withAutoRelease(CDOSession session, CDOView controlView, boolean mustReceiveNotifications) throws CommitException
   {
     TestListener2 controlViewListener = new TestListener2(CDOViewLocksChangedEvent.class);
     controlView.addListener(controlViewListener);
@@ -413,8 +411,8 @@ public class LockingNotificationsTest extends AbstractLockingTest
     implicitRelease(company, LockType.OPTION, transaction, controlViewListener, mustReceiveNotifications);
   }
 
-  private void implicitRelease(Company company, LockType type, CDOTransaction transaction,
-      TestListener2 controlViewListener, boolean mustReceiveNotifications) throws CommitException
+  private void implicitRelease(Company company, LockType type, CDOTransaction transaction, TestListener2 controlViewListener, boolean mustReceiveNotifications)
+      throws CommitException
   {
     CDOViewLocksChangedEvent event;
     CDOObject cdoCompany = CDOUtil.getCDOObject(company);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java
index aa20fed8f1..20c375a711 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java
@@ -283,8 +283,7 @@ public class Locking_SequenceWithChildListTest_DISABLED extends AbstractLockingT
         if (now - start > timeout)
         {
           System.out.println();
-          System.out.println(
-              getName() + " is taking more time than required : " + (now - start) + " ms > " + timeout + " ms.");
+          System.out.println(getName() + " is taking more time than required : " + (now - start) + " ms > " + timeout + " ms.");
         }
 
         try
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java
index 47b22379b8..c1f9825ebf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java
@@ -127,8 +127,7 @@ public class MapTest extends AbstractCDOTest
     objects.put("address2", getModel1Factory().createAddress());
     objects.put("address3", getModel1Factory().createAddress());
 
-    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_StringToAddressContainmentMap(),
-        objects, null);
+    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_StringToAddressContainmentMap(), objects, null);
   }
 
   public void testStringToAddressReferenceMap() throws Exception
@@ -139,8 +138,7 @@ public class MapTest extends AbstractCDOTest
     objects.put("address2", getModel1Factory().createAddress());
     objects.put("address3", getModel1Factory().createAddress());
 
-    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_StringToAddressReferenceMap(),
-        objects, null);
+    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_StringToAddressReferenceMap(), objects, null);
   }
 
   public void testEObjectToEObjectMap() throws Exception
@@ -162,8 +160,7 @@ public class MapTest extends AbstractCDOTest
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
 
-    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectKeyContainedMap(),
-        objects, null);
+    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectKeyContainedMap(), objects, null);
   }
 
   public void testEObjectToEObjectValueContainedMap() throws Exception
@@ -174,8 +171,7 @@ public class MapTest extends AbstractCDOTest
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
 
-    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectValueContainedMap(),
-        objects, null);
+    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectValueContainedMap(), objects, null);
   }
 
   public void testEObjectToEObjectBothContainedMap() throws Exception
@@ -186,8 +182,7 @@ public class MapTest extends AbstractCDOTest
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
     objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail());
 
-    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectBothContainedMap(),
-        objects, null);
+    testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectBothContainedMap(), objects, null);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
index 06bd47064d..dca34d8956 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
@@ -186,8 +186,7 @@ public class MergingTest extends AbstractCDOTest
     CDOCommitInfo commitInfo1 = transaction.commit();
 
     // Remerge from source1.
-    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo1.getTimeStamp()),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo1.getTimeStamp()), new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
@@ -261,8 +260,7 @@ public class MergingTest extends AbstractCDOTest
     assertEquals(1, ((CDORevision)commitInfo1.getNewObjects().get(0)).getVersion());
 
     // Remerge from source1.
-    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo1.getTimeStamp()),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo1.getTimeStamp()), new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
@@ -333,8 +331,7 @@ public class MergingTest extends AbstractCDOTest
     assertEquals(1, ((CDORevision)commitInfo2.getNewObjects().get(0)).getVersion());
 
     // Remerge from source2.
-    CDOChangeSetData check = transaction.merge(source2.getHead(), source2.getPoint(commitInfo2.getTimeStamp()),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source2.getHead(), source2.getPoint(commitInfo2.getTimeStamp()), new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
@@ -393,8 +390,7 @@ public class MergingTest extends AbstractCDOTest
     long now = transaction.commit().getTimeStamp();
 
     // Remerge from source2.
-    CDOChangeSetData check = transaction.merge(source2.getHead(), source2.getPoint(now),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source2.getHead(), source2.getPoint(now), new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
@@ -643,8 +639,7 @@ public class MergingTest extends AbstractCDOTest
     addCompany(sourceContents);
     long sourceCommit1 = commitAndSync(sourceTx, transaction).getTimeStamp();
 
-    CDOChangeSetData check1 = transaction.merge(source.getHead(), source.getBase(),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check1 = transaction.merge(source.getHead(), source.getBase(), new DefaultCDOMerger.PerFeature.ManyValued());
     long mainCommit1 = transaction.commit().getTimeStamp();
     assertEquals(1, check1.getNewObjects().size());
     assertEquals(1, check1.getChangedObjects().size());
@@ -655,8 +650,8 @@ public class MergingTest extends AbstractCDOTest
     commitAndSync(sourceTx, transaction);
     sourceTx.close();
 
-    CDOChangeSetData check2 = transaction.merge(source.getHead(), source.getPoint(sourceCommit1),
-        mainBranch.getPoint(mainCommit1), new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check2 = transaction.merge(source.getHead(), source.getPoint(sourceCommit1), mainBranch.getPoint(mainCommit1),
+        new DefaultCDOMerger.PerFeature.ManyValued());
     transaction.commit();
     assertEquals(1, check2.getNewObjects().size());
     assertEquals(1, check2.getChangedObjects().size());
@@ -690,12 +685,11 @@ public class MergingTest extends AbstractCDOTest
     long sourceCommit2 = commitAndSync(sourceTx).getTimeStamp();
     sourceTx.close();
 
-    transaction.merge(source.getHead(), source.getPoint(sourceCommit1), mainBranch.getPoint(mainCommit1),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    transaction.merge(source.getHead(), source.getPoint(sourceCommit1), mainBranch.getPoint(mainCommit1), new DefaultCDOMerger.PerFeature.ManyValued());
     long mainCommit2 = transaction.commit().getTimeStamp();
 
-    CDOChangeSetData check = transaction.merge(source.getHead(), source.getPoint(sourceCommit2),
-        mainBranch.getPoint(mainCommit2), new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source.getHead(), source.getPoint(sourceCommit2), mainBranch.getPoint(mainCommit2),
+        new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
@@ -794,8 +788,7 @@ public class MergingTest extends AbstractCDOTest
     CDOBranch source1 = mainBranch.getBranch("source1");
 
     CDOTransaction transaction = session.openTransaction(mainBranch);
-    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo.getTimeStamp()),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData check = transaction.merge(source1.getHead(), source1.getPoint(commitInfo.getTimeStamp()), new DefaultCDOMerger.PerFeature.ManyValued());
     assertEquals(true, check.isEmpty());
     assertEquals(false, transaction.isDirty());
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
index 6eb2e649bb..51ebf3f0cd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
@@ -39,8 +39,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add("Ottawa");
     list.add("Toronto");
     list.add("Berlin");
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfString(),
-        getModel5Package().getGenListOfString_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfString(), getModel5Package().getGenListOfString_Elements());
   }
 
   public void testListOfDate() throws Exception
@@ -49,8 +48,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(new Date(1000));
     list.add(new Date());
     list.add(new Date(new Date().getTime() - 100));
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDate(),
-        getModel5Package().getGenListOfDate_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDate(), getModel5Package().getGenListOfDate_Elements());
   }
 
   public void testListOfInt() throws Exception
@@ -59,8 +57,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(10);
     list.add(11);
     list.add(20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInt(),
-        getModel5Package().getGenListOfInt_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInt(), getModel5Package().getGenListOfInt_Elements());
   }
 
   public void testListOfShort() throws Exception
@@ -69,8 +66,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add((short)10);
     list.add((short)11);
     list.add((short)20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfShort(),
-        getModel5Package().getGenListOfShort_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfShort(), getModel5Package().getGenListOfShort_Elements());
   }
 
   public void testListOfFloat() throws Exception
@@ -79,8 +75,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add((float)10);
     list.add((float)11);
     list.add((float)20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfFloat(),
-        getModel5Package().getGenListOfFloat_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfFloat(), getModel5Package().getGenListOfFloat_Elements());
   }
 
   public void testListOfChar() throws Exception
@@ -89,8 +84,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add('c');
     list.add('d');
     list.add('z');
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfChar(),
-        getModel5Package().getGenListOfChar_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfChar(), getModel5Package().getGenListOfChar_Elements());
   }
 
   public void testListOfBoolean() throws Exception
@@ -98,8 +92,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     List<Boolean> list = new ArrayList<Boolean>();
     list.add(true);
     list.add(false);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfBoolean(),
-        getModel5Package().getGenListOfBoolean_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfBoolean(), getModel5Package().getGenListOfBoolean_Elements());
   }
 
   public void testListOfDouble() throws Exception
@@ -108,8 +101,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(10.1928);
     list.add(11.12);
     list.add(20.99991);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDouble(),
-        getModel5Package().getGenListOfDouble_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDouble(), getModel5Package().getGenListOfDouble_Elements());
   }
 
   public void testListOfInteger() throws Exception
@@ -124,8 +116,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     testMultiValuedIOfAttribute(list, containerClass, elements);
   }
 
-  protected <T> void testMultiValuedIOfAttribute(List<T> list, EClass containerClass, EStructuralFeature feature)
-      throws CommitException
+  protected <T> void testMultiValuedIOfAttribute(List<T> list, EClass containerClass, EStructuralFeature feature) throws CommitException
   {
     {
       CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
index 579e9f034d..01b1f3012a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
@@ -131,8 +131,7 @@ public class OCLQueryTest extends AbstractCDOTest
 
   public void testAllProductsWithNameParameter() throws Exception
   {
-    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.name=myname)",
-        getModel1Package().getProduct1());
+    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.name=myname)", getModel1Package().getProduct1());
     query.setParameter("myname", "1");
 
     List<Product1> products = query.getResult();
@@ -141,8 +140,7 @@ public class OCLQueryTest extends AbstractCDOTest
 
   public void testAllProductsWithVAT() throws Exception
   {
-    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.vat=VAT::vat15)",
-        getModel1Package().getProduct1());
+    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.vat=VAT::vat15)", getModel1Package().getProduct1());
 
     List<Product1> products = query.getResult();
     assertEquals(10, products.size());
@@ -218,8 +216,7 @@ public class OCLQueryTest extends AbstractCDOTest
     Product1 product = products.get(2);
     product.setName("1");
 
-    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.name='1')", getModel1Package().getProduct1(),
-        true);
+    CDOQuery query = createQuery("Product1.allInstances()->select(p | p.name='1')", getModel1Package().getProduct1(), true);
 
     List<Product1> products = query.getResult();
     assertEquals(2, products.size());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
index 71ecfece58..c49b3b51cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
@@ -684,8 +684,8 @@ public class PackageRegistryTest extends AbstractCDOTest
 
     Map<EClass, List<EClass>> subTypes = registry.getSubTypes();
 
-    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes, Arrays.asList("Child1", "Child4", "SubChild",
-        "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
+    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes,
+        Arrays.asList("Child1", "Child4", "SubChild", "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes,
         Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes,
@@ -710,16 +710,14 @@ public class PackageRegistryTest extends AbstractCDOTest
 
     assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes,
         Arrays.asList("Child1", "Child4", "SubChild", "SubChild3", "Child5", "Child6", "SubChild2"));
-    assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes,
-        Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2"));
-    assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes,
-        Arrays.asList("Child3", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2"));
+    assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes, Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2"));
+    assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes, Arrays.asList("Child3", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2"));
 
     registry.putEPackage(p2);
     subTypes = registry.getSubTypes();
 
-    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes, Arrays.asList("Child1", "Child4", "SubChild",
-        "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
+    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes,
+        Arrays.asList("Child1", "Child4", "SubChild", "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes,
         Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes,
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
index f2eba5cbe8..aef9c7fb84 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
@@ -509,8 +509,7 @@ public class PartialCommitTest extends AbstractCDOTest
     // Include the old and new containers as well as the object that was moved
     // (The point here is that company2 does NOT have to be included.)
     tx.setCommittables(createSet(purchaseOrder, company1, company3));
-    System.out.printf("---> purchaseOrder=%s company1=%s company2=%s company3=%s\n", purchaseOrder, company1, company2,
-        company3);
+    System.out.printf("---> purchaseOrder=%s company1=%s company2=%s company3=%s\n", purchaseOrder, company1, company2, company3);
     goodAll();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ReconnectingSessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ReconnectingSessionTest.java
index 5f3f666f95..7deb3b30d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ReconnectingSessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ReconnectingSessionTest.java
@@ -77,8 +77,7 @@ public class ReconnectingSessionTest extends AbstractCDOTest
       IManagedContainer clientContainer = getClientContainer();
       dumpEvents(clientContainer);
 
-      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2,
-          repositoryName, clientContainer);
+      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2, repositoryName, clientContainer);
       configuration.setHeartBeatEnabled(true);
 
       session2 = (CDONet4jSession)openSession(configuration);
@@ -166,8 +165,7 @@ public class ReconnectingSessionTest extends AbstractCDOTest
       IManagedContainer clientContainer = getClientContainer();
       dumpEvents(clientContainer);
 
-      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2,
-          repositoryName, clientContainer);
+      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2, repositoryName, clientContainer);
       configuration.setHeartBeatEnabled(true);
 
       session2 = (CDONet4jSession)openSession(configuration);
@@ -249,8 +247,7 @@ public class ReconnectingSessionTest extends AbstractCDOTest
     {
       acceptor = TCPUtil.getAcceptor(getServerContainer(), ADDRESS2);
 
-      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2,
-          repositoryName, getClientContainer());
+      ReconnectingCDOSessionConfiguration configuration = CDONet4jUtil.createReconnectingSessionConfiguration(ADDRESS2, repositoryName, getClientContainer());
       configuration.setHeartBeatEnabled(true);
 
       session = (CDONet4jSession)openSession(configuration);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
index 63406a2611..f84a4267f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
@@ -157,8 +157,7 @@ public class RepositoryTest extends AbstractCDOTest
 
     getRepository().addHandler(new IRepository.WriteAccessHandler()
     {
-      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor) throws RuntimeException
+      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
       {
         // Use the package registry of the commit context to catch new packages!
         EPackage model1Package = commitContext.getPackageRegistry().getEPackage(getModel1Package().getNsURI());
@@ -178,8 +177,7 @@ public class RepositoryTest extends AbstractCDOTest
         }
       }
 
-      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor)
+      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
       {
       }
     });
@@ -216,8 +214,7 @@ public class RepositoryTest extends AbstractCDOTest
 
     getRepository().addHandler(new IRepository.WriteAccessHandler()
     {
-      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor) throws RuntimeException
+      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
       {
         CDOView view = CDOServerUtil.openView(commitContext);
         for (CDORevision revision : commitContext.getNewObjects())
@@ -238,8 +235,7 @@ public class RepositoryTest extends AbstractCDOTest
         view.close();
       }
 
-      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor)
+      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
       {
       }
     });
@@ -344,8 +340,7 @@ public class RepositoryTest extends AbstractCDOTest
       {
         EClass eClass = revision.getEClass();
         EPackage ePackage = eClass.getEPackage();
-        assertNotSame("Revision has dynamic package: " + ePackage.getName(), EPackageImpl.class.getName(),
-            ePackage.getClass().getName());
+        assertNotSame("Revision has dynamic package: " + ePackage.getName(), EPackageImpl.class.getName(), ePackage.getClass().getName());
 
         if (eClass == customerClass)
         {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 970822e89a..300d3239b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -435,8 +435,7 @@ public class ResourceTest extends AbstractCDOTest
     {
       CDOSession session = openSession();
       CDOTransaction transaction = session.openTransaction();
-      CDOResource resource = (CDOResource)transaction.getResourceSet()
-          .getResource(CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
+      CDOResource resource = (CDOResource)transaction.getResourceSet().getResource(CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
       assertNotNull(resource);
       assertEquals(transaction.getResourceSet(), resource.getResourceSet());
       assertEquals(1, transaction.getResourceSet().getResources().size());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
index 1df8e1f8ea..6bc00f6f66 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
@@ -134,8 +134,7 @@ public class RevisionDeltaTest extends AbstractCDOTest
     transaction.close();
 
     CDOTransaction transaction2 = session.openTransaction();
-    SalesOrder salesOrder2 = (SalesOrder)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(salesOrder).cdoID(), true));
+    SalesOrder salesOrder2 = (SalesOrder)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(salesOrder).cdoID(), true));
     CDORevision salesRevision = CDOUtil.getCDOObject(salesOrder2).cdoRevision();
     EStructuralFeature customerFeature = getModel1Package().getSalesOrder_Customer();
 
@@ -163,8 +162,7 @@ public class RevisionDeltaTest extends AbstractCDOTest
     salesOrder.setId(4711);
     assertNotSame(CDOUtil.getCDOObject(salesOrder).cdoRevision(),
         ((InternalCDOTransaction)transaction).getRevision(CDOUtil.getCDOObject(salesOrder).cdoID(), true));
-    assertEquals(CDOUtil.getCDOObject(salesOrder).cdoRevision(),
-        transaction.getDirtyObjects().get(CDOUtil.getCDOObject(salesOrder).cdoID()).cdoRevision());
+    assertEquals(CDOUtil.getCDOObject(salesOrder).cdoRevision(), transaction.getDirtyObjects().get(CDOUtil.getCDOObject(salesOrder).cdoID()).cdoRevision());
     transaction.close();
     session.close();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
index e8dfa10dcd..bd8f42193e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SecurityTest.java
@@ -342,8 +342,7 @@ public class SecurityTest extends AbstractCDOTest
     }
 
     @Override
-    protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext,
-        int level) throws Exception
+    protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) throws Exception
     {
       return value;
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index 6721079c85..fa94426a7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -272,8 +272,7 @@ public class SessionTest extends AbstractCDOTest
   {
     IRepository repository = getRepository("authrepo1");
 
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
 
     CDOSession session = openSession("authrepo1");
     assertEquals(null, session.getUserID());
@@ -291,8 +290,7 @@ public class SessionTest extends AbstractCDOTest
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
     IRepository repository = getRepository("authrepo2");
 
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
 
     CDOSession session = openSession("authrepo2");
     assertEquals(USER_ID, session.getUserID());
@@ -356,8 +354,7 @@ public class SessionTest extends AbstractCDOTest
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
     getRepository("authrepo5");
 
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD2)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD2)));
 
     try
     {
@@ -380,8 +377,7 @@ public class SessionTest extends AbstractCDOTest
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
     getRepository("authrepo6");
 
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(null, PASSWORD2)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(null, PASSWORD2)));
 
     try
     {
@@ -404,8 +400,7 @@ public class SessionTest extends AbstractCDOTest
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
     getRepository("authrepo7");
 
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID)));
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
index 245bc15cf7..90dc09ecba 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java
@@ -44,14 +44,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableBooleanNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableBoolean(),
-        true);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableBoolean(), true);
   }
 
   public void testNotUnsettableBooleanNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableBoolean(),
-        new Boolean(false));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableBoolean(), new Boolean(false));
   }
 
   public void testNotUnsettableBooleanNoDefault_SetDefault() throws Exception
@@ -62,14 +60,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableByteNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableByte(),
-        (byte)10);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableByte(), (byte)10);
   }
 
   public void testNotUnsettableByteNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableByte(),
-        new Byte((byte)25));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableByte(), new Byte((byte)25));
   }
 
   public void testNotUnsettableByteNoDefault_SetDefault() throws Exception
@@ -85,8 +81,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableCharNoDefault_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableChar(),
-        new Character('c'));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableChar(), new Character('c'));
   }
 
   public void testNotUnsettableCharNoDefault2() throws Exception
@@ -97,8 +92,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableDateNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDate(),
-        new Date(0));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDate(), new Date(0));
   }
 
   public void testNotUnsettableDateNoDefault_SetDefault() throws Exception
@@ -109,14 +103,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableDoubleNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDouble(),
-        15.03d);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDouble(), 15.03d);
   }
 
   public void testNotUnsettableDoubleNoDefault_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDouble(),
-        new Double(19.79));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableDouble(), new Double(19.79));
   }
 
   public void testNotUnsettableDoubleNoDefault2() throws Exception
@@ -127,14 +119,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableFloatNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableFloat(),
-        15.03f);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableFloat(), 15.03f);
   }
 
   public void testNotUnsettableFloatNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableFloat(),
-        new Float(19.79f));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableFloat(), new Float(19.79f));
   }
 
   public void testNotUnsettableFloatNoDefault_SetDefault() throws Exception
@@ -150,8 +140,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableIntNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableInt(),
-        new Integer(15));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableInt(), new Integer(15));
   }
 
   public void testNotUnsettableIntNoDefault_SetDefault() throws Exception
@@ -167,8 +156,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableLongNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableLong(),
-        new Long(15031979L));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableLong(), new Long(15031979L));
   }
 
   public void testNotUnsettableLongNoDefault_SetDefault() throws Exception
@@ -179,14 +167,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableShortNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableShort(),
-        (short)15);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableShort(), (short)15);
   }
 
   public void testNotUnsettableShortNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableShort(),
-        new Short((short)15));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableShort(), new Short((short)15));
   }
 
   public void testNotUnsettableShortNoDefault_SetDefault() throws Exception
@@ -197,14 +183,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableStringNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableString(),
-        "Martin");
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableString(), "Martin");
   }
 
   public void testNotUnsettableStringNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableString(),
-        new String("Martin"));
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableString(), new String("Martin"));
   }
 
   public void testNotUnsettableStringNoDefault_SetDefault() throws Exception
@@ -215,8 +199,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableVATNoDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableVAT(),
-        VAT.VAT7);
+    testIsSet(getModel2Factory().createNotUnsettable(), getModel2Package().getNotUnsettable_NotUnsettableVAT(), VAT.VAT7);
   }
 
   public void testNotUnsettableVATNoDefault_SetDefault() throws Exception
@@ -227,103 +210,87 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testNotUnsettableWithDefaultBoolean() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), true);
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), true);
   }
 
   public void testNotUnsettableWithDefaultBoolean2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), new Boolean(false));
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(), new Boolean(false));
   }
 
   public void testNotUnsettableWithDefaultBoolean_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableBoolean().getDefaultValue());
   }
 
   public void testNotUnsettableWithDefaultByte() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), (byte)10);
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), (byte)10);
   }
 
   public void testNotUnsettableWithDefaultByte2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), new Byte((byte)25));
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(), new Byte((byte)25));
   }
 
   public void testNotUnsettableWithDefaultByte_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableByte().getDefaultValue());
   }
 
   public void testNotUnsettableWithDefaultChar() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), 'c');
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), 'c');
   }
 
   public void testNotUnsettableWithDefaultChart2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), new Character('c'));
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(), new Character('c'));
   }
 
   public void testNotUnsettableWithDefaultChar_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableChar().getDefaultValue());
   }
 
   public void testNotUnsettableWithDefaultDate() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(), new Date(0));
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(), new Date(0));
   }
 
   public void testNotUnsettableWithDefaultDate_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableDate().getDefaultValue());
   }
 
   public void testNotUnsettableWithDefaultDouble() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), 15.03d);
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), 15.03d);
   }
 
   public void testNotUnsettableWithDefaultDouble2() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), new Double(15.03d));
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(), new Double(15.03d));
   }
 
   public void testNotUnsettableWithDefaultDouble_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableDouble().getDefaultValue());
   }
 
   public void testNotUnsettableWithDefaultVAT() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(), VAT.VAT7);
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(), VAT.VAT7);
   }
 
   public void testNotUnsettableWithDefaultVAT_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createNotUnsettableWithDefault(),
-        getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(),
+    testIsSet(getModel2Factory().createNotUnsettableWithDefault(), getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT(),
         getModel2Package().getNotUnsettableWithDefault_NotUnsettableVAT().getDefaultValue());
   }
 
@@ -334,8 +301,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableBooleanNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableBoolean(),
-        new Boolean(false));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableBoolean(), new Boolean(false));
   }
 
   public void testUnsettableBooleanNoDefault_SetDefault() throws Exception
@@ -351,8 +317,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableByteNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableByte(),
-        new Byte((byte)25));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableByte(), new Byte((byte)25));
   }
 
   public void testUnsettableByteNoDefault_SetDefault() throws Exception
@@ -368,8 +333,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableCharNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableChar(),
-        new Character('c'));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableChar(), new Character('c'));
   }
 
   public void testUnsettableCharNoDefault_SetDefault() throws Exception
@@ -390,8 +354,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableDoubleNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableDouble(),
-        new Double(19.79));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableDouble(), new Double(19.79));
   }
 
   public void testUnsettableDoubleNoDefault_SetDefault() throws Exception
@@ -407,8 +370,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableFloatNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableFloat(),
-        new Float(19.79f));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableFloat(), new Float(19.79f));
   }
 
   public void testUnsettableFloatNoDefault_SetDefault() throws Exception
@@ -424,8 +386,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableIntNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableInt(),
-        new Integer(15));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableInt(), new Integer(15));
   }
 
   public void testUnsettableIntNoDefault_SetDefault() throws Exception
@@ -446,8 +407,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableShortNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableShort(),
-        new Short((short)15));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableShort(), new Short((short)15));
   }
 
   public void testUnsettableShortNoDefault_SetDefault() throws Exception
@@ -463,8 +423,7 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableStringNoDefault2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableString(),
-        new String("Martin"));
+    testIsSet(getModel2Factory().createUnsettable1(), getModel2Package().getUnsettable1_UnsettableString(), new String("Martin"));
   }
 
   public void testUnsettableVATNoDefault() throws Exception
@@ -480,178 +439,150 @@ public class SetFeatureTest extends AbstractCDOTest
 
   public void testUnsettableWithDefaultBoolean() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), true);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), true);
   }
 
   public void testUnsettableWithDefaultBoolean2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), new Boolean(false));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableBoolean(), new Boolean(false));
   }
 
   public void testUnsettableWithDefaultByte() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableByte(), (byte)10);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableByte(), (byte)10);
   }
 
   public void testUnsettableWithDefaultByte2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableByte(), new Byte((byte)25));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableByte(), new Byte((byte)25));
   }
 
   public void testUnsettableWithDefaultByte_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableByte(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableByte(),
         getModel2Package().getUnsettable2WithDefault_UnsettableByte().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultChar() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableChar(), 'c');
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableChar(), 'c');
   }
 
   public void testUnsettableWithDefaultCharNo() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableChar(), new Character('c'));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableChar(), new Character('c'));
   }
 
   public void testUnsettableWithDefaultChar_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableChar(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableChar(),
         getModel2Package().getUnsettable2WithDefault_UnsettableChar().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultDate() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableDate(), new Date(0));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableDate(), new Date(0));
   }
 
   public void testUnsettableWithDefaultDate_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableDate(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableDate(),
         getModel2Package().getUnsettable2WithDefault_UnsettableDate().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultDouble() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), 15.03d);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), 15.03d);
   }
 
   public void testUnsettableWithDefaultDouble2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), new Double(19.79));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableDouble(), new Double(19.79));
   }
 
   public void testUnsettableWithDefaultDouble_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableDouble(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableDouble(),
         getModel2Package().getUnsettable2WithDefault_UnsettableDouble().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultFloat() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), 15.03f);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), 15.03f);
   }
 
   public void testUnsettableWithDefaultFloat2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), new Float(19.79f));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableFloat(), new Float(19.79f));
   }
 
   public void testUnsettableWithDefaultFloat_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableFloat(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableFloat(),
         getModel2Package().getUnsettable2WithDefault_UnsettableFloat().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultInt() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableInt(), 15);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableInt(), 15);
   }
 
   public void testUnsettableWithDefaultInt2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableInt(), new Integer(15));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableInt(), new Integer(15));
   }
 
   public void testUnsettableWithDefaultInt_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableInt(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableInt(),
         getModel2Package().getUnsettable2WithDefault_UnsettableInt().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultLong() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableLong(), 15L);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableLong(), 15L);
   }
 
   public void testUnsettableWithDefaultShort() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableShort(), (short)15);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableShort(), (short)15);
   }
 
   public void testUnsettableWithDefaultShort2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableShort(), new Short((short)15));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableShort(), new Short((short)15));
   }
 
   public void testUnsettableWithDefaultShort_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableShort(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableShort(),
         getModel2Package().getUnsettable2WithDefault_UnsettableShort().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultString() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableString(), "Martin");
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableString(), "Martin");
   }
 
   public void testUnsettableWithDefaultString2() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableString(), new String("Martin"));
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableString(), new String("Martin"));
   }
 
   public void testUnsettableWithDefaultString_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableString(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableString(),
         getModel2Package().getUnsettable2WithDefault_UnsettableString().getDefaultValue());
   }
 
   public void testUnsettableWithDefaultVAT() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableVAT(), VAT.VAT7);
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableVAT(), VAT.VAT7);
   }
 
   public void testUnsettableWithDefaultVAT_SetDefault() throws Exception
   {
-    testIsSet(getModel2Factory().createUnsettable2WithDefault(),
-        getModel2Package().getUnsettable2WithDefault_UnsettableVAT(),
+    testIsSet(getModel2Factory().createUnsettable2WithDefault(), getModel2Package().getUnsettable2WithDefault_UnsettableVAT(),
         getModel2Package().getUnsettable2WithDefault_UnsettableVAT().getDefaultValue());
   }
 
@@ -704,8 +635,7 @@ public class SetFeatureTest extends AbstractCDOTest
         assertEquals(true, object.eIsSet(feature));
       }
 
-      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature),
-          object.eIsSet(feature));
+      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature), object.eIsSet(feature));
 
       session.close();
 
@@ -730,14 +660,12 @@ public class SetFeatureTest extends AbstractCDOTest
 
       assertEquals(false, object.eIsSet(feature));
       assertEquals(true, ObjectUtil.equals(object.eGet(feature), feature.getDefaultValue()));
-      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature),
-          object.eIsSet(feature));
+      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature), object.eIsSet(feature));
 
       transaction.commit();
 
       assertEquals(false, object.eIsSet(feature));
-      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature),
-          object.eIsSet(feature));
+      assertEquals(((InternalCDOTransaction)transaction).getStore().isSet((InternalEObject)object, feature), object.eIsSet(feature));
 
       session.close();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
index bc3d538dbf..f934243451 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java
@@ -50,8 +50,7 @@ public class StateMachineTest extends AbstractCDOTest
     CDOTransaction transaction = session.openTransaction();
     CDOResource resource = transaction.createResource(getResourcePath("/test1"));
     assertNew(resource, transaction);
-    assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")),
-        resource.getURI());
+    assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), resource.getURI());
     assertEquals(transaction.getResourceSet(), resource.getResourceSet());
 
     // Attach single object
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
index 67e89342d5..3a8587b84a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
@@ -373,8 +373,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
       @Override
       protected boolean successful()
       {
-        return handler.listOfAddingObject.size() == 1 && handler.listOfDetachingObject.size() == 1
-            && handler.listOfModifyinObject.size() == 2;
+        return handler.listOfAddingObject.size() == 1 && handler.listOfDetachingObject.size() == 1 && handler.listOfModifyinObject.size() == 2;
       }
     }.assertNoTimeOut();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
index 4fb7cfe28b..460deed4b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java
@@ -409,8 +409,7 @@ public class UnsetTest extends AbstractCDOTest
     baseElement.setUnsettable(true);
     baseElement.setDefaultValue(23);
 
-    EAttribute objectElement = EMFUtil.createEAttribute(cls, "objectElement",
-        EcorePackage.eINSTANCE.getEIntegerObject());
+    EAttribute objectElement = EMFUtil.createEAttribute(cls, "objectElement", EcorePackage.eINSTANCE.getEIntegerObject());
     objectElement.setUnsettable(true);
     objectElement.setDefaultValue(42);
     if (!isConfig(LEGACY))
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
index 24db80612a..4b16d31fa7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
@@ -1357,8 +1357,7 @@ public class WorkspaceTest extends AbstractCDOTest
         throw new UnsupportedOperationException();
       }
 
-      public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
-          throws ConflictException
+      public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws ConflictException
       {
         CDOComparisonScope scope = new CDOComparisonScope.Minimal(remoteView, localTransaction, null, affectedIDs);
         Comparison comparison = CDOCompareUtil.compare(scope);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
index 7e3f36d4a9..4ef3c03f2d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java
@@ -60,25 +60,19 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
     msg("Committing");
     transaction1.commit();
 
-    assertEquals(CDOUtil.getCDOObject(orderDetail).cdoID(),
-        CDOUtil.getCDOObject(order).cdoRevision().data().get(order_OrderDetailFeature, 0));
-    assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(),
-        CDOUtil.getCDOObject(order2).cdoRevision().data().get(order_OrderDetailFeature, 0));
+    assertEquals(CDOUtil.getCDOObject(orderDetail).cdoID(), CDOUtil.getCDOObject(order).cdoRevision().data().get(order_OrderDetailFeature, 0));
+    assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(), CDOUtil.getCDOObject(order2).cdoRevision().data().get(order_OrderDetailFeature, 0));
 
-    assertEquals(CDOUtil.getCDOObject(order).cdoID(),
-        CDOUtil.getCDOObject(orderDetail).cdoRevision().data().getContainerID());
-    assertEquals(CDOUtil.getCDOObject(order2).cdoID(),
-        CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
+    assertEquals(CDOUtil.getCDOObject(order).cdoID(), CDOUtil.getCDOObject(orderDetail).cdoRevision().data().getContainerID());
+    assertEquals(CDOUtil.getCDOObject(order2).cdoID(), CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
 
     Order order3 = getModel1Factory().createPurchaseOrder();
 
     res.getContents().add(order3);
     order3.getOrderDetails().add(orderDetail2);
 
-    assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(),
-        CDOUtil.getCDOObject(order3).cdoRevision().data().get(order_OrderDetailFeature, 0));
-    assertEquals(CDOUtil.getCDOObject(order3),
-        CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
+    assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(), CDOUtil.getCDOObject(order3).cdoRevision().data().get(order_OrderDetailFeature, 0));
+    assertEquals(CDOUtil.getCDOObject(order3), CDOUtil.getCDOObject(orderDetail2).cdoRevision().data().getContainerID());
 
     msg("Committing");
     transaction1.commit();
@@ -120,23 +114,18 @@ public class Bugzilla_246622_Test extends AbstractCDOTest
     msg("Committing");
     transaction1.commit();
 
-    assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(),
-        CDOUtil.getCDOObject(purchaseOrder2).cdoRevision().data().get(purchaseOrder_Supplier, 0));
-    assertEquals(CDOUtil.getCDOObject(purchaseOrder2).cdoID(),
-        CDOUtil.getCDOObject(supplier2).cdoRevision().data().get(supplier_PurchaseOrder, 0));
+    assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(), CDOUtil.getCDOObject(purchaseOrder2).cdoRevision().data().get(purchaseOrder_Supplier, 0));
+    assertEquals(CDOUtil.getCDOObject(purchaseOrder2).cdoID(), CDOUtil.getCDOObject(supplier2).cdoRevision().data().get(supplier_PurchaseOrder, 0));
 
-    assertEquals(CDOUtil.getCDOObject(supplier).cdoID(),
-        CDOUtil.getCDOObject(purchaseOrder).cdoRevision().data().get(purchaseOrder_Supplier, 0));
-    assertEquals(CDOUtil.getCDOObject(purchaseOrder).cdoID(),
-        CDOUtil.getCDOObject(supplier).cdoRevision().data().get(supplier_PurchaseOrder, 0));
+    assertEquals(CDOUtil.getCDOObject(supplier).cdoID(), CDOUtil.getCDOObject(purchaseOrder).cdoRevision().data().get(purchaseOrder_Supplier, 0));
+    assertEquals(CDOUtil.getCDOObject(purchaseOrder).cdoID(), CDOUtil.getCDOObject(supplier).cdoRevision().data().get(supplier_PurchaseOrder, 0));
 
     msg("Test set with persisted CDOID");
     PurchaseOrder purchaseOrder3 = getModel1Factory().createPurchaseOrder();
     purchaseOrder3.setSupplier(supplier2);
     res.getContents().add(purchaseOrder3);
 
-    assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(),
-        CDOUtil.getCDOObject(purchaseOrder3).cdoRevision().data().get(purchaseOrder_Supplier, 0));
+    assertEquals(CDOUtil.getCDOObject(supplier2).cdoID(), CDOUtil.getCDOObject(purchaseOrder3).cdoRevision().data().get(purchaseOrder_Supplier, 0));
     assertEquals(purchaseOrder3, CDOUtil.getCDOObject(supplier2).cdoRevision().data().get(supplier_PurchaseOrder, 1));
 
     msg("Committing");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
index eba50bdeb0..6f113f903e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java
@@ -73,8 +73,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
 
     try
     {
-      transaction2.getResourceSet().getResource(CDOURIUtil.createResourceURI(view, getResourcePath(resourcePath)),
-          true);
+      transaction2.getResourceSet().getResource(CDOURIUtil.createResourceURI(view, getResourcePath(resourcePath)), true);
       fail("RuntimeException expected");
     }
     catch (RuntimeException expected)
@@ -112,8 +111,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest
 
     try
     {
-      transaction1.getResourceSet()
-          .getResource(CDOURIUtil.createResourceURI(transaction1, getResourcePath(resourcePath)), true);
+      transaction1.getResourceSet().getResource(CDOURIUtil.createResourceURI(transaction1, getResourcePath(resourcePath)), true);
       fail("RuntimeException expected");
     }
     catch (RuntimeException expected)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
index 4d1956b1ea..f8b5277392 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
@@ -54,8 +54,7 @@ public class Bugzilla_260764_Test extends AbstractCDOTest
     final CDOSession session2 = openSession();
 
     final CDOTransaction transaction2 = session2.openTransaction();
-    final OrderAddress orderAddress2 = (OrderAddress)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
+    final OrderAddress orderAddress2 = (OrderAddress)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true));
 
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     orderAddress2.getOrderDetails().add(orderDetail);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
index 3a9690c241..e707617428 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java
@@ -48,8 +48,7 @@ public class Bugzilla_266982_Test extends AbstractCDOTest
         {
           CDOSession session = openSession();
           CDOTransaction transaction = session.openTransaction();
-          Customer customerToLoad = (Customer)CDOUtil
-              .getEObject(transaction.getObject(CDOUtil.getCDOObject(customer).cdoID()));
+          Customer customerToLoad = (Customer)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(customer).cdoID()));
           while (!done[0])
           {
             // Could fail if the attach is not thread safe
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
index ad33d52f5e..5ec886d047 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
@@ -70,7 +70,6 @@ public class Bugzilla_267050_Test extends AbstractCDOTest
     }.assertNoTimeOut();
 
     assertEquals(1, newPackagesUnits[0].size());
-    assertEquals(getModel1Package().getNsURI(),
-        newPackagesUnits[0].iterator().next().getTopLevelPackageInfo().getPackageURI());
+    assertEquals(getModel1Package().getNsURI(), newPackagesUnits[0].iterator().next().getTopLevelPackageInfo().getPackageURI());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
index 02ded73dad..3dd85630dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java
@@ -276,8 +276,7 @@ public class Bugzilla_273565_Test extends AbstractCDOTest
     CDOUtil.getCDOObject(orderDetail).cdoWriteLock().lock(DEFAULT_TIMEOUT);
     orderDetail.setPrice(2);
 
-    boolean locked = CDOUtil.getCDOObject(orderDetail2).cdoWriteLock().tryLock(DEFAULT_TIMEOUT_EXPECTED,
-        TimeUnit.MILLISECONDS);
+    boolean locked = CDOUtil.getCDOObject(orderDetail2).cdoWriteLock().tryLock(DEFAULT_TIMEOUT_EXPECTED, TimeUnit.MILLISECONDS);
     assertEquals(false, locked);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
index 8a6a13cc9e..8e8a0d0efa 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java
@@ -294,8 +294,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest
     int customerCounter = 0;
     for (Notification notification : testAdapter.getNotifications())
     {
-      if (notification.getFeature().equals(getModel1Package().getCompany_Customers())
-          && notification.getEventType() == Notification.ADD)
+      if (notification.getFeature().equals(getModel1Package().getCompany_Customers()) && notification.getEventType() == Notification.ADD)
       {
         customerCounter++;
       }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java
index fcc9d54349..64d788cce9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java
@@ -214,8 +214,8 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest
 
     // Ask closure to pick items to be moved
     //
-    Collection<OrderDetail> details = closure.pickDetails(new OrderDetail[] { detail1, detail2, detail3, detail4,
-        detail5, detail6, detail7, detail8, detail9, detail10, detail11, detail12, });
+    Collection<OrderDetail> details = closure
+        .pickDetails(new OrderDetail[] { detail1, detail2, detail3, detail4, detail5, detail6, detail7, detail8, detail9, detail10, detail11, detail12, });
 
     // Keep references to the current CDOIDs and versions, to be used in the test
     CDOID[] idsBefore = new CDOID[details.size()];
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
index 63650ec724..e735132a27 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java
@@ -41,8 +41,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest
       boolean p2 = p.getRefMultiNonContainedUnsettable_Elements().isUnsettable();
       boolean p3 = !p.getMultiNonContainedUnsettableElement_Parent().isMany();
       boolean p4 = p.getMultiNonContainedUnsettableElement_Parent().isUnsettable();
-      boolean p5 = p.getRefMultiNonContainedUnsettable_Elements().getEOpposite() == p
-          .getMultiNonContainedUnsettableElement_Parent();
+      boolean p5 = p.getRefMultiNonContainedUnsettable_Elements().getEOpposite() == p.getMultiNonContainedUnsettableElement_Parent();
       if (!p1 || !p2 || !p3 || !p4 || !p5)
       {
         throw new RuntimeException("Model does not meet the prerequirements for this test");
@@ -98,8 +97,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest
       boolean p2 = p.getRefMultiNonContainedUnsettable_Elements().isUnsettable();
       boolean p3 = !p.getMultiNonContainedUnsettableElement_Parent().isMany();
       boolean p4 = p.getMultiNonContainedUnsettableElement_Parent().isUnsettable();
-      boolean p5 = p.getRefMultiNonContainedUnsettable_Elements().getEOpposite() == p
-          .getMultiNonContainedUnsettableElement_Parent();
+      boolean p5 = p.getRefMultiNonContainedUnsettable_Elements().getEOpposite() == p.getMultiNonContainedUnsettableElement_Parent();
       if (!p1 || !p2 || !p3 || !p4 || !p5)
       {
         throw new RuntimeException("Model does not meet the prerequirements for this test");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java
index c0391d63c2..1530c05428 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java
@@ -41,8 +41,7 @@ public class Bugzilla_314186_Test extends AbstractCDOTest
       @Override
       public void notifyChanged(Notification notification)
       {
-        if (notification.getFeature() != null
-            && notification.getFeature().equals(EresourcePackage.eINSTANCE.getCDOResource_ResourceSet()))
+        if (notification.getFeature() != null && notification.getFeature().equals(EresourcePackage.eINSTANCE.getCDOResource_ResourceSet()))
         {
           assertEquals(Resource.RESOURCE__RESOURCE_SET, notification.getFeatureID(Resource.class));
         }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java
index 318dbdc701..b74c1fb76c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java
@@ -61,8 +61,8 @@ public class Bugzilla_318518_Test extends AbstractCDOTest
     tr2.options().addConflictResolver(new org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver()
     {
       @Override
-      protected void resolveConflict(CDOObject conflict, CDORevision oldRevision, CDORevisionDelta localDelta,
-          CDORevisionDelta remoteDelta, List<CDORevisionDelta> deltas)
+      protected void resolveConflict(CDOObject conflict, CDORevision oldRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta,
+          List<CDORevisionDelta> deltas)
       {
         CDOListFeatureDelta list = (CDOListFeatureDelta)localDelta.getFeatureDeltas().get(0);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
index a2402a8d44..2e52ab7c08 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
@@ -324,14 +324,12 @@ public class Bugzilla_319836_Test extends AbstractCDOTest
   {
     getRepository().addHandler(new WriteAccessHandler()
     {
-      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor) throws RuntimeException
+      public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
       {
         msg(toPrettyString("\t", commitContext.getDirtyObjectDeltas()));
       }
 
-      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-          OMMonitor monitor)
+      public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
       {
       }
 
@@ -350,8 +348,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest
         sb.append(spacer).append("Delta revision(s):\n");
         for (InternalCDORevisionDelta item : dirtyObjects)
         {
-          String m = MessageFormat.format("{0}@{1}:{2}v{3}", item.getEClass().getName(), item.getID(),
-              item.getBranch().getID(), item.getVersion());
+          String m = MessageFormat.format("{0}@{1}:{2}v{3}", item.getEClass().getName(), item.getID(), item.getBranch().getID(), item.getVersion());
           sb.append(spacer).append(spacer).append(m).append("\n");
           // Feature deltas.
           for (CDOFeatureDelta delta : item.getFeatureDeltas())
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
index 00c6a49ace..2e8817b2d3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
@@ -87,7 +87,6 @@ public class Bugzilla_324635_Test extends AbstractCDOTest
     assertEquals(false, s1Tr1.isDirty());
 
     // check revision versions.
-    assertEquals(CDOUtil.getCDOObject(container).cdoRevision().getVersion(),
-        CDOUtil.getCDOObject(container2).cdoRevision().getVersion());
+    assertEquals(CDOUtil.getCDOObject(container).cdoRevision().getVersion(), CDOUtil.getCDOObject(container2).cdoRevision().getVersion());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
index 68075497c1..b6aa4aeb4e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
@@ -96,8 +96,7 @@ public class Bugzilla_326518_Test extends AbstractCDOTest
 
     // merge the other branch to main.
     sleep(1000L);
-    CDOChangeSetData changes = transaction1.merge(transaction2.getBranch().getHead(),
-        new DefaultCDOMerger.PerFeature.ManyValued());
+    CDOChangeSetData changes = transaction1.merge(transaction2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());
 
     printChangeSetData(changes);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
index 815e5f0d62..b4eaebfd0c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
@@ -63,8 +63,8 @@ public class Bugzilla_329786_Test extends AbstractCDOTest
   {
     ResourceSet resourceSet = new ResourceSetImpl();
 
-    URI sharedURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
-        + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+    URI sharedURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource"))
+        .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
     Resource sharedResource = resourceSet.createResource(sharedURI);
 
     URI localURI = URI.createFileURI(createTempFile(getName(), ".model1").getCanonicalPath());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
index 8acd1c72e1..6ac627a79e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
@@ -80,8 +80,7 @@ public class Bugzilla_334608_Test extends AbstractCDOTest
       resource.getContents().remove(instanceB);
 
       InternalCDOCommitContext commitContext = ((CDOTransactionImpl)transaction).createCommitContext();
-      CommitIntegrityCheck integrityCheck = new CommitIntegrityCheck(commitContext,
-          CommitIntegrityCheck.Style.NO_EXCEPTION);
+      CommitIntegrityCheck integrityCheck = new CommitIntegrityCheck(commitContext, CommitIntegrityCheck.Style.NO_EXCEPTION);
       integrityCheck.check();
 
       transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
index 56b602d87f..9a18f76f9b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java
@@ -112,8 +112,7 @@ public class Bugzilla_336590_Test extends AbstractCDOTest
       throw new UnsupportedOperationException();
     }
 
-    public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-        List<CDORevisionDelta> allRemoteDeltas)
+    public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
     {
       assertEquals(1, allRemoteDeltas.size());
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
index 007e98607a..7961b8b9c6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
@@ -69,8 +69,7 @@ public class Bugzilla_340961_Test extends AbstractCDOTest
     if (internalCDORevisionManager == null)
     {
       internalCDORevisionManager = new TestRevisionManager();
-      getRepositoryConfig().getTestProperties().put(RepositoryConfig.PROP_TEST_REVISION_MANAGER,
-          internalCDORevisionManager);
+      getRepositoryConfig().getTestProperties().put(RepositoryConfig.PROP_TEST_REVISION_MANAGER, internalCDORevisionManager);
     }
     internalCDORevisionManager.setFactory(revisionFactory);
     super.doSetUp();
@@ -234,8 +233,7 @@ public class Bugzilla_340961_Test extends AbstractCDOTest
       ids = protectedIds;
     }
 
-    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions,
-        List<CDORevision> additionalRevisions) throws RuntimeException
+    public void handleRevisionsBeforeSending(ISession session, CDORevision[] revisions, List<CDORevision> additionalRevisions) throws RuntimeException
     {
       for (int i = 0; i < revisions.length; i++)
       {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343084_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343084_Test.java
index a18ca4770f..ba57771639 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343084_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343084_Test.java
@@ -90,8 +90,7 @@ public class Bugzilla_343084_Test extends AbstractCDOTest
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_AUTHENTICATOR, userManager);
     getTestProperties().put(RepositoryConfig.PROP_TEST_PERMISSION_MANAGER, permissionManager);
-    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
-        new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
+    getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD)));
 
     getRepository(REPO_NAME);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
index e6bc998154..4b87cb784f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_343332_Test.java
@@ -84,8 +84,7 @@ public class Bugzilla_343332_Test extends AbstractCDOTest
       ((Category)resource.getContents().get(1)).getCategories().add(nestedCategory);
 
       assertNotNull("CDOTransactionHandler1.attachingObject was not called", attachedObject[0]);
-      assertEquals(MessageFormat.format("Re-attached object was not the expected object {0}", cdoCategory), cdoCategory,
-          attachedObject[0]);
+      assertEquals(MessageFormat.format("Re-attached object was not the expected object {0}", cdoCategory), cdoCategory, attachedObject[0]);
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
index d97dfa96f7..1362f4525b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
@@ -159,14 +159,12 @@ public class Bugzilla_349804_Test extends AbstractCDOTest
    */
   private class Failure implements WriteAccessHandler
   {
-    public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-        OMMonitor monitor) throws RuntimeException
+    public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
     {
       throw new IllegalArgumentException("Fail on purpose");
     }
 
-    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-        OMMonitor monitor)
+    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
     {
       // Do nothing
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350987_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350987_Test.java
index 86599ee0c9..42eb0c6602 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350987_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350987_Test.java
@@ -76,8 +76,7 @@ public class Bugzilla_350987_Test extends AbstractCDOTest
     CDOObject cdoOrderDetail = CDOUtil.getCDOObject(orderDetail);
     CDORevision revision = cdoOrderDetail.cdoRevision();
 
-    Map<InternalCDOObject, InternalCDORevision> cleanRevisions = ((InternalCDOTransaction)transaction)
-        .getCleanRevisions();
+    Map<InternalCDOObject, InternalCDORevision> cleanRevisions = ((InternalCDOTransaction)transaction).getCleanRevisions();
     InternalCDORevision originRevision = cleanRevisions.get(cdoOrderDetail);
 
     if (originRevision != null)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352204_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352204_Test.java
index 5443f869a1..caf8177ace 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352204_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352204_Test.java
@@ -75,8 +75,7 @@ public class Bugzilla_352204_Test extends AbstractCDOTest
     pushTransaction.getSession().close();
   }
 
-  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints)
-      throws IOException
+  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints) throws IOException
   {
     CDOSession session = openSession();
     CDOTransaction delegate = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
index 4a34263522..48c1920903 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_352832_Test.java
@@ -52,11 +52,9 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
     // STEP 1 Setting parent feature to point REF
     CDORevision cdoRevision = CDOUtil.getCDOObject(singleNonContainedElement).cdoRevision();
     // here is real Java NULL
-    assertEquals(null,
-        cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
+    assertEquals(null, cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
     singleNonContainedElement.setParent(refSingleNonContained);
-    transaction1.setCommittables(
-        new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement, refSingleNonContained })));
+    transaction1.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement, refSingleNonContained })));
     checkPartialCommitIntegrity((InternalCDOTransaction)transaction1);
     transaction1.commit();
 
@@ -69,10 +67,8 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
     singleNonContainedElement2.setParent(null);
     cdoRevision = CDOUtil.getCDOObject(singleNonContainedElement2).cdoRevision();
     // here is real Java NULL after setting
-    assertEquals(null,
-        cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
-    transaction2.setCommittables(
-        new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
+    assertEquals(null, cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
+    transaction2.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
     checkPartialCommitIntegrity(transaction2);
     transaction2.commit();
     session2.close();
@@ -80,19 +76,15 @@ public class Bugzilla_352832_Test extends AbstractCDOTest
     // STEP 3 Setting parent feature to point REF
     session2 = openSession();
     transaction2 = (InternalCDOTransaction)session2.openTransaction();
-    singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(singleNonContainedElement).cdoID()));
-    refSingleNonContained2 = (RefSingleNonContained)CDOUtil
-        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(refSingleNonContained).cdoID()));
+    singleNonContainedElement2 = (SingleNonContainedElement)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(singleNonContainedElement).cdoID()));
+    refSingleNonContained2 = (RefSingleNonContained)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(refSingleNonContained).cdoID()));
 
     cdoRevision = CDOUtil.getCDOObject(singleNonContainedElement2).cdoRevision();
     // from server loaded revision has CDO NULL ID, which has meaning of the same Java NULL. Identical situation when in
     // STEP 1
-    assertEquals(CDOID.NULL,
-        cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
+    assertEquals(CDOID.NULL, cdoRevision.data().get(getModel4Package().getSingleNonContainedElement_Parent(), CDOStore.NO_INDEX));
     singleNonContainedElement2.setParent(refSingleNonContained2);
-    transaction2.setCommittables(
-        new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
+    transaction2.setCommittables(new HashSet<EObject>(Arrays.asList(new EObject[] { singleNonContainedElement2, refSingleNonContained2 })));
     checkPartialCommitIntegrity(transaction2);
     transaction2.commit();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355045_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355045_Test.java
index 891cb83785..56228a0fb5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355045_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355045_Test.java
@@ -189,10 +189,8 @@ public class Bugzilla_355045_Test extends AbstractCDOTest
   {
     CDOObject categoryCDOObject = CDOUtil.getCDOObject(category);
     CDOLockState cdoLockState = categoryCDOObject.cdoLockState();
-    Assert.assertEquals(
-        "new object " + category.getName()
-            + (lockedByMe ? " should be locally locked" : " shouldn't be locally locked"),
-        lockedByMe, cdoLockState.isLocked(LockType.WRITE, transaction, false));
+    Assert.assertEquals("new object " + category.getName() + (lockedByMe ? " should be locally locked" : " shouldn't be locally locked"), lockedByMe,
+        cdoLockState.isLocked(LockType.WRITE, transaction, false));
 
     if (recursive)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359966_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359966_Test.java
index 1640c5289d..99070cc57c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359966_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359966_Test.java
@@ -115,8 +115,7 @@ public class Bugzilla_359966_Test extends AbstractCDOTest
    * @param reconstructSavePoints
    *          if CDOSavePoints should be reconstructed when creating the PushTransaction
    */
-  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints)
-      throws IOException
+  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints) throws IOException
   {
     CDOSession session = openSession();
     CDOTransaction delegate = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270c_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270c_Test.java
index 9376e8b842..cf9ffb77d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270c_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270c_Test.java
@@ -94,8 +94,7 @@ public class Bugzilla_362270c_Test extends AbstractCDOTest
     localResource = resourceSet.getResource(localResourceURI, true);
 
     // 3. Add a reference from the CDOResource to the local resource
-    Command addPurchaseOrderCmd = AddCommand.create(domain, martinSupplier,
-        getModel1Package().getSupplier_PurchaseOrders(), purchaseOrder);
+    Command addPurchaseOrderCmd = AddCommand.create(domain, martinSupplier, getModel1Package().getSupplier_PurchaseOrders(), purchaseOrder);
     domain.getCommandStack().execute(addPurchaseOrderCmd);
 
     resource.save(Collections.emptyMap());
@@ -107,8 +106,7 @@ public class Bugzilla_362270c_Test extends AbstractCDOTest
     domain.addResourceSetListener(rollbacker);
 
     // 5. Detach a CDOObject
-    Command removeMartinSupplierCmd = RemoveCommand.create(domain, obeoCompany,
-        getModel1Package().getCompany_Suppliers(), martinSupplier);
+    Command removeMartinSupplierCmd = RemoveCommand.create(domain, obeoCompany, getModel1Package().getCompany_Suppliers(), martinSupplier);
     domain.getCommandStack().execute(removeMartinSupplierCmd);
 
     // 6. Rollback the previous operation
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
index 9eb9e92858..d5a62d0d70 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_363355_Test.java
@@ -85,8 +85,7 @@ public class Bugzilla_363355_Test extends AbstractCDOTest
     commitAndSync(transactionOfUser2, transactionOfUser1);
 
     // User 1 checks that its transaction is not dirty
-    Assert.assertFalse("Receiving remote changes shouldn't set local CDOTransaction dirty",
-        transactionOfUser1.isDirty());
+    Assert.assertFalse("Receiving remote changes shouldn't set local CDOTransaction dirty", transactionOfUser1.isDirty());
 
     commitAndSync(transactionOfUser1, transactionOfUser2);
 
@@ -139,8 +138,7 @@ public class Bugzilla_363355_Test extends AbstractCDOTest
     Assert.assertNotSame(co2, co3.eContainer());
     Assert.assertSame(co1.getContainmentOptional(), co3.eContainer());
     Assert.assertNull(co2.eContainer());
-    Assert.assertFalse("Receiving remote changes shouldn't set local CDOTransaction dirty",
-        transactionOfUser2.isDirty());
+    Assert.assertFalse("Receiving remote changes shouldn't set local CDOTransaction dirty", transactionOfUser2.isDirty());
 
     transactionOfUser2.close();
     sessionOfUser2.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
index beca9279ff..4e6d293bbd 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_365832_Test.java
@@ -120,8 +120,7 @@ public class Bugzilla_365832_Test extends AbstractCDOTest
    * @param reconstructSavePoints
    *          if CDOSavePoints should be reconstructed when creating the PushTransaction
    */
-  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints)
-      throws IOException
+  private CDOPushTransaction createPushTransaction(File fileForStoringChanges, boolean reconstructSavePoints) throws IOException
   {
     CDOSession session = openSession();
     CDOTransaction delegate = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
index e1bcb3874c..d1f7a95d06 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_377173_Test.java
@@ -89,14 +89,12 @@ public class Bugzilla_377173_Test extends AbstractCDOTest
   private static class CommitWaiter implements IRepository.WriteAccessHandler
   {
 
-    public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-        OMMonitor monitor) throws RuntimeException
+    public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
     {
       sleep(2000);
     }
 
-    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-        OMMonitor monitor)
+    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
     {
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_387563_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_387563_Test.java
index 900153dd7e..07c4887be6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_387563_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_387563_Test.java
@@ -157,9 +157,8 @@ public class Bugzilla_387563_Test extends AbstractCDOTest
     CDOObject cdoObject = CDOUtil.getCDOObject(category);
     CDOLockState lockState = cdoObject.cdoLockState();
 
-    assertEquals(
-        "new object " + category.getName() + (expected ? " should be locally locked" : " shouldn't be locally locked."),
-        expected, lockState.isLocked(LockType.WRITE, cdoObject.cdoView(), false));
+    assertEquals("new object " + category.getName() + (expected ? " should be locally locked" : " shouldn't be locally locked."), expected,
+        lockState.isLocked(LockType.WRITE, cdoObject.cdoView(), false));
 
     if (recursive)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
index 27171c823d..f80faf4cdb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
@@ -35,8 +35,7 @@ public class Bugzilla_395999_Test extends AbstractCDOTest
 
     try
     {
-      URI uri = URI.createURI(
-          getURIPrefix() + "/" + getRepository().getName() + getResourcePath("/res1") + "?transactional=true");
+      URI uri = URI.createURI(getURIPrefix() + "/" + getRepository().getName() + getResourcePath("/res1") + "?transactional=true");
 
       ResourceSet resourceSet = new ResourceSetImpl();
       Resource resource = resourceSet.createResource(uri);
@@ -90,8 +89,7 @@ public class Bugzilla_395999_Test extends AbstractCDOTest
     ResourceSet resourceSet = new ResourceSetImpl();
     Resource resource = resourceSet.getResource(resourceURI, true);
 
-    assertEquals("The ResourceSetImpl should returns the same Resource as in the first call", resource,
-        resourceSet.getResource(resourceURI, true));
+    assertEquals("The ResourceSetImpl should returns the same Resource as in the first call", resource, resourceSet.getResource(resourceURI, true));
 
     resource.save(Collections.emptyMap());
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
index 4740425327..bc62b899d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397822_Test.java
@@ -141,8 +141,7 @@ public class Bugzilla_397822_Test extends AbstractCDOTest
     );
   }
 
-  private void assertRevisionDeltaContainsListChanges(CDORevisionDelta revisionDelta, EStructuralFeature feature,
-      CDOFeatureDelta... expectedListChanges)
+  private void assertRevisionDeltaContainsListChanges(CDORevisionDelta revisionDelta, EStructuralFeature feature, CDOFeatureDelta... expectedListChanges)
   {
     CDOFeatureDelta featureDelta = revisionDelta.getFeatureDelta(feature);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399470_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399470_Test.java
index a9b3b78f59..f0a2ebbd63 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399470_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399470_Test.java
@@ -70,8 +70,7 @@ public class Bugzilla_399470_Test extends AbstractCDOTest
 
     CDOSession session = openSession();
     CDOTransaction transaction = session.openTransaction();
-    CDOResource sharedMetamodelResource = transaction
-        .createResource(getResourcePath(metamodelResourceURI.lastSegment()));
+    CDOResource sharedMetamodelResource = transaction.createResource(getResourcePath(metamodelResourceURI.lastSegment()));
     for (EObject content : metamodelResource.getContents())
     {
       EObject copy = copier.get(content);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
index 693d0eb724..d919f8424e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_399641_Test.java
@@ -88,8 +88,7 @@ public class Bugzilla_399641_Test extends AbstractCDOTest
 
     public Object create(String description) throws ProductCreationException
     {
-      return new MyProduct(
-          (MyOtherProduct)getManagedContainer().getElement(MyOtherFactory.PRODUCT_GROUP, MyOtherFactory.TYPE, null));
+      return new MyProduct((MyOtherProduct)getManagedContainer().getElement(MyOtherFactory.PRODUCT_GROUP, MyOtherFactory.TYPE, null));
     }
 
     public IManagedContainer getManagedContainer()
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
index 9563d5f554..a2c54486b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_400311b_Test.java
@@ -457,8 +457,7 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
     containmentList.add(childObject);
     assertVersion(containmentObjectInitialVersion, containmentObject);
     assertVersion(childObjectInitialVersion, childObject);
-    assertEquals("Element should not be detached", false,
-        transaction.getDetachedObjects().containsKey(elementToDeleteID));
+    assertEquals("Element should not be detached", false, transaction.getDetachedObjects().containsKey(elementToDeleteID));
 
     // Step 3: commit
     transaction.commit();
@@ -536,22 +535,18 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
     CDOObject cdoElement = CDOUtil.getCDOObject(element);
     assertClean(cdoElement, ((CDOResource)cdoElement.eResource()).cdoView());
     assertEquals(expectedVersion, cdoElement.cdoRevision().getVersion());
-    assertEquals("Transaction is not expected to contain revision deltas on the given object", null,
-        transaction.getRevisionDeltas().get(cdoElement.cdoID()));
+    assertEquals("Transaction is not expected to contain revision deltas on the given object", null, transaction.getRevisionDeltas().get(cdoElement.cdoID()));
 
     if (expectedDirtyTransaction)
     {
-      assertNotSame("Transaction is expected to contain revision deltas", CDOIDUtil.createMap(),
-          transaction.getRevisionDeltas());
+      assertNotSame("Transaction is expected to contain revision deltas", CDOIDUtil.createMap(), transaction.getRevisionDeltas());
     }
     else
     {
-      assertEquals("Transaction is not expected to contain revision deltas", CDOIDUtil.createMap(),
-          transaction.getRevisionDeltas());
+      assertEquals("Transaction is not expected to contain revision deltas", CDOIDUtil.createMap(), transaction.getRevisionDeltas());
     }
 
-    assertEquals("Transaction is expected to be " + (expectedDirtyTransaction ? "dirty" : "clean"),
-        expectedDirtyTransaction, transaction.isDirty());
+    assertEquals("Transaction is expected to be " + (expectedDirtyTransaction ? "dirty" : "clean"), expectedDirtyTransaction, transaction.isDirty());
   }
 
   /**
@@ -568,8 +563,7 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
   /**
    * Ensures that the CDOServer does not contain 2 identical Adjacent revisions.
    */
-  private static void assertServerDoesNotContainIdenticalAdjacentRevision(CDOID targetElement,
-      CDOTransaction transaction)
+  private static void assertServerDoesNotContainIdenticalAdjacentRevision(CDOID targetElement, CDOTransaction transaction)
   {
     // Step 1: get all revisions for the given ID through the revision manager
     CDORevisionManager revisionManager = transaction.getSession().getRevisionManager();
@@ -584,8 +578,7 @@ public class Bugzilla_400311b_Test extends AbstractCDOTest
       CDOBranchVersion branchVersion = new CDOBranchVersionImpl(transaction.getBranch(), version);
       if (revisionManager.containsRevisionByVersion(targetElement, branchVersion))
       {
-        CDORevision fetched = revisionManager.getRevisionByVersion(targetElement, branchVersion, initialChunkSize,
-            true);
+        CDORevision fetched = revisionManager.getRevisionByVersion(targetElement, branchVersion, initialChunkSize, true);
         if (fetched != null)
         {
           revisions.add(fetched);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_405606_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_405606_Test.java
index a030140494..4438e84fa6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_405606_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_405606_Test.java
@@ -62,8 +62,7 @@ public class Bugzilla_405606_Test extends AbstractCDOTest
       CDOResource res = view.getResource(getResourcePath("/test"));
       Category cat = (Category)res.getContents().get(0);
 
-      IOUtil.OUT()
-          .println("Unchunked: " + ((InternalCDORevision)CDOUtil.getCDOObject(cat).cdoRevision()).isUnchunked());
+      IOUtil.OUT().println("Unchunked: " + ((InternalCDORevision)CDOUtil.getCDOObject(cat).cdoRevision()).isUnchunked());
 
       session.close();
     }
@@ -78,8 +77,7 @@ public class Bugzilla_405606_Test extends AbstractCDOTest
       CDOResource res = view.getResource(getResourcePath("/test"));
       Category cat = (Category)res.getContents().get(0);
 
-      IOUtil.OUT()
-          .println("Unchunked: " + ((InternalCDORevision)CDOUtil.getCDOObject(cat).cdoRevision()).isUnchunked());
+      IOUtil.OUT().println("Unchunked: " + ((InternalCDORevision)CDOUtil.getCDOObject(cat).cdoRevision()).isUnchunked());
 
       // Try to iterate over the items
       for (Category child : cat.getCategories())
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
index ff20da2f18..687a33e1ec 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_411927_Test.java
@@ -111,8 +111,7 @@ public class Bugzilla_411927_Test extends AbstractCDOTest
     getTestProperties().put(RepositoryConfig.PROP_TEST_REPOSITORY, repository);
   }
 
-  private void executeTestWith(FailureTime failureTime)
-      throws ConcurrentAccessException, CommitException, InterruptedException
+  private void executeTestWith(FailureTime failureTime) throws ConcurrentAccessException, CommitException, InterruptedException
   {
     disableConsole();
     initRepository(failureTime);
@@ -146,8 +145,7 @@ public class Bugzilla_411927_Test extends AbstractCDOTest
       clients[id].join();
     }
 
-    assertEquals("Invalidation queue is blocked", true,
-        session.waitForUpdate(getRepository().getLastCommitTimeStamp(), DEFAULT_TIMEOUT));
+    assertEquals("Invalidation queue is blocked", true, session.waitForUpdate(getRepository().getLastCommitTimeStamp(), DEFAULT_TIMEOUT));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
index 675e569a65..fbd263aad1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_412767_Test.java
@@ -52,8 +52,7 @@ public class Bugzilla_412767_Test extends AbstractCDOTest
     try
     {
       URI sharedResourceURI = createRemoteResource();
-      URI sharedResourceURIWithPrefetch = sharedResourceURI
-          .appendQuery(sharedResourceURI.query() + "&" + CDOResource.PREFETCH_PARAMETER + "=true");
+      URI sharedResourceURIWithPrefetch = sharedResourceURI.appendQuery(sharedResourceURI.query() + "&" + CDOResource.PREFETCH_PARAMETER + "=true");
       ResourceSet resourceSet = new ResourceSetImpl();
       CDOResource sharedResource = (CDOResource)resourceSet.getResource(sharedResourceURIWithPrefetch, true);
       assertEquals(CDOState.PROXY, sharedResource.cdoState());
@@ -89,8 +88,8 @@ public class Bugzilla_412767_Test extends AbstractCDOTest
   {
     ResourceSet resourceSet = new ResourceSetImpl();
 
-    URI sharedResourceURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
-        + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource"))
+    URI sharedResourceURI = URI
+        .createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource"))
         .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
     Resource sharedResource = resourceSet.createResource(sharedResourceURI);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
index 768a679832..dc569b3a4a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java
@@ -108,14 +108,13 @@ public class Bugzilla_414270_Test extends AbstractCDOTest
     CDOSession session = openSession();
     CDOBranchManager branchManager = session.getBranchManager();
 
-    int count = branchManager.getBranches(CDOBranch.MAIN_BRANCH_ID + 1, CDOBranch.MAIN_BRANCH_ID + 2,
-        new CDOBranchHandler()
-        {
-          public void handleBranch(CDOBranch branch)
-          {
-            fail("No result branch expected");
-          }
-        });
+    int count = branchManager.getBranches(CDOBranch.MAIN_BRANCH_ID + 1, CDOBranch.MAIN_BRANCH_ID + 2, new CDOBranchHandler()
+    {
+      public void handleBranch(CDOBranch branch)
+      {
+        fail("No result branch expected");
+      }
+    });
 
     assertEquals(0, count);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
index 843e345d43..bed251aa87 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414949_Test.java
@@ -68,8 +68,7 @@ public class Bugzilla_414949_Test extends AbstractCDOTest
     dDiagram.getOtherNodes().add(filterDescription1);
 
     ResourceSet resourceSet = new ResourceSetImpl();
-    oldResourceFactory = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*",
-        new XMIResourceFactoryImpl());
+    oldResourceFactory = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
     String path = new File("./" + LOCAL_RESOURCE_NAME).getCanonicalPath();
     URI localResourceURI = URI.createFileURI(path);
     localResource = resourceSet.createResource(localResourceURI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
index 3732d92dbb..37fe6847c0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
@@ -115,8 +115,7 @@ public class Bugzilla_415415_Test extends AbstractCDOTest
     CDOCommitInfo commit = remoteUser.commit();
     transaction.waitForUpdate(commit.getTimeStamp(), DEFAULT_TIMEOUT);
 
-    assertEquals("As child1 is remotelly detached, the stale reference child2.otherNodes:child1 should be removed", 0,
-        child2.getOtherNodes().size());
+    assertEquals("As child1 is remotelly detached, the stale reference child2.otherNodes:child1 should be removed", 0, child2.getOtherNodes().size());
 
     String assertMessage = "As the stale reference child2.otherNodes:child1 has been removed the transaction should be clean";
     assertEquals(assertMessage, false, transaction.isDirty());
@@ -135,8 +134,7 @@ public class Bugzilla_415415_Test extends AbstractCDOTest
 
     assertEquals(1, transaction.getDetachedObjects().size());
     assertEquals(child1CDO, transaction.getDetachedObjects().get(child1ID));
-    assertEquals("As child1 is locally detached, the stale reference child2.otherNodes:child1 should be removed", 0,
-        child2.getOtherNodes().size());
+    assertEquals("As child1 is locally detached, the stale reference child2.otherNodes:child1 should be removed", 0, child2.getOtherNodes().size());
 
     String assertMessage = "As the stale reference child2.otherNodes:child1 has been removed, child2 and nodeARoot should be the only dirty objects";
     assertEquals(assertMessage, 2, transaction.getDirtyObjects().size());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416366_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416366_Test.java
index 4433a4c5b6..f0497fce8a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416366_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416366_Test.java
@@ -49,8 +49,7 @@ public class Bugzilla_416366_Test extends AbstractCDOTest
     transaction.commit();
 
     CDOView newView = session.openView();
-    CDOQuery ocl = newView.createQuery("ocl",
-        "Child.allInstances()->select(c|c.eContainer().oclAsType(Parent).name = 'B')", getModel5Package().getChild());
+    CDOQuery ocl = newView.createQuery("ocl", "Child.allInstances()->select(c|c.eContainer().oclAsType(Parent).name = 'B')", getModel5Package().getChild());
 
     // eContainer() is inherited implicitly from EObject
     ocl.setParameter("cdoImplicitRootClass", EcorePackage.Literals.EOBJECT);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
index b26f36e6cd..cabba748cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
@@ -56,8 +56,7 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     transaction.commit();
 
     CDOView newView = session.openView();
-    CDOQuery ocl = newView.createQuery("ocl",
-        "eresource::CDOResource.allInstances()->any(path=rootPath).cdoAllProperContents()",
+    CDOQuery ocl = newView.createQuery("ocl", "eresource::CDOResource.allInstances()->any(path=rootPath).cdoAllProperContents()",
         EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("rootPath", rootPath);
 
@@ -91,8 +90,7 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     transaction.commit();
 
     CDOView newView = session.openView();
-    CDOQuery ocl = newView.createQuery("ocl",
-        "eresource::CDOResource.allInstances()->any(path=rootPath).cdoAllProperContents(EClass).name->asSet()",
+    CDOQuery ocl = newView.createQuery("ocl", "eresource::CDOResource.allInstances()->any(path=rootPath).cdoAllProperContents(EClass).name->asSet()",
         EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("rootPath", rootPath);
 
@@ -132,8 +130,7 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     String scopeClause = "e.eResource().oclAsType(eresource::CDOResource).path.startsWith(folderPath) and ";
 
     CDOView newView = session.openView();
-    CDOQuery ocl = newView.createQuery("ocl",
-        "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*bug416474.*'))",
+    CDOQuery ocl = newView.createQuery("ocl", "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*bug416474.*'))",
         EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("cdoImplicitRootClass", EcorePackage.Literals.EOBJECT);
     ocl.setParameter("folderPath", folderPath);
@@ -143,9 +140,7 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     assertEquals(true, results.contains(newView.getObject(nested)));
     assertEquals(2, results.size());
 
-    ocl = newView.createQuery("ocl",
-        "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*Nested.?'))",
-        EcorePackage.Literals.EPACKAGE);
+    ocl = newView.createQuery("ocl", "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*Nested.?'))", EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("cdoImplicitRootClass", EcorePackage.Literals.EOBJECT);
     ocl.setParameter("folderPath", folderPath);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416555_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416555_Test.java
index 430b6afb2a..63ffcbc5d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416555_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416555_Test.java
@@ -130,8 +130,7 @@ public class Bugzilla_416555_Test extends AbstractCDOTest
   private void assertResultAsync(CDOView view, int orders, int purchaseOrders, int salesOrders)
   {
     assertResultAsync(orders, view.queryInstancesAsync(getModel1Package().getOrder()), Order.class);
-    assertResultAsync(purchaseOrders, view.queryInstancesAsync(getModel1Package().getPurchaseOrder()),
-        PurchaseOrder.class);
+    assertResultAsync(purchaseOrders, view.queryInstancesAsync(getModel1Package().getPurchaseOrder()), PurchaseOrder.class);
     assertResultAsync(salesOrders, view.queryInstancesAsync(getModel1Package().getSalesOrder()), SalesOrder.class);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_423699_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_423699_Test.java
index 64c0cf12d7..24b2e27c40 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_423699_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_423699_Test.java
@@ -175,8 +175,7 @@ public class Bugzilla_423699_Test extends AbstractLockingTest
         InternalSession session = getRepository().getSessionManager().getSession(tx.getSessionID());
         StoreThreadLocal.setSession(session);
         // Do your call
-        durableLock = getRepository().getLockingManager().getLockArea(tx.getDurableLockingID()).getLocks()
-            .get(elementID);
+        durableLock = getRepository().getLockingManager().getLockArea(tx.getDurableLockingID()).getLocks().get(elementID);
       }
       finally
       {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
index 60693afd49..92a53f9c62 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_429659_Test.java
@@ -45,8 +45,7 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
     List<EObject> objectsToAdd = new ArrayList<EObject>();
     objectsToAdd.add(getModel3SubpackageFactory().createClass2());
     objectsToAdd.add(getModel3SubpackageFactory().createClass2());
-    performUnsetOnMultiValuedFeature(getXMIResource(), getModel3Factory().createClass1(),
-        getModel3Package().getClass1_Class2(), true, objectsToAdd);
+    performUnsetOnMultiValuedFeature(getXMIResource(), getModel3Factory().createClass1(), getModel3Package().getClass1_Class2(), true, objectsToAdd);
   }
 
   public void testUnsetOnUnsettableMultiValuedFeatureCDOResource() throws Exception
@@ -54,8 +53,7 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
     List<EObject> objectsToAdd = new ArrayList<EObject>();
     objectsToAdd.add(getModel3SubpackageFactory().createClass2());
     objectsToAdd.add(getModel3SubpackageFactory().createClass2());
-    performUnsetOnMultiValuedFeature(getCDOResource(), getModel3Factory().createClass1(),
-        getModel3Package().getClass1_Class2(), true, objectsToAdd);
+    performUnsetOnMultiValuedFeature(getCDOResource(), getModel3Factory().createClass1(), getModel3Package().getClass1_Class2(), true, objectsToAdd);
   }
 
   public void testUnsetOnNonUnsettableMultiValuedFeatureXMIResource() throws Exception
@@ -63,8 +61,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
     List<EObject> objectsToAdd = new ArrayList<EObject>();
     objectsToAdd.add(getModel6Factory().createBaseObject());
     objectsToAdd.add(getModel6Factory().createBaseObject());
-    performUnsetOnMultiValuedFeature(getXMIResource(), getModel6Factory().createReferenceObject(),
-        getModel6Package().getReferenceObject_ReferenceList(), false, objectsToAdd);
+    performUnsetOnMultiValuedFeature(getXMIResource(), getModel6Factory().createReferenceObject(), getModel6Package().getReferenceObject_ReferenceList(), false,
+        objectsToAdd);
   }
 
   public void testUnsetOnNonUnsettableMultiValuedFeatureCDOResource() throws Exception
@@ -72,8 +70,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
     List<EObject> objectsToAdd = new ArrayList<EObject>();
     objectsToAdd.add(getModel6Factory().createBaseObject());
     objectsToAdd.add(getModel6Factory().createBaseObject());
-    performUnsetOnMultiValuedFeature(getCDOResource(), getModel6Factory().createReferenceObject(),
-        getModel6Package().getReferenceObject_ReferenceList(), false, objectsToAdd);
+    performUnsetOnMultiValuedFeature(getCDOResource(), getModel6Factory().createReferenceObject(), getModel6Package().getReferenceObject_ReferenceList(), false,
+        objectsToAdd);
   }
 
   public void testUnsetOnUnsettableSingleValuedAttributeCDOResource() throws Exception
@@ -90,14 +88,14 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
 
   public void testUnsetOnNonUnsettableSingleValuedAttributeCDOResource() throws Exception
   {
-    performUnsetOnSingleValuedFeature(getCDOResource(), getModel6Factory().createEmptyStringDefault(),
-        getModel6Package().getEmptyStringDefault_Attribute(), false, "test");
+    performUnsetOnSingleValuedFeature(getCDOResource(), getModel6Factory().createEmptyStringDefault(), getModel6Package().getEmptyStringDefault_Attribute(),
+        false, "test");
   }
 
   public void testUnsetOnNonUnsettableSingleValuedAttributeXMIResource() throws Exception
   {
-    performUnsetOnSingleValuedFeature(getXMIResource(), getModel6Factory().createEmptyStringDefault(),
-        getModel6Package().getEmptyStringDefault_Attribute(), false, "test");
+    performUnsetOnSingleValuedFeature(getXMIResource(), getModel6Factory().createEmptyStringDefault(), getModel6Package().getEmptyStringDefault_Attribute(),
+        false, "test");
   }
 
   private Resource getCDOResource()
@@ -119,8 +117,8 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
     return localResource;
   }
 
-  private void performUnsetOnSingleValuedFeature(Resource resource, EObject root, EStructuralFeature feature,
-      boolean unsettable, Object addedObject) throws Exception
+  private void performUnsetOnSingleValuedFeature(Resource resource, EObject root, EStructuralFeature feature, boolean unsettable, Object addedObject)
+      throws Exception
   {
     // To have CDOLegacyAdapter even in local
     CDOUtil.getCDOObject(root);
@@ -144,13 +142,12 @@ public class Bugzilla_429659_Test extends AbstractCDOTest
 
     // check
     assertEquals("Incorrect number of expected notifications: ", 1, notifications.size());
-    assertEquals("Incorrect notification: ", unsettable ? Notification.UNSET : Notification.SET,
-        notifications.get(0).getEventType());
+    assertEquals("Incorrect notification: ", unsettable ? Notification.UNSET : Notification.SET, notifications.get(0).getEventType());
   }
 
   @SuppressWarnings("unchecked")
-  private void performUnsetOnMultiValuedFeature(Resource resource, EObject root, EStructuralFeature feature,
-      boolean unsettable, List<EObject> objectstoAdd) throws Exception
+  private void performUnsetOnMultiValuedFeature(Resource resource, EObject root, EStructuralFeature feature, boolean unsettable, List<EObject> objectstoAdd)
+      throws Exception
   {
     // To have CDOLegacyAdapter even in local
     CDOUtil.getCDOObject(root);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
index 512844fa8c..6f84da3486 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
@@ -88,8 +88,7 @@ public class Bugzilla_435532_Test extends AbstractCDOTest
   private void doTestDragChildren(int oldPosition, int newPosition) throws ConcurrentAccessException, CommitException
   {
     // Step 1: get children to move
-    List<Category> childrenToMove = new ArrayList<Category>(
-        root.getCategories().subList(oldPosition, oldPosition + CHILDREN_TO_MOVE_NUMBER));
+    List<Category> childrenToMove = new ArrayList<Category>(root.getCategories().subList(oldPosition, oldPosition + CHILDREN_TO_MOVE_NUMBER));
     List<CDOID> childrenToMoveIds = new ArrayList<CDOID>();
     for (Category child : childrenToMove)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
index 2f82a0be25..86fb800e26 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
@@ -94,16 +94,13 @@ public class Bugzilla_436246_Test extends AbstractCDOTest
     SignalCounter signalCounter = new SignalCounter(protocol);
 
     CDOBranch currentBranch = session.getBranchManager().getMainBranch();
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY,
-        true);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY, true);
 
     currentBranch = currentBranch.getBranch(B1_BRANCH_NAME);
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 2 * NB_CATEGORY,
-        true);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 2 * NB_CATEGORY, true);
 
     currentBranch = currentBranch.getBranch(B11_BRANCH_NAME);
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 3 * NB_CATEGORY,
-        true);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 3 * NB_CATEGORY, true);
 
     protocol.removeListener(signalCounter);
   }
@@ -125,22 +122,19 @@ public class Bugzilla_436246_Test extends AbstractCDOTest
     SignalCounter signalCounter = new SignalCounter(protocol);
 
     CDOBranch currentBranch = session.getBranchManager().getMainBranch();
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY,
-        false);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY, false);
 
     currentBranch = currentBranch.getBranch(B1_BRANCH_NAME);
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 2 * NB_CATEGORY,
-        false);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 2 * NB_CATEGORY, false);
 
     currentBranch = currentBranch.getBranch(B11_BRANCH_NAME);
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 3 * NB_CATEGORY,
-        false);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 3 * NB_CATEGORY, false);
 
     protocol.removeListener(signalCounter);
   }
 
-  private void testCDORevisionFetchWithChangesOnAllBranches(CDOSession session, CDOBranch currentBranch,
-      SignalCounter signalCounter, CDOID companyCDOID, int expectedNbCategories, boolean prefetch)
+  private void testCDORevisionFetchWithChangesOnAllBranches(CDOSession session, CDOBranch currentBranch, SignalCounter signalCounter, CDOID companyCDOID,
+      int expectedNbCategories, boolean prefetch)
   {
     CDOView view = session.openView(currentBranch);
     assertEquals(0, signalCounter.getCountFor(LoadRevisionsRequest.class));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
index d033c3d913..3dc0683a23 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_437817_Test.java
@@ -48,11 +48,11 @@ public class Bugzilla_437817_Test extends AbstractCDOTest
     {
       ResourceSet resourceSet = new ResourceSetImpl();
 
-      URI sharedResource1URI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
-          + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource1"))
+      URI sharedResource1URI = URI
+          .createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource1"))
           .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
-      URI sharedResource2URI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/"
-          + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource2"))
+      URI sharedResource2URI = URI
+          .createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource2"))
           .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
       Resource sharedResource1 = resourceSet.createResource(sharedResource1URI);
       Resource sharedResource2 = resourceSet.createResource(sharedResource2URI);
@@ -61,8 +61,7 @@ public class Bugzilla_437817_Test extends AbstractCDOTest
       Assert.assertTrue(sharedResource2 instanceof CDOResource);
       CDOResource sharedCDOResource1 = (CDOResource)sharedResource1;
       CDOResource sharedCDOResource2 = (CDOResource)sharedResource2;
-      assertEquals(
-          "Both CDOResources should have the same CDOView as they have the same ResourceSet and use content from the same repository",
+      assertEquals("Both CDOResources should have the same CDOView as they have the same ResourceSet and use content from the same repository",
           sharedCDOResource1.cdoView(), sharedCDOResource2.cdoView());
     }
     finally
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
index 57108fa8f5..82e78e5296 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
@@ -90,8 +90,7 @@ public class Bugzilla_439337_Test extends AbstractCDOTest
   private void testCDOLockState(CDOView view, boolean cdoLockStatePrefetchEnabled)
   {
     view.getResourceSet().eAdapters().add(new EContentAdapterQueringCDOLockState());
-    ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)view.getSession()).options()
-        .getNet4jProtocol();
+    ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)view.getSession()).options().getNet4jProtocol();
     SignalCounter signalCounter = new SignalCounter(protocol);
     view.getResource(getResourcePath(RESOURCE_NAME + "?" + CDOResource.PREFETCH_PARAMETER + "=" + Boolean.TRUE));
 
@@ -103,18 +102,14 @@ public class Bugzilla_439337_Test extends AbstractCDOTest
     assertNotSame(0, signalCounter.getCountFor(QueryCancelRequest.class));
     assertNotSame(0, signalCounter.getCountFor(LoadRevisionsRequest.class));
     assertNotSame(0, signalCounter.getCountFor(LockStateRequest.class));
-    assertEquals("1 single query request should have been sent to get the resourcePath", 1,
-        signalCounter.getCountFor(QueryRequest.class));
-    assertEquals("1 single query request should have been sent to cancel the single QueryRequest", 1,
-        signalCounter.getCountFor(QueryCancelRequest.class));
+    assertEquals("1 single query request should have been sent to get the resourcePath", 1, signalCounter.getCountFor(QueryRequest.class));
+    assertEquals("1 single query request should have been sent to cancel the single QueryRequest", 1, signalCounter.getCountFor(QueryCancelRequest.class));
     assertEquals(
         "3 load revisions request should have been sent, 2 first for CDORevisions of CDOResourceFolders to get resource path and another in prefetch to load all CDORevisions of CDOResource",
         3, signalCounter.getCountFor(LoadRevisionsRequest.class));
     int expectedNbLockStateRequestCalls = (cdoLockStatePrefetchEnabled ? 0 : NB_CATEGORIES) + 2;
-    assertEquals(
-        "As CDOLockState prefetch is " + (cdoLockStatePrefetchEnabled ? "" : "not ") + "enabled "
-            + expectedNbLockStateRequestCalls + " LockStateRequests should have been sent to the server",
-        expectedNbLockStateRequestCalls, signalCounter.getCountFor(LockStateRequest.class));
+    assertEquals("As CDOLockState prefetch is " + (cdoLockStatePrefetchEnabled ? "" : "not ") + "enabled " + expectedNbLockStateRequestCalls
+        + " LockStateRequests should have been sent to the server", expectedNbLockStateRequestCalls, signalCounter.getCountFor(LockStateRequest.class));
 
     protocol.removeListener(signalCounter);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
index 73d8dc7f20..551c8d5766 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_441136_Test.java
@@ -63,8 +63,7 @@ public class Bugzilla_441136_Test extends AbstractCDOTest
   {
     CDOSession session = openSession();
     getRepository().getCommitInfoManager().addCommitInfoHandler(new CommitTransactionIndicationWaiting());
-    ((CDONet4jSession)session).options()
-        .setCommitTimeout(1000 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS);
+    ((CDONet4jSession)session).options().setCommitTimeout(1000 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS);
     ((CDONet4jSessionImpl)session).setSignalTimeout(10000 * SignalProtocol.DEFAULT_TIMEOUT);
     CDOTransaction transaction = session.openTransaction();
     ISignalProtocol<?> protocol = ((org.eclipse.emf.cdo.net4j.CDONet4jSession)session).options().getNet4jProtocol();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_443281_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_443281_Test.java
index 876b4a3306..8297c1ef3a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_443281_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_443281_Test.java
@@ -40,8 +40,7 @@ public class Bugzilla_443281_Test extends AbstractCDOTest
   public void setUp() throws Exception
   {
     super.setUp();
-    oldResourceFactory = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*",
-        new XMIResourceFactoryImpl());
+    oldResourceFactory = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
     resourceSet = new ResourceSetImpl();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
index 1d4b2ec6b7..5c7a961074 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java
@@ -51,12 +51,10 @@ public class Bugzilla_447912_Test extends AbstractCDOTest
     NewBranchNotificationListener listener = new NewBranchNotificationListener(session2);
     mainBranchFromView1.createBranch(branchB2Name);
 
-    assertEquals("Timeout - No CDOBranchChangedEvent received.", true,
-        listener.getLatch().await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS));
+    assertEquals("Timeout - No CDOBranchChangedEvent received.", true, listener.getLatch().await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS));
 
     assertEquals(mainBranchFromView1.getBranches().length, mainBranchFromView2.getBranches().length);
-    assertEquals(session1.getBranchManager().getMainBranch().getBranches().length,
-        session2.getBranchManager().getMainBranch().getBranches().length);
+    assertEquals(session1.getBranchManager().getMainBranch().getBranches().length, session2.getBranchManager().getMainBranch().getBranches().length);
     assertEquals(2, mainBranchFromView1.getBranches().length);
     assertEquals(mainBranchFromView1.getBranches()[0].getID(), mainBranchFromView2.getBranches()[0].getID());
     assertEquals(mainBranchFromView1.getBranches()[1].getID(), mainBranchFromView2.getBranches()[1].getID());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
index b3bddd92a0..2758489838 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
@@ -66,8 +66,7 @@ public class Bugzilla_449806_Test extends AbstractCDOTest
     testCDOAbstractFeatureRuleAnalyzer(new CDOFeatureAnalyzerModelBased());
   }
 
-  private void testCDOAbstractFeatureRuleAnalyzer(CDOAbstractFeatureRuleAnalyzer abstractFeatureRuleAnalyzer)
-      throws Exception
+  private void testCDOAbstractFeatureRuleAnalyzer(CDOAbstractFeatureRuleAnalyzer abstractFeatureRuleAnalyzer) throws Exception
   {
     CDOSession session = openSession();
     session.options().setCollectionLoadingPolicy(new CDOCollectionLoadingPolicyImpl(1, 0));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java
index d74214ba3c..87828ef1f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java
@@ -65,8 +65,7 @@ public class Bugzilla_456993_Test extends AbstractCDOTest
     testAllInstancesQueryOnBranches(CDOProtocolConstants.QUERY_LANGUAGE_INSTANCES, null, null, null);
   }
 
-  private void testAllInstancesQueryOnBranches(String language, String queryStringSuffix, String parameterName,
-      String parameterValue) throws Exception
+  private void testAllInstancesQueryOnBranches(String language, String queryStringSuffix, String parameterName, String parameterValue) throws Exception
   {
     CDOSession session1 = openSession();
     CDOBranch mainBranch = session1.getBranchManager().getMainBranch();
@@ -217,8 +216,7 @@ public class Bugzilla_456993_Test extends AbstractCDOTest
   private CDOQuery createQuery(CDOView view, String language, EObject eObject, String queryStringSuffix)
   {
     EClass eClass = eObject.eClass();
-    CDOQuery query = view.createQuery(language,
-        queryStringSuffix != null ? eClass.getEPackage().getName() + "::" + eClass.getName() + queryStringSuffix : null,
+    CDOQuery query = view.createQuery(language, queryStringSuffix != null ? eClass.getEPackage().getName() + "::" + eClass.getName() + queryStringSuffix : null,
         eObject.eResource() != null ? eObject : null);
     if (queryStringSuffix == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
index a112c2ab04..35da39da76 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
@@ -43,8 +43,8 @@ public class Bugzilla_458149_Test extends AbstractCDOTest
     getRepository();
     ResourceSet resourceSet = new ResourceSetImpl();
 
-    URI sharedResourceURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost/" + RepositoryConfig.REPOSITORY_NAME
-        + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+    URI sharedResourceURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost/" + RepositoryConfig.REPOSITORY_NAME + getResourcePath("/sharedResource"))
+        .appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
     Resource sharedResource = resourceSet.createResource(sharedResourceURI);
     sharedResource.save(Collections.emptyMap());
     assertEquals(sharedResourceURI, sharedResource.getURI());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458279_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458279_Test.java
index 541cafdcf3..84d369a797 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458279_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458279_Test.java
@@ -35,8 +35,7 @@ public class Bugzilla_458279_Test extends AbstractCDOTest
   /**
    * Test {@link CDOMergingConflictResolver} without {@link ChangeSubscriptionRequest} sent to the server and using {@link PassiveUpdateMode#ADDITIONS}.
    */
-  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithAdditionsPassiveUpdateMode()
-      throws Exception
+  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithAdditionsPassiveUpdateMode() throws Exception
   {
     testCDOMergingConflictResolverWithoutChangeSubscriptionRequest(PassiveUpdateMode.ADDITIONS);
   }
@@ -44,8 +43,7 @@ public class Bugzilla_458279_Test extends AbstractCDOTest
   /**
    * Test {@link CDOMergingConflictResolver} without {@link ChangeSubscriptionRequest} sent to the server and using {@link PassiveUpdateMode#ADDITIONS}.
    */
-  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithChangesPassiveUpdateMode()
-      throws Exception
+  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithChangesPassiveUpdateMode() throws Exception
   {
     testCDOMergingConflictResolverWithoutChangeSubscriptionRequest(PassiveUpdateMode.CHANGES);
   }
@@ -53,8 +51,7 @@ public class Bugzilla_458279_Test extends AbstractCDOTest
   /**
    * Test {@link CDOMergingConflictResolver} without {@link ChangeSubscriptionRequest} sent to the server and using {@link PassiveUpdateMode#INVALIDATIONS}.
    */
-  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithInvalidationsPassiveUpdateMode()
-      throws Exception
+  public void testCDOMergingConflictResolverWithoutChangeSubscriptionRequestWithInvalidationsPassiveUpdateMode() throws Exception
   {
     testCDOMergingConflictResolverWithoutChangeSubscriptionRequest(PassiveUpdateMode.INVALIDATIONS);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
index f13960db48..85070b2c3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
@@ -68,8 +68,7 @@ public class Bugzilla_466721_Test extends AbstractCDOTest
     catch (ObjectNotFoundException e)
     {
       Throwable t = exceptionAsserter.getThrowable();
-      Assert.assertFalse(t != null ? exceptionAsserter.getThrowable().toString() : "",
-          exceptionAsserter.exceptionsOccured());
+      Assert.assertFalse(t != null ? exceptionAsserter.getThrowable().toString() : "", exceptionAsserter.exceptionsOccured());
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_500864_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_500864_Test.java
index 4e2b4632cf..ee518df4c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_500864_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_500864_Test.java
@@ -60,8 +60,7 @@ public class Bugzilla_500864_Test extends AbstractCDOTest
     assertTrue("Customer CDOID should be in detached objects list.", detachedIdsFromTransaction.contains(customer1Id));
 
     CDOSession session2 = openSession();
-    CDOCommitInfo commitInfoFromManager = session2.getCommitInfoManager()
-        .getCommitInfo(commitInfoFromTransaction.getTimeStamp());
+    CDOCommitInfo commitInfoFromManager = session2.getCommitInfoManager().getCommitInfo(commitInfoFromTransaction.getTimeStamp());
     Set<CDOID> detachedIdsFromManager = toSet(commitInfoFromManager.getDetachedObjects());
 
     assertEquals(2, detachedIdsFromManager.size());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index f8cf700b3a..aa583a1ca1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -588,8 +588,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
   @Override
   public String toString()
   {
-    return MessageFormat.format("{0}.{1} [{2}, {3}, {4}]", getClass().getSimpleName(), getName(), getRepositoryConfig(),
-        getSessionConfig(), getModelConfig());
+    return MessageFormat.format("{0}.{1} [{2}, {3}, {4}]", getClass().getSimpleName(), getName(), getRepositoryConfig(), getSessionConfig(), getModelConfig());
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
index 935ed5537b..f3d25e4ccc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
@@ -55,8 +55,7 @@ public abstract class ConfigTestSuite implements IConstants
     return suite;
   }
 
-  public void addScenario(TestSuite parent, RepositoryConfig repositoryConfig, SessionConfig sessionConfig,
-      ModelConfig modelConfig)
+  public void addScenario(TestSuite parent, RepositoryConfig repositoryConfig, SessionConfig sessionConfig, ModelConfig modelConfig)
   {
     IScenario scenario = new Scenario();
     scenario.setRepositoryConfig(repositoryConfig);
@@ -168,8 +167,7 @@ public abstract class ConfigTestSuite implements IConstants
   {
     private IScenario scenario;
 
-    public TestClassWrapper(Class<? extends ConfigTest> testClass, IScenario scenario, ConfigTestSuite suite)
-        throws ConstraintsViolatedException
+    public TestClassWrapper(Class<? extends ConfigTest> testClass, IScenario scenario, ConfigTestSuite suite) throws ConstraintsViolatedException
     {
       // super(testClass, testClass.getName()); // Important for the UI to set the *qualified* class name!
       this.scenario = scenario;
@@ -197,8 +195,7 @@ public abstract class ConfigTestSuite implements IConstants
       }
     }
 
-    private void addTestsFromTestCase(final Class<?> theClass, ConfigTestSuite suite)
-        throws ConstraintsViolatedException
+    private void addTestsFromTestCase(final Class<?> theClass, ConfigTestSuite suite) throws ConstraintsViolatedException
     {
       setName(theClass.getName());
 
@@ -208,8 +205,7 @@ public abstract class ConfigTestSuite implements IConstants
       }
       catch (NoSuchMethodException e)
       {
-        addTest(
-            warning("Class " + theClass.getName() + " has no public constructor TestCase(String name) or TestCase()"));
+        addTest(warning("Class " + theClass.getName() + " has no public constructor TestCase(String name) or TestCase()"));
         return;
       }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index 76fe0ba7b7..be7e359a55 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -126,8 +126,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
 
   private static final boolean LOG_MULTI_VIEW_COMMIT = false;
 
-  private static final Boolean enableServerBrowser = Boolean
-      .getBoolean("org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.enableServerBrowser");
+  private static final Boolean enableServerBrowser = Boolean.getBoolean("org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.enableServerBrowser");
 
   private static final long serialVersionUID = 1L;
 
@@ -155,8 +154,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
 
   private transient IRepository.WriteAccessHandler resourcePathChecker;
 
-  public RepositoryConfig(String name, boolean supportingAudits, boolean supportingBranches,
-      IDGenerationLocation idGenerationLocation)
+  public RepositoryConfig(String name, boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
   {
     super(name);
 
@@ -214,8 +212,8 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
   @Override
   public String getName()
   {
-    return super.getName() + (supportingBranches ? "-branching" : supportingAudits ? "-auditing" : "")
-        + getMappingStrategySpecialization() + (idGenerationLocation == IDGenerationLocation.CLIENT ? "-uuids" : "");
+    return super.getName() + (supportingBranches ? "-branching" : supportingAudits ? "-auditing" : "") + getMappingStrategySpecialization()
+        + (idGenerationLocation == IDGenerationLocation.CLIENT ? "-uuids" : "");
   }
 
   protected String getMappingStrategySpecialization()
@@ -411,8 +409,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
     {
       repository.addHandler(new IRepository.WriteAccessHandler()
       {
-        public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-            OMMonitor monitor) throws RuntimeException
+        public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
         {
           int count = 0;
           for (ISession session : repository.getSessionManager().getSessions())
@@ -427,8 +424,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
           }
         }
 
-        public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-            OMMonitor monitor)
+        public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
         {
         }
       });
@@ -468,8 +464,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       }
     });
 
-    if (enableServerBrowser || Boolean.TRUE.equals(getTestProperty(PROP_TEST_ENABLE_SERVER_BROWSER))
-        || getCurrentTest().hasDefaultScenario())
+    if (enableServerBrowser || Boolean.TRUE.equals(getTestProperty(PROP_TEST_ENABLE_SERVER_BROWSER)) || getCurrentTest().hasDefaultScenario())
     {
       serverBrowser = new CDOServerBrowser(repositories);
       serverBrowser.activate();
@@ -551,8 +546,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
     {
       resourcePathChecker = new IRepository.WriteAccessHandler()
       {
-        public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext,
-            OMMonitor monitor) throws RuntimeException
+        public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException
         {
           for (InternalCDORevision revision : commitContext.getNewObjects())
           {
@@ -563,16 +557,14 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
               String prefix = test.getResourcePath("");
               if (!path.startsWith(prefix) && !hasAnnotation(CleanRepositoriesBefore.class))
               {
-                throw new RuntimeException("Test case " + test.getClass().getName() + '.' + test.getName()
-                    + " does not use getResourcePath() for resource " + path + ", nor does it declare @"
-                    + CleanRepositoriesBefore.class.getSimpleName());
+                throw new RuntimeException("Test case " + test.getClass().getName() + '.' + test.getName() + " does not use getResourcePath() for resource "
+                    + path + ", nor does it declare @" + CleanRepositoriesBefore.class.getSimpleName());
               }
             }
           }
         }
 
-        public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
-            OMMonitor monitor)
+        public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
         {
           // Do nothing
         }
@@ -844,8 +836,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       stopMasterTransport();
     }
 
-    protected InternalRepository createMasterRepository(String masterName, String name, Map<String, String> props,
-        boolean failover)
+    protected InternalRepository createMasterRepository(String masterName, String name, Map<String, String> props, boolean failover)
     {
       IStore masterStore = createStore(masterName);
 
@@ -853,8 +844,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       if (failover)
       {
         InternalRepositorySynchronizer synchronizer = createSynchronizer("backup", name);
-        repository = (InternalRepository)CDOServerUtil.createFailoverParticipant(masterName, masterStore, props,
-            synchronizer, true);
+        repository = (InternalRepository)CDOServerUtil.createFailoverParticipant(masterName, masterStore, props, synchronizer, true);
       }
       else
       {
@@ -896,8 +886,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       InternalSynchronizableRepository repository;
       if (failover)
       {
-        repository = (InternalSynchronizableRepository)CDOServerUtil.createFailoverParticipant(name, store, props,
-            synchronizer, false);
+        repository = (InternalSynchronizableRepository)CDOServerUtil.createFailoverParticipant(name, store, props, synchronizer, false);
       }
       else
       {
@@ -944,8 +933,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
           IManagedContainer container = getCurrentTest().getServerContainer();
           IConnector connector = Net4jUtil.getConnector(container, "jvm", acceptorName);
 
-          InternalCDORevisionManager revisionManager = (InternalCDORevisionManager)CDORevisionUtil
-              .createRevisionManager();
+          InternalCDORevisionManager revisionManager = (InternalCDORevisionManager)CDORevisionUtil.createRevisionManager();
           revisionManager.setCache(new NOOPRevisionCache());
 
           CDONet4jSessionConfiguration config = new CDONet4jSessionConfigurationImpl()
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
index bd913ec94b..573a0f9e80 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
@@ -351,8 +351,7 @@ public abstract class SessionConfig extends Config implements ISessionConfig
     {
       IRepository repository = getCurrentTest().getRepository(repositoryName);
 
-      org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration configuration = CDOServerUtil
-          .createSessionConfiguration();
+      org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration configuration = CDOServerUtil.createSessionConfiguration();
       configuration.setRepository(repository);
       return configuration;
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java
index cf82fbf2f7..54b8de1aa6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java
@@ -82,8 +82,7 @@ public class Bugzilla_319552_Test extends AbstractSyncingTest
       protected boolean successful()
       {
         // check revision versions.
-        return CDOUtil.getCDOObject(masterCompany).cdoRevision().getVersion() == CDOUtil.getCDOObject(company)
-            .cdoRevision().getVersion();
+        return CDOUtil.getCDOObject(masterCompany).cdoRevision().getVersion() == CDOUtil.getCDOObject(company).cdoRevision().getVersion();
       }
     }.assertNoTimeOut();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
index 146c82d9b9..040bc27e64 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java
@@ -123,8 +123,7 @@ public class Bugzilla_328352_Test extends AbstractSyncingTest
     catA.setName(catA.getName() + " empty");
     masterTransaction.commit();
 
-    System.out.println(MessageFormat.format("## Committing changes on {0} products took: {1}", NUM_PRODUCTS,
-        System.currentTimeMillis() - start));
+    System.out.println(MessageFormat.format("## Committing changes on {0} products took: {1}", NUM_PRODUCTS, System.currentTimeMillis() - start));
 
     // session.waitForUpdate(masterTransaction.getLastCommitTime(), 5000);
     for (CDOView view : cloneViews)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
index 52b3ffb108..4a97548404 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
@@ -62,8 +62,7 @@ public class OfflineDelayed2Test extends AbstractSyncingTest
     sleep(1000);
 
     CDOTransaction cloneTransaction = cloneSession.openTransaction();
-    CDOObject cloneCompany = CDOUtil
-        .getCDOObject(cloneTransaction.getObject(CDOUtil.getCDOObject(masterCompany).cdoID()));
+    CDOObject cloneCompany = CDOUtil.getCDOObject(cloneTransaction.getObject(CDOUtil.getCDOObject(masterCompany).cdoID()));
     assertEquals(nbrOfCommits + 1, cloneCompany.cdoRevision().getVersion());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
index e12b6e9a3f..9dcd21aaf3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineLockingTest.java
@@ -79,8 +79,7 @@ public class OfflineLockingTest extends AbstractSyncingTest
     waitForOnline(clone1Session.getRepositoryInfo());
 
     CDOSession clone2Session = openSession("repo2");
-    TestListener2 session2invalidationListener = new TestListener2(CDOSessionInvalidationEvent.class,
-        "session2invalidationListener");
+    TestListener2 session2invalidationListener = new TestListener2(CDOSessionInvalidationEvent.class, "session2invalidationListener");
     clone2Session.addListener(session2invalidationListener);
     TestListener2 session2lockListener = new TestListener2(CDOSessionLocksChangedEvent.class, "session2lockListener");
     clone2Session.addListener(session2lockListener);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletionUndoPerformanceTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletionUndoPerformanceTests.java
index 447236431b..217ca88a2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletionUndoPerformanceTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/DeletionUndoPerformanceTests.java
@@ -96,11 +96,9 @@ public class DeletionUndoPerformanceTests extends AbstractCDOTest
   {
     NodeA rootNodeA = (NodeA)resource.getContents().get(0);
 
-    TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE
-        .createEditingDomain(resource.getResourceSet());
+    TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resource.getResourceSet());
 
-    ((ComposedAdapterFactory)((AdapterFactoryEditingDomain)domain).getAdapterFactory())
-        .addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+    ((ComposedAdapterFactory)((AdapterFactoryEditingDomain)domain).getAdapterFactory()).addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
     CommandStack commandStack = domain.getCommandStack();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
index f293f040d3..0666a75ad4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTest.java
@@ -64,8 +64,7 @@ public abstract class PerformanceTest extends AbstractCDOTest
     runBareBasic();
 
     int runsPerTestCase = suite.getRunsPerTestCase();
-    PerformanceRecord performanceRecord = suite.createPerformanceRecord(getScenario(), getClass().getName(), getName(),
-        runsPerTestCase);
+    PerformanceRecord performanceRecord = suite.createPerformanceRecord(getScenario(), getClass().getName(), getName(), runsPerTestCase);
 
     for (int i = 0; i < runsPerTestCase; i++)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
index 6b84b97d96..587b13b20e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
@@ -43,8 +43,7 @@ public abstract class PerformanceTestSuite extends ConfigTestSuite
     return runsPerTestCase;
   }
 
-  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName,
-      int runs)
+  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName, int runs)
   {
     PerformanceRecord performanceRecord = new PerformanceRecord(scenario, testName, testCaseName, runs);
     performanceRecords.add(performanceRecord);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
index 21936f1405..bb5c70ee88 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
@@ -22,8 +22,7 @@ public class ProbeCollector
 {
   private final List<PerformanceRecord> performanceRecords = new ArrayList<PerformanceRecord>();
 
-  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName,
-      int runs)
+  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName, int runs)
   {
     PerformanceRecord performanceRecord = new PerformanceRecord(scenario, testName, testCaseName, runs);
     performanceRecords.add(performanceRecord);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
index 7cd0d65935..5ac5bcf365 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
@@ -226,8 +226,7 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
     InternalCDORevision secondVersion = company.cdoRevision();
     addRevision(secondVersion);
 
-    CDORevision removedRevision = revisionCache.removeRevision(firstVersion.getID(),
-        firstVersion.getBranch().getVersion(firstVersion.getVersion()));
+    CDORevision removedRevision = revisionCache.removeRevision(firstVersion.getID(), firstVersion.getBranch().getVersion(firstVersion.getVersion()));
     assertNotNull(removedRevision);
     assertEqualRevisions(firstVersion, removedRevision);
   }
@@ -243,10 +242,8 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
     InternalCDORevision secondVersion = company.cdoRevision();
     addRevision(secondVersion);
 
-    revisionCache.removeRevision(secondVersion.getID(),
-        secondVersion.getBranch().getVersion(secondVersion.getVersion()));
-    assertNull(
-        revisionCache.getRevisionByVersion(secondVersion.getID(), BRANCH.getVersion(secondVersion.getVersion())));
+    revisionCache.removeRevision(secondVersion.getID(), secondVersion.getBranch().getVersion(secondVersion.getVersion()));
+    assertNull(revisionCache.getRevisionByVersion(secondVersion.getID(), BRANCH.getVersion(secondVersion.getVersion())));
   }
 
   public void testRemoveSecondRevisionResultsInNoActiveRevision() throws Exception
@@ -260,8 +257,7 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
     InternalCDORevision secondVersion = company.cdoRevision();
     addRevision(secondVersion);
 
-    revisionCache.removeRevision(secondVersion.getID(),
-        secondVersion.getBranch().getVersion(secondVersion.getVersion()));
+    revisionCache.removeRevision(secondVersion.getID(), secondVersion.getBranch().getVersion(secondVersion.getVersion()));
     CDORevision fetchedRevision = revisionCache.getRevision(firstVersion.getID(), BRANCH_POINT);
     assertNull(fetchedRevision);
   }
@@ -294,12 +290,10 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
     addRevision(secondVersion);
 
     revisionCache.clear();
-    CDORevision fetchedRevision = revisionCache.getRevisionByVersion(firstVersion.getID(),
-        BRANCH.getVersion(firstVersion.getVersion()));
+    CDORevision fetchedRevision = revisionCache.getRevisionByVersion(firstVersion.getID(), BRANCH.getVersion(firstVersion.getVersion()));
     assertNull(fetchedRevision);
 
-    fetchedRevision = revisionCache.getRevisionByVersion(secondVersion.getID(),
-        BRANCH.getVersion(secondVersion.getVersion()));
+    fetchedRevision = revisionCache.getRevisionByVersion(secondVersion.getID(), BRANCH.getVersion(secondVersion.getVersion()));
     assertNull(fetchedRevision);
   }
 
@@ -326,8 +320,7 @@ public abstract class AbstractRevisionCacheTest extends AbstractOMTest
             CDOObject company = createCompanyInResource(COMPANY, session.openTransaction());
             CDORevision revision = company.cdoRevision();
             addRevision(revision);
-            CDORevision fetchedRevision = revisionCache.getRevisionByVersion(revision.getID(),
-                BRANCH.getVersion(revision.getVersion()));
+            CDORevision fetchedRevision = revisionCache.getRevisionByVersion(revision.getID(), BRANCH.getVersion(revision.getVersion()));
             assertEquals(revision.getVersion(), fetchedRevision.getVersion());
             assertEquals(revision.getTimeStamp(), fetchedRevision.getTimeStamp());
           }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java
index 5156b80f87..f8a2dde02c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java
@@ -32,8 +32,7 @@ public class TestListener implements IListener
   {
   }
 
-  public <T extends IEvent> void assertEvent(final Class<?> eventType, final EventAssertion<T> assertion)
-      throws Exception
+  public <T extends IEvent> void assertEvent(final Class<?> eventType, final EventAssertion<T> assertion) throws Exception
   {
     new AbstractOMTest.PollingTimeOuter()
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevisionManager.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevisionManager.java
index 0e0d6fa057..7033311b8a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevisionManager.java
@@ -49,8 +49,8 @@ public class TestRevisionManager extends CDORevisionManagerImpl
   }
 
   @Override
-  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth, boolean loadOnDemand, SyntheticCDORevision[] synthetics)
+  public List<CDORevision> getRevisions(List<CDOID> ids, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth, boolean loadOnDemand,
+      SyntheticCDORevision[] synthetics)
   {
     if (getRevisionsDelay > 0)
     {
@@ -110,8 +110,7 @@ public class TestRevisionManager extends CDORevisionManagerImpl
   }
 
   @Override
-  protected List<InternalCDORevision> loadRevisions(List<RevisionInfo> infosToLoad, CDOBranchPoint branchPoint,
-      int referenceChunk, int prefetchDepth)
+  protected List<InternalCDORevision> loadRevisions(List<RevisionInfo> infosToLoad, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     List<InternalCDORevision> result = super.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
 
diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
index cc4a56b6c5..5038f85fa5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
index cc4a56b6c5..5038f85fa5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
index 3c41b63108..c082d66725 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
@@ -122,8 +122,7 @@ public class TransferDialog extends TitleAreaDialog
     return new Point(1000, 800);
   }
 
-  public static boolean open(Shell shell, final List<CDOTransferElement> sourceElements,
-      final CDOTransferElement targetElement)
+  public static boolean open(Shell shell, final List<CDOTransferElement> sourceElements, final CDOTransferElement targetElement)
   {
     final CDOTransferSystem sourceSystem = sourceElements.get(0).getSystem();
     final CDOTransferSystem targetSystem = targetElement.getSystem();
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
index cc4a56b6c5..5038f85fa5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
index cc4a56b6c5..5038f85fa5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
index cc4a56b6c5..5038f85fa5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
index 78d65d51a2..ed86a25736 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
@@ -215,8 +215,7 @@ public class CDOTransfer implements INotifier
     mapping.getChildren();
   }
 
-  protected CDOTransferMapping createMapping(CDOTransferElement source, CDOTransferMapping parent,
-      IProgressMonitor monitor)
+  protected CDOTransferMapping createMapping(CDOTransferElement source, CDOTransferMapping parent, IProgressMonitor monitor)
   {
     return new CDOTransferMappingImpl(this, source, parent, monitor);
   }
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
index 81fa806bfd..bdf5389686 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
@@ -41,8 +41,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
 
   private Status status;
 
-  public CDOTransferMappingImpl(CDOTransfer transfer, CDOTransferElement source, CDOTransferMapping parent,
-      IProgressMonitor monitor)
+  public CDOTransferMappingImpl(CDOTransfer transfer, CDOTransferElement source, CDOTransferMapping parent, IProgressMonitor monitor)
   {
     this.transfer = transfer;
     this.source = source;
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
index 4d264e8682..dbe48c32c2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
@@ -59,8 +59,7 @@ public class CDOAdminView extends ContainerView
 
   private final CDOAdminClientManager adminManager = OM.getAdminManager();
 
-  private Image connectionImage = org.eclipse.net4j.ui.shared.SharedIcons
-      .getImage(org.eclipse.net4j.ui.shared.SharedIcons.OBJ_CONNECTOR);
+  private Image connectionImage = org.eclipse.net4j.ui.shared.SharedIcons.getImage(org.eclipse.net4j.ui.shared.SharedIcons.OBJ_CONNECTOR);
 
   private Image repositoryImage = SharedIcons.getImage(SharedIcons.OBJ_REPO);
 
@@ -95,8 +94,7 @@ public class CDOAdminView extends ContainerView
         if (obj instanceof CDOAdminRepository)
         {
           CDOAdminRepository repository = (CDOAdminRepository)obj;
-          return MessageFormat.format(Messages.CDOAdminView_0, repository.getName(), repository.getType(),
-              repository.getState());
+          return MessageFormat.format(Messages.CDOAdminView_0, repository.getName(), repository.getType(), repository.getState());
         }
 
         return super.getText(obj);
@@ -199,8 +197,7 @@ public class CDOAdminView extends ContainerView
 
       addConnectionAction.setText(Messages.CDOAdminView_2);
       addConnectionAction.setToolTipText(Messages.CDOAdminView_3);
-      addConnectionAction.setImageDescriptor(
-          org.eclipse.net4j.ui.shared.SharedIcons.getDescriptor(org.eclipse.net4j.ui.shared.SharedIcons.ETOOL_ADD));
+      addConnectionAction.setImageDescriptor(org.eclipse.net4j.ui.shared.SharedIcons.getDescriptor(org.eclipse.net4j.ui.shared.SharedIcons.ETOOL_ADD));
     }
 
     manager.add(addConnectionAction);
@@ -212,8 +209,7 @@ public class CDOAdminView extends ContainerView
     IManagedContainer container = adminManager.getContainer();
     String productGroup = CredentialsProviderFactory.PRODUCT_GROUP;
     String factoryType = "interactive"; //$NON-NLS-1$
-    IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container.getElement(productGroup,
-        factoryType, null);
+    IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container.getElement(productGroup, factoryType, null);
 
     if (credentialsProvider == null)
     {
@@ -262,13 +258,11 @@ public class CDOAdminView extends ContainerView
   /**
    * @author Eike Stepper
    */
-  public class OpenSessionAction extends AdminAction<CDOAdminClientRepository>
-      implements CDOAdminClientRepository.SessionConfigurator
+  public class OpenSessionAction extends AdminAction<CDOAdminClientRepository> implements CDOAdminClientRepository.SessionConfigurator
   {
     public OpenSessionAction(CDOAdminClientRepository repository)
     {
-      super(Messages.CDOAdminView_4, Messages.CDOAdminView_5, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_SESSION),
-          repository);
+      super(Messages.CDOAdminView_4, Messages.CDOAdminView_5, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_SESSION), repository);
     }
 
     public CDOAdminClientRepository getRepository()
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
index 6c32d845bf..36d6bf9288 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
@@ -76,8 +76,7 @@ public abstract class AdminAction<T> extends LongRunningAction
     {
       public void run()
       {
-        MessageDialog.openError(getShell(), getText(),
-            MessageFormat.format(getErrorPattern(), ex.getLocalizedMessage()));
+        MessageDialog.openError(getShell(), getText(), MessageFormat.format(getErrorPattern(), ex.getLocalizedMessage()));
       }
     });
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
index c047d427ee..d290c4a506 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
@@ -33,8 +33,7 @@ public class CreateRepositoryAction extends AdminAction<CDOAdminClient>
 
   public CreateRepositoryAction(CDOAdminClient admin)
   {
-    super(Messages.CreateRepositoryAction_0, Messages.CreateRepositoryAction_1,
-        OM.getImageDescriptor("icons/full/ctool16/create_repo.gif"), admin); //$NON-NLS-1$
+    super(Messages.CreateRepositoryAction_0, Messages.CreateRepositoryAction_1, OM.getImageDescriptor("icons/full/ctool16/create_repo.gif"), admin); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
index ab11e8f0c3..8ba070d7eb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
@@ -29,8 +29,7 @@ public class DeleteRepositoryAction extends AdminAction<CDOAdminClientRepository
 {
   public DeleteRepositoryAction(CDOAdminClientRepository repository)
   {
-    super(Messages.DeleteRepositoryAction_1, Messages.DeleteRepositoryAction_2,
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_DELETE), repository);
+    super(Messages.DeleteRepositoryAction_1, Messages.DeleteRepositoryAction_2, SharedIcons.getDescriptor(SharedIcons.ETOOL_DELETE), repository);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryGeneralPage.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryGeneralPage.java
index 58e5c71607..7f64843e78 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryGeneralPage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryGeneralPage.java
@@ -85,8 +85,7 @@ public class CreateRepositoryGeneralPage extends AbstractCreateRepositoryWizardP
     referentialIntegrityCheckbox = checkbox(properties, Messages.CreateRepositoryGeneralPage_10);
     allowInterruptQueriesCheckbox = checkbox(properties, Messages.CreateRepositoryGeneralPage_11);
     overrideUUIDText = text(properties, Messages.CreateRepositoryGeneralPage_12);
-    idGenerationLocationCombo = combo(properties, Messages.CreateRepositoryGeneralPage_13,
-        IDGenerationLocation.values());
+    idGenerationLocationCombo = combo(properties, Messages.CreateRepositoryGeneralPage_13, IDGenerationLocation.values());
 
     Group security = group(composite, Messages.CreateRepositoryGeneralPage_14);
     securityCheckbox = checkbox(security, Messages.CreateRepositoryGeneralPage_2);
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
index 0b66ca69c6..3f81e0e6a7 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
@@ -152,12 +152,9 @@ public class CreateRepositoryStorePage extends AbstractCreateRepositoryWizardPag
   @Override
   protected void loadSettings(IDialogSettings pageSettings)
   {
-    connectionKeepAlivePeriodText
-        .setText(getSetting(pageSettings, PROPERTY_CONNECTION_KEEP_ALIVE_PERIOD, DEFAULT_CONNECTION_KEEP_ALIVE_PERIOD));
-    readerPoolCapacityText
-        .setText(getSetting(pageSettings, PROPERTY_READER_POOL_CAPACITY, DEFAULT_READER_POOL_CAPACITY));
-    writerPoolCapacityText
-        .setText(getSetting(pageSettings, PROPERTY_WRITER_POOL_CAPACITY, DEFAULT_WRITER_POOL_CAPACITY));
+    connectionKeepAlivePeriodText.setText(getSetting(pageSettings, PROPERTY_CONNECTION_KEEP_ALIVE_PERIOD, DEFAULT_CONNECTION_KEEP_ALIVE_PERIOD));
+    readerPoolCapacityText.setText(getSetting(pageSettings, PROPERTY_READER_POOL_CAPACITY, DEFAULT_READER_POOL_CAPACITY));
+    writerPoolCapacityText.setText(getSetting(pageSettings, PROPERTY_WRITER_POOL_CAPACITY, DEFAULT_WRITER_POOL_CAPACITY));
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
index 68251cf735..5c87423f99 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
@@ -211,8 +211,7 @@ public class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static boolean openEditor(CDOViewOpener viewOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint,
-      CDOView[] originView, boolean activate)
+  public static boolean openEditor(CDOViewOpener viewOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint, CDOView[] originView, boolean activate)
   {
     return openEditor(viewOpener, null, leftPoint, rightPoint, originView, activate);
   }
@@ -220,8 +219,8 @@ public class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static boolean openEditor(CDOViewOpener viewOpener, CDOTransactionOpener transactionOpener,
-      CDOBranchPoint leftPoint, CDOBranchPoint rightPoint, CDOView[] originView, boolean activate)
+  public static boolean openEditor(CDOViewOpener viewOpener, CDOTransactionOpener transactionOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint,
+      CDOView[] originView, boolean activate)
   {
     ACTIVATE_EDITOR.set(activate);
 
@@ -314,8 +313,7 @@ public class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static boolean openDialog(CDOViewOpener viewOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint,
-      CDOView[] originView)
+  public static boolean openDialog(CDOViewOpener viewOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint, CDOView[] originView)
   {
     return openDialog(viewOpener, null, leftPoint, rightPoint, originView);
   }
@@ -323,8 +321,8 @@ public class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static boolean openDialog(CDOViewOpener viewOpener, CDOTransactionOpener transactionOpener,
-      CDOBranchPoint leftPoint, CDOBranchPoint rightPoint, CDOView[] originView)
+  public static boolean openDialog(CDOViewOpener viewOpener, CDOTransactionOpener transactionOpener, CDOBranchPoint leftPoint, CDOBranchPoint rightPoint,
+      CDOView[] originView)
   {
     final Boolean activateEditor = ACTIVATE_EDITOR.get();
     final CDOView[] leftAndRightView = { null, null };
@@ -474,8 +472,7 @@ public class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static Input createComparisonInput(CDOView leftView, CDOView rightView, CDOView[] originView,
-      CDOViewOpener viewOpener)
+  public static Input createComparisonInput(CDOView leftView, CDOView rightView, CDOView[] originView, CDOViewOpener viewOpener)
   {
     Comparison comparison = CDOCompareUtil.compare(leftView, rightView, originView, viewOpener);
     return createComparisonInput(leftView, rightView, comparison);
@@ -502,8 +499,7 @@ public class CDOCompareEditorUtil
     }
 
     IComparisonScope scope = CDOCompare.getScope(comparison);
-    ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(scope.getLeft(), scope.getRight(),
-        scope.getOrigin());
+    ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(scope.getLeft(), scope.getRight(), scope.getOrigin());
 
     ComposedAdapterFactory.Descriptor.Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
     ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(registry);
@@ -599,8 +595,7 @@ public class CDOCompareEditorUtil
   {
     try
     {
-      Class<?> c = CommonPlugin.loadClass("org.eclipse.emf.compare.ide",
-          "org.eclipse.emf.compare.ide.internal.utils.StoragePathAdapter");
+      Class<?> c = CommonPlugin.loadClass("org.eclipse.emf.compare.ide", "org.eclipse.emf.compare.ide.internal.utils.StoragePathAdapter");
       Constructor<?> constructor = c.getConstructor(String.class, boolean.class);
       Adapter adapter = (Adapter)constructor.newInstance(label, false);
 
@@ -764,11 +759,10 @@ public class CDOCompareEditorUtil
 
     private boolean suppressCommit;
 
-    private Input(CDOView sourceView, CDOView targetView, CompareConfiguration configuration, Comparison comparison,
-        ICompareEditingDomain editingDomain, AdapterFactory adapterFactory)
+    private Input(CDOView sourceView, CDOView targetView, CompareConfiguration configuration, Comparison comparison, ICompareEditingDomain editingDomain,
+        AdapterFactory adapterFactory)
     {
-      super(new org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration(configuration),
-          comparison, editingDomain, adapterFactory);
+      super(new org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration(configuration), comparison, editingDomain, adapterFactory);
       this.sourceView = sourceView;
       this.targetView = targetView;
       this.comparison = comparison;
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareCDOMerger.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareCDOMerger.java
index 1251dc8a82..9d25e0533e 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareCDOMerger.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareCDOMerger.java
@@ -35,8 +35,7 @@ public class CompareCDOMerger implements CDOMerger2
     throw new UnsupportedOperationException();
   }
 
-  public void merge(final CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
-      throws ConflictException
+  public void merge(final CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws ConflictException
   {
     CDOCompareEditorUtil.closeTransactionAfterCommit(localTransaction);
     CDOCompareEditorUtil.closeEditorWithTransaction(localTransaction);
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
index 361fd23dab..56171f49ff 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
@@ -74,11 +74,9 @@ public class CDOHistoryPage extends HistoryPage
 {
   private static final String POPUP_ID = "#PopupMenu";
 
-  private static final boolean DEBUG = Boolean
-      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.ui.team.history.debug", "false"));
+  private static final boolean DEBUG = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.ui.team.history.debug", "false"));
 
-  private static final boolean TEST = Boolean
-      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.ui.team.history.test", "false"));
+  private static final boolean TEST = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.ui.team.history.test", "false"));
 
   private StackComposite stackComposite;
 
@@ -168,65 +166,63 @@ public class CDOHistoryPage extends HistoryPage
 
     if (TEST)
     {
-      tableViewer.addDropSupport(DND.DROP_MOVE, new Transfer[] { LocalSelectionTransfer.getTransfer() },
-          new ViewerDropAdapter(tableViewer)
-          {
-            {
-              // We don't want it to look like you can insert new elements, only drop onto existing elements.
-              setFeedbackEnabled(false);
-            }
+      tableViewer.addDropSupport(DND.DROP_MOVE, new Transfer[] { LocalSelectionTransfer.getTransfer() }, new ViewerDropAdapter(tableViewer)
+      {
+        {
+          // We don't want it to look like you can insert new elements, only drop onto existing elements.
+          setFeedbackEnabled(false);
+        }
 
-            @Override
-            public boolean validateDrop(Object target, int operation, TransferData transferType)
+        @Override
+        public boolean validateDrop(Object target, int operation, TransferData transferType)
+        {
+          if (target instanceof CDOBranchPoint && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+          {
+            CDOBranchPoint objectToDrop = getObjectToDrop(transferType);
+            if (objectToDrop != null)
             {
-              if (target instanceof CDOBranchPoint
-                  && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+              if (CDOBranchUtil.isContainedBy(objectToDrop, (CDOBranchPoint)target))
               {
-                CDOBranchPoint objectToDrop = getObjectToDrop(transferType);
-                if (objectToDrop != null)
-                {
-                  if (CDOBranchUtil.isContainedBy(objectToDrop, (CDOBranchPoint)target))
-                  {
-                    return false;
-                  }
-
-                  return true;
-                }
+                return false;
               }
 
-              return false;
+              return true;
             }
+          }
+
+          return false;
+        }
+
+        @Override
+        public boolean performDrop(Object data)
+        {
+          final CDOBranchPoint objectToDrop = UIUtil.getElement((ISelection)data, CDOBranchPoint.class);
+          final CDOBranchPoint dropTarget = (CDOBranchPoint)getCurrentTarget();
 
+          boolean result = new TransactionalBranchPointOperation()
+          {
             @Override
-            public boolean performDrop(Object data)
+            protected void run(CDOTransaction transaction)
             {
-              final CDOBranchPoint objectToDrop = UIUtil.getElement((ISelection)data, CDOBranchPoint.class);
-              final CDOBranchPoint dropTarget = (CDOBranchPoint)getCurrentTarget();
+              CDOMerger merger = new DefaultCDOMerger.PerFeature.ManyValued();
+              transaction.merge(objectToDrop, merger);
+            }
+          }.execute(dropTarget);
 
-              boolean result = new TransactionalBranchPointOperation()
-              {
-                @Override
-                protected void run(CDOTransaction transaction)
-                {
-                  CDOMerger merger = new DefaultCDOMerger.PerFeature.ManyValued();
-                  transaction.merge(objectToDrop, merger);
-                }
-              }.execute(dropTarget);
-
-              if (result)
-              {
-                tableViewer.getControl().setFocus();
-                tableViewer.setSelection(new StructuredSelection(dropTarget));
-              }
+          if (result)
+          {
+            tableViewer.getControl().setFocus();
+            tableViewer.setSelection(new StructuredSelection(dropTarget));
+          }
 
-              return result;
-            }
+          return result;
+        }
 
-            private CDOBranchPoint getObjectToDrop(TransferData transferType)
-            {
-              return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), CDOBranchPoint.class);
-            }
-          });
+        private CDOBranchPoint getObjectToDrop(TransferData transferType)
+        {
+          return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), CDOBranchPoint.class);
+        }
+      });
     }
 
     if (TEST)
@@ -333,8 +329,8 @@ public class CDOHistoryPage extends HistoryPage
         @Override
         public void run()
         {
-          NetRenderer netRenderer = (NetRenderer)ReflectUtil
-              .getValue(ReflectUtil.getField(CommitHistoryComposite.class, "netRenderer"), commitHistoryComposite);
+          NetRenderer netRenderer = (NetRenderer)ReflectUtil.getValue(ReflectUtil.getField(CommitHistoryComposite.class, "netRenderer"),
+              commitHistoryComposite);
 
           Net net = netRenderer.getNet();
           Track[] tracks = net.getTracks();
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobStorage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobStorage.java
index aceb814f8b..2e68df59a4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobStorage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobStorage.java
@@ -92,8 +92,7 @@ public class CDOLobStorage extends AbstractDocumentProvider
   }
 
   @Override
-  protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
-      throws CoreException
+  protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException
   {
     if (element instanceof CDOLobEditorInput)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
index b9f342f163..f1715237aa 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
@@ -54,8 +54,7 @@ import java.util.Map;
  */
 public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
 {
-  private static final IActionFilter SESSION_ACTION_FILTER = new DefaultActionFilter<CDOSession>(
-      SessionProperties.INSTANCE);
+  private static final IActionFilter SESSION_ACTION_FILTER = new DefaultActionFilter<CDOSession>(SessionProperties.INSTANCE);
 
   private static final IActionFilter VIEW_ACTION_FILTER = new DefaultActionFilter<CDOView>(ViewProperties.INSTANCE);
 
@@ -92,8 +91,7 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
         if (cdoObject != null)
         {
           final Map<String, Object> emfProperties = new HashMap<String, Object>();
-          DefaultPropertySource<EObject> result = new DefaultPropertySource<EObject>(cdoObject,
-              ObjectProperties.INSTANCE)
+          DefaultPropertySource<EObject> result = new DefaultPropertySource<EObject>(cdoObject, ObjectProperties.INSTANCE)
           {
             @Override
             public Object getPropertyValue(Object id)
@@ -125,8 +123,7 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
 
             try
             {
-              propertySource = (IItemPropertySource)adapterFactory.adapt(cdoObject.cdoInternalInstance(),
-                  IItemPropertySource.class);
+              propertySource = (IItemPropertySource)adapterFactory.adapt(cdoObject.cdoInternalInstance(), IItemPropertySource.class);
             }
             catch (Exception ex)
             {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
index 13feb15c69..1602aaafb0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
@@ -21,8 +21,7 @@ import org.eclipse.ui.IWorkbenchPage;
  */
 public abstract class AbstractOpenViewAction extends SessionAction
 {
-  public AbstractOpenViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOSession session)
+  public AbstractOpenViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOSession session)
   {
     super(page, text, toolTipText, image, session);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
index 9a02c1d908..084272242d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
@@ -40,8 +40,7 @@ public final class CloseSessionAction extends SessionAction
     if (CDOUtil.isSessionDirty(getSession()))
     {
       MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseSessionAction.2"), //$NON-NLS-1$
-          MessageDialog.QUESTION,
-          new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+          MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
       if (dialog.open() != MessageDialog.OK)
       {
         cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
index 459f5d47e9..7589d71f7d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
@@ -39,8 +39,7 @@ public final class CloseViewAction extends AbstractViewAction
     if (getView().isDirty())
     {
       MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseViewAction.2"), //$NON-NLS-1$
-          MessageDialog.QUESTION,
-          new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+          MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
       if (dialog.open() != MessageDialog.OK)
       {
         cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DeleteResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DeleteResourceAction.java
index e49eeb3ad8..e3f9952387 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DeleteResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DeleteResourceAction.java
@@ -49,8 +49,7 @@ public class DeleteResourceAction extends SafeAction
 
   public DeleteResourceAction(Shell shell, List<CDOResourceNode> nodes)
   {
-    super(Messages.getString("DeleteResourceAction_1"), Messages.getString("DeleteResourceAction_5"),
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_DELETE));
+    super(Messages.getString("DeleteResourceAction_1"), Messages.getString("DeleteResourceAction_5"), SharedIcons.getDescriptor(SharedIcons.ETOOL_DELETE));
     this.shell = shell;
     this.nodes = new HashSet<CDOResourceNode>(nodes);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
index 1e3d68c24d..6432d000b7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
@@ -64,8 +64,7 @@ public abstract class EditingDomainAction extends LongRunningAction
   public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart)
   {
     setPage(workbenchPart == null ? null : workbenchPart.getSite().getPage());
-    setEditingDomain(workbenchPart instanceof IEditingDomainProvider
-        ? ((IEditingDomainProvider)workbenchPart).getEditingDomain() : null);
+    setEditingDomain(workbenchPart instanceof IEditingDomainProvider ? ((IEditingDomainProvider)workbenchPart).getEditingDomain() : null);
   }
 
   public void update()
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
index 8e4f9f9061..ff8ffd914e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
@@ -46,8 +46,7 @@ public final class EnableViewDurabilityAction extends AbstractViewAction
       public void run()
       {
         UIUtil.copyToClipboard(display, durableLockingID);
-        MessageDialog.openInformation(getShell(), TITLE,
-            "The following area ID has been copied to the clipboard:\n" + durableLockingID);
+        MessageDialog.openInformation(getShell(), TITLE, "The following area ID has been copied to the clipboard:\n" + durableLockingID);
       }
     });
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
index f0cc2056ba..ae010c42a2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
@@ -95,8 +95,7 @@ public class ExportResourceAction extends AbstractViewAction
   {
     // Target Resource
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-        new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
     Resource resource = resourceSet.createResource(sourceURI);
 
     Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
index f0160b4980..0575e1b1a1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
@@ -57,8 +57,8 @@ public abstract class NewResourceNodeAction extends TransactionalBackgroundActio
     CDOResourceNode object = (CDOResourceNode)getObject();
 
     String initialValue = (type == Type.FOLDER ? "folder" : "resource") + (AbstractViewAction.lastResourceNumber + 1);
-    InputDialog dialog = new InputDialog(getShell(), getText(), Messages.getString("NewResourceNodeAction.8"),
-        initialValue, new ResourceNodeNameInputValidator(object));
+    InputDialog dialog = new InputDialog(getShell(), getText(), Messages.getString("NewResourceNodeAction.8"), initialValue,
+        new ResourceNodeNameInputValidator(object));
     if (dialog.open() == Dialog.OK)
     {
       ++AbstractViewAction.lastResourceNumber;
@@ -71,8 +71,7 @@ public abstract class NewResourceNodeAction extends TransactionalBackgroundActio
   }
 
   @Override
-  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-      throws Exception
+  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception
   {
     CDOResourceNode newResourceNode = createNewResourceNode();
     newResourceNode.setName(name);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
index c0ab0f6d93..c328695e56 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
@@ -40,8 +40,7 @@ public class NewTopLevelResourceNodeAction extends AbstractViewAction
 
   private String resourceNodeName;
 
-  public NewTopLevelResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view,
-      CDOResourceNode node, Type type)
+  public NewTopLevelResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view, CDOResourceNode node, Type type)
   {
     super(page, type.getTitle() + INTERACTIVE, type.getTooltip(), type.getImageDescriptor(), view);
     selectedNode = node;
@@ -53,8 +52,8 @@ public class NewTopLevelResourceNodeAction extends AbstractViewAction
   protected void preRun() throws Exception
   {
     String initialValue = (type == Type.FOLDER ? "folder" : "resource") + (AbstractViewAction.lastResourceNumber + 1);
-    InputDialog dialog = new InputDialog(getShell(), getText(), Messages.getString("NewResourceNodeAction.8"),
-        initialValue, new ResourceNodeNameInputValidator(selectedNode));
+    InputDialog dialog = new InputDialog(getShell(), getText(), Messages.getString("NewResourceNodeAction.8"), initialValue,
+        new ResourceNodeNameInputValidator(selectedNode));
 
     if (dialog.open() == InputDialog.OK)
     {
@@ -143,17 +142,13 @@ public class NewTopLevelResourceNodeAction extends AbstractViewAction
    */
   public static enum Type
   {
-    FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"),
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)),
+    FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"), SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)),
 
-    MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"),
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)),
+    MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"), SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)),
 
-    TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"),
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)),
+    TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"), SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)),
 
-    BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"),
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE));
+    BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"), SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE));
 
     private String title;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 9de3355c4e..255aa93e63 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -40,8 +40,7 @@ public final class OpenResourceEditorAction extends ResourceNodeAction
 
   public OpenResourceEditorAction(IWorkbenchPage page, CDOResourceLeaf resource)
   {
-    super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE,
-        resource instanceof CDOResource ? TOOL_TIP : FILE_TOOL_TIP, null, resource);
+    super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE, resource instanceof CDOResource ? TOOL_TIP : FILE_TOOL_TIP, null, resource);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index b9c235da78..c4014815c0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -86,8 +86,7 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
         return ""; //$NON-NLS-1$
       }
 
-      return registry.containsKey(uri) ? null
-          : MessageFormat.format(Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
+      return registry.containsKey(uri) ? null : MessageFormat.format(Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
index b1569a66f2..5874c71a64 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
@@ -39,8 +39,7 @@ public abstract class RegisterPackagesAction extends SessionAction
 
   private int errors;
 
-  public RegisterPackagesAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOSession session)
+  public RegisterPackagesAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOSession session)
   {
     super(page, text, toolTipText, image, session);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
index c00532d241..6cbc3cfd53 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
@@ -24,8 +24,7 @@ public abstract class ResourceNodeAction extends LongRunningAction
 {
   private CDOResourceNode resourceNode;
 
-  public ResourceNodeAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOResourceNode resourceNode)
+  public ResourceNodeAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOResourceNode resourceNode)
   {
     super(page, text, toolTipText, image);
     this.resourceNode = resourceNode;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
index 1ff05a7fa7..94b9f806f0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
@@ -31,8 +31,7 @@ public abstract class TransactionalBackgroundAction extends LongRunningAction
 {
   private final CDOObject object;
 
-  public TransactionalBackgroundAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOObject object)
+  public TransactionalBackgroundAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOObject object)
   {
     super(page, text, toolTipText, image);
     this.object = object;
@@ -83,8 +82,7 @@ public abstract class TransactionalBackgroundAction extends LongRunningAction
     }
   }
 
-  protected abstract void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-      throws Exception;
+  protected abstract void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception;
 
   protected void postRun(CDOView view, CDOObject object)
   {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
index aa2cc1d52d..a6fb23a048 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
@@ -94,8 +94,7 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD
   {
     // Target Resource
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-        new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
     Resource resource = resourceSet.createResource(targetURI);
 
     Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ImportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ImportResourceActionDelegate.java
index a6b145ac9d..06fb578c10 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ImportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ImportResourceActionDelegate.java
@@ -47,8 +47,7 @@ public class ImportResourceActionDelegate extends NewResourceActionDelegate
   @Override
   protected final CDOObject preRun(CDOObject object)
   {
-    ImportResourceDialog dialog = new ImportResourceDialog(getShell(),
-        Messages.getString("ImportResourceToFolderAction_0"), SWT.OPEN); //$NON-NLS-1$
+    ImportResourceDialog dialog = new ImportResourceDialog(getShell(), Messages.getString("ImportResourceToFolderAction_0"), SWT.OPEN); //$NON-NLS-1$
     if (dialog.open() == ImportResourceDialog.OK)
     {
       List<URI> uris = dialog.getURIs();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
index 0f22024593..57d6425e58 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
@@ -38,8 +38,7 @@ public abstract class NewResourceNodeActionDelegate extends TransactionalBackgro
   @Override
   protected CDOObject preRun(CDOObject object)
   {
-    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(),
-        Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
+    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
         new ResourceNodeNameInputValidator((CDOResourceNode)object));
     if (dialog.open() == Dialog.OK)
     {
@@ -52,8 +51,7 @@ public abstract class NewResourceNodeActionDelegate extends TransactionalBackgro
   }
 
   @Override
-  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-      throws Exception
+  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception
   {
     if (object instanceof CDOResourceFolder)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
index 7bded30f02..c4258f0343 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
@@ -37,8 +37,7 @@ public class RenameResourceActionDelegate extends TransactionalBackgroundActionD
   @Override
   protected CDOObject preRun(CDOObject object)
   {
-    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(),
-        Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
+    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
         new ResourceNodeNameInputValidator((CDOResourceNode)object));
     if (dialog.open() == Dialog.OK)
     {
@@ -62,8 +61,7 @@ public class RenameResourceActionDelegate extends TransactionalBackgroundActionD
   }
 
   @Override
-  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-      throws Exception
+  protected final void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception
   {
     if (object instanceof CDOResourceNode)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
index 71617adb59..2d58a56582 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
@@ -34,8 +34,7 @@ import java.text.MessageFormat;
  * @author Victor Roldan Betancort
  */
 @Deprecated
-public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate
-    implements IObjectActionDelegate
+public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate implements IObjectActionDelegate
 {
   private IWorkbenchPart targetPart;
 
@@ -83,8 +82,7 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA
         CDOView view = transactionalObject.cdoView();
         if (view.isReadOnly())
         {
-          throw new IllegalStateException(
-              MessageFormat.format(Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
+          throw new IllegalStateException(MessageFormat.format(Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
         }
 
         // Bypass cancel()
@@ -133,6 +131,5 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA
     }
   }
 
-  protected abstract void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-      throws Exception;
+  protected abstract void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception;
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index d037c27b89..35e6d2478c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -81,8 +81,7 @@ public abstract class OM
     {
       try
       {
-        historySupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.team",
-            "org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryPage") != null;
+        historySupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.team", "org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryPage") != null;
       }
       catch (Throwable ex)
       {
@@ -99,8 +98,7 @@ public abstract class OM
     {
       try
       {
-        compareSupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.compare",
-            "org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil") != null;
+        compareSupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.compare", "org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil") != null;
       }
       catch (Throwable ex)
       {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
index e917e66cb9..066ad1f0ad 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
@@ -69,8 +69,8 @@ public class EditObjectDialog extends TitleAreaDialog
 
     try
     {
-      ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE
-          .createViewModelContext(ViewProviderHelper.getView(eObject, null), eObject, new DefaultReferenceService());
+      ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext(ViewProviderHelper.getView(eObject, null), eObject,
+          new DefaultReferenceService());
 
       ECPSWTViewRenderer.INSTANCE.render(container, viewModelContext);
     }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
index a5b70fdb66..2fed6218a0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
@@ -54,8 +54,7 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
 
   public SelectPackageDialog(Shell shell, String title, String message, Set<String> excludedURIs)
   {
-    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message,
-        OM.Activator.INSTANCE.getDialogSettings());
+    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, OM.Activator.INSTANCE.getDialogSettings());
     this.excludedURIs = excludedURIs;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index e7e3b8346b..23c327e824 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -93,8 +93,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected IAction showPropertiesViewAction = new Action(
-      PluginDelegator.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+  protected IAction showPropertiesViewAction = new Action(PluginDelegator.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
@@ -211,8 +210,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
-        "org.eclipse.emf.cdo.internal.ui.editorMenuID");
+    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"), "org.eclipse.emf.cdo.internal.ui.editorMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
     submenuManager.add(new Separator("actions"));
@@ -444,8 +442,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
+  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
   {
     if (actions != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index eae79868bc..a0c4d6fc63 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -182,8 +182,7 @@ import java.util.Map;
  * @author Eike Stepper
  * @generated
  */
-public class CDOEditor extends MultiPageEditorPart
-    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider
+public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider
 {
   /**
    * The filters for file extensions supported by the editor.
@@ -212,8 +211,7 @@ public class CDOEditor extends MultiPageEditorPart
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CDOEditor.class);
 
-  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages()
-      .getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
 
   private static final Field PROPERTY_SHEET_PAGE_VIEWER_FIELD = getPropertySheetPageViewerField();
 
@@ -607,8 +605,7 @@ public class CDOEditor extends MultiPageEditorPart
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui", 0, null,
-          new Object[] { editingDomain.getResourceSet() });
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui", 0, null, new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
         if (childDiagnostic.getSeverity() != Diagnostic.OK)
@@ -652,8 +649,7 @@ public class CDOEditor extends MultiPageEditorPart
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
   }
 
   /**
@@ -1121,15 +1117,14 @@ public class CDOEditor extends MultiPageEditorPart
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception });
     }
     else
     {
@@ -1437,8 +1432,7 @@ public class CDOEditor extends MultiPageEditorPart
    */
   protected ILabelProvider createLabelProvider()
   {
-    return new DecoratingLabelProvider(new CDOLabelProvider(adapterFactory, view, selectionViewer),
-        createLabelDecorator())
+    return new DecoratingLabelProvider(new CDOLabelProvider(adapterFactory, view, selectionViewer), createLabelDecorator())
     {
       @Override
       public Image getImage(Object element)
@@ -1671,14 +1665,12 @@ public class CDOEditor extends MultiPageEditorPart
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(
-                new StructuredSelection(CDOUtil.getResources(editingDomain.getResourceSet()).get(0)), true);
+            contentOutlineViewer.setSelection(new StructuredSelection(CDOUtil.getResources(editingDomain.getResourceSet()).get(0)), true);
           }
         }
 
         @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
         {
           super.makeContributions(menuManager, toolBarManager, statusLineManager);
           contentOutlineStatusLineManager = statusLineManager;
@@ -1879,8 +1871,7 @@ public class CDOEditor extends MultiPageEditorPart
         boolean first = true;
         for (Resource resource : editingDomain.getResourceSet().getResources())
         {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
+          if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
           {
             try
             {
@@ -1945,8 +1936,7 @@ public class CDOEditor extends MultiPageEditorPart
         {
           for (Resource resource : resources)
           {
-            if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-                && !editingDomain.isReadOnly(resource))
+            if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
             {
               try
               {
@@ -2000,8 +1990,7 @@ public class CDOEditor extends MultiPageEditorPart
                     message = Messages.getString("CDOEditor.18"); //$NON-NLS-1$
                   }
 
-                  RollbackTransactionDialog dialog = new RollbackTransactionDialog(getEditorSite().getPage(), title,
-                      message, transaction);
+                  RollbackTransactionDialog dialog = new RollbackTransactionDialog(getEditorSite().getPage(), title, message, transaction);
                   if (dialog.open() == RollbackTransactionDialog.OK)
                   {
                     transaction.rollback();
@@ -2214,8 +2203,8 @@ public class CDOEditor extends MultiPageEditorPart
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
-        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
+        : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
@@ -2333,8 +2322,7 @@ public class CDOEditor extends MultiPageEditorPart
         @Override
         protected void preRun() throws Exception
         {
-          SelectClassDialog dialog = new SelectClassDialog(page, "New Root Object",
-              "Select a package and a class for the new root object.");
+          SelectClassDialog dialog = new SelectClassDialog(page, "New Root Object", "Select a package and a class for the new root object.");
 
           if (dialog.open() == SelectClassDialog.OK)
           {
@@ -2348,8 +2336,7 @@ public class CDOEditor extends MultiPageEditorPart
         }
 
         @Override
-        protected void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor)
-            throws Exception
+        protected void doRun(CDOTransaction transaction, CDOObject object, IProgressMonitor progressMonitor) throws Exception
         {
           EList<EObject> contents = parent.getContents();
           contents.add(newObject);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
index b1d3bf1073..125e3f7985 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
@@ -429,8 +429,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
      */
     public void run(IAction action)
     {
-      LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(
-          getWindow().getShell());
+      LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow().getShell());
       if (Window.OK == loadResourceDialog.open())
       {
         for (URI uri : loadResourceDialog.getURIs())
@@ -448,8 +447,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
    */
   public static String[] openFilePathDialog(Shell shell, int style, String[] fileExtensionFilters)
   {
-    return openFilePathDialog(shell, style, fileExtensionFilters, (style & SWT.OPEN) != 0, (style & SWT.OPEN) != 0,
-        (style & SWT.SAVE) != 0);
+    return openFilePathDialog(shell, style, fileExtensionFilters, (style & SWT.OPEN) != 0, (style & SWT.OPEN) != 0, (style & SWT.SAVE) != 0);
   }
 
   /**
@@ -457,8 +455,8 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
    * <!-- end-user-doc -->
    * @generated
    */
-  public static String[] openFilePathDialog(Shell shell, int style, String[] fileExtensionFilters,
-      boolean includeGroupFilter, boolean includeAllFilter, boolean addExtension)
+  public static String[] openFilePathDialog(Shell shell, int style, String[] fileExtensionFilters, boolean includeGroupFilter, boolean includeAllFilter,
+      boolean addExtension)
   {
     FileDialog fileDialog = new FileDialog(shell, style);
     if (fileExtensionFilters == null)
@@ -561,8 +559,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
     IEditorDescriptor editorDescriptor = EditUIUtil.getDefaultEditor(uri, null);
     if (editorDescriptor == null)
     {
-      MessageDialog.openError(workbenchWindow.getShell(), getString("_UI_Error_title"),
-          getString("_WARN_No_Editor", uri.lastSegment()));
+      MessageDialog.openError(workbenchWindow.getShell(), getString("_UI_Error_title"), getString("_WARN_No_Editor", uri.lastSegment()));
       return false;
     }
 
@@ -572,8 +569,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
     }
     catch (PartInitException exception)
     {
-      MessageDialog.openError(workbenchWindow.getShell(), getString("_UI_OpenEditorError_label"),
-          exception.getMessage());
+      MessageDialog.openError(workbenchWindow.getShell(), getString("_UI_OpenEditorError_label"), exception.getMessage());
       return false;
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java
index e108490802..0daef95eff 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java
@@ -52,14 +52,12 @@ public final class Branch extends SegmentList
       CDORevisionManager revisionManager = session.getRevisionManager();
 
       CDOBranchPoint lastPoint = cdoBranch.getHead();
-      CDORevision lastRevision = revisionManager.getRevision(objectID, lastPoint, CDORevision.UNCHUNKED,
-          CDORevision.DEPTH_NONE, true);
+      CDORevision lastRevision = revisionManager.getRevision(objectID, lastPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
 
       if (lastRevision != null && lastRevision.getBranch() == cdoBranch)
       {
         CDOBranchVersion firstVersion = cdoBranch.getVersion(CDOBranchVersion.FIRST_VERSION);
-        CDORevision firstRevision = revisionManager.getRevisionByVersion(objectID, firstVersion, CDORevision.UNCHUNKED,
-            true);
+        CDORevision firstRevision = revisionManager.getRevisionByVersion(objectID, firstVersion, CDORevision.UNCHUNKED, true);
 
         firstCommitTime = firstRevision.getTimeStamp();
         lastCommitTime = lastRevision.getTimeStamp();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
index f15276c0ab..d5b56cff6e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
@@ -30,13 +30,11 @@ import java.util.WeakHashMap;
  */
 public class Net
 {
-  private static final RGB[] RGBS = new RGB[] { new RGB(133, 166, 214), new RGB(221, 205, 93), new RGB(199, 134, 57),
-      new RGB(131, 150, 98), new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144),
-      new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74), new RGB(101, 101, 217), new RGB(72, 153, 119),
-      new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59), new RGB(136, 176, 70), new RGB(255, 138, 1),
-      new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254), new RGB(175, 215, 0), new RGB(140, 134, 142),
-      new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4), new RGB(63, 64, 255), new RGB(27, 194, 130),
-      new RGB(0, 104, 183) };
+  private static final RGB[] RGBS = new RGB[] { new RGB(133, 166, 214), new RGB(221, 205, 93), new RGB(199, 134, 57), new RGB(131, 150, 98),
+      new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144), new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74),
+      new RGB(101, 101, 217), new RGB(72, 153, 119), new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59), new RGB(136, 176, 70),
+      new RGB(255, 138, 1), new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254), new RGB(175, 215, 0), new RGB(140, 134, 142),
+      new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4), new RGB(63, 64, 255), new RGB(27, 194, 130), new RGB(0, 104, 183) };
 
   private static final Segment[] NO_SEGMENTS = {};
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java
index 3f4650236d..676e566237 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java
@@ -368,8 +368,7 @@ public final class NetRenderer implements Listener
     return x;
   }
 
-  private void drawHorizontalLineWithRoundEdge(Color color, int lineStyle, int commitTrackCenter, int trackCenter,
-      int horizontal, boolean down)
+  private void drawHorizontalLineWithRoundEdge(Color color, int lineStyle, int commitTrackCenter, int trackCenter, int horizontal, boolean down)
   {
     LinePlotter plotter = new LinePlotter(color, lineStyle, commitTrackCenter, cellHeightHalf);
     plotter.relative(horizontal, 0);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java
index 20ae5eded1..ffa8b5b1ec 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java
@@ -84,7 +84,6 @@ public class CDOPerspective implements IPerspectiveFactory
 
   static public boolean isCurrent()
   {
-    return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId()
-        .equals(CDOPerspective.ID);
+    return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId().equals(CDOPerspective.ID);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
index abf66f4a5b..a4e4a8b92e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
@@ -84,8 +84,7 @@ public class CDOPreferencePage extends OMPreferencePage
     viewGroup.setLayoutData(UIUtil.createGridData(true, false));
 
     new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.6")); //$NON-NLS-1$
-    preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER,
-        String.valueOf(CDOView.Options.NO_REVISION_PREFETCHING));
+    preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER, String.valueOf(CDOView.Options.NO_REVISION_PREFETCHING));
     preloadChunkSize.setLayoutData(UIUtil.createGridData(true, false));
 
     new Label(viewGroup, SWT.NONE).setText(Messages.getString("CDOPreferencePage.7")); //$NON-NLS-1$
@@ -101,12 +100,9 @@ public class CDOPreferencePage extends OMPreferencePage
     repositoryName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.getValue());
     userName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.getValue());
     connectorDescription.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.getValue());
-    referenceChunkSize
-        .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue()));
-    preloadChunkSize
-        .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.getValue()));
-    invalidationNotifications
-        .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.getValue());
+    referenceChunkSize.setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue()));
+    preloadChunkSize.setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.getValue()));
+    invalidationNotifications.setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.getValue());
   }
 
   @Override
@@ -116,12 +112,9 @@ public class CDOPreferencePage extends OMPreferencePage
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.setValue(repositoryName.getText());
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.setValue(userName.getText());
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.setValue(connectorDescription.getText());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE
-        .setValue(Integer.parseInt(referenceChunkSize.getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE
-        .setValue(Integer.parseInt(preloadChunkSize.getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION
-        .setValue(invalidationNotifications.getSelection());
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.setValue(Integer.parseInt(referenceChunkSize.getValue()));
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.setValue(Integer.parseInt(preloadChunkSize.getValue()));
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.setValue(invalidationNotifications.getSelection());
     return super.performOk();
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
index 5e18a0ef93..b12ebcb041 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
@@ -91,8 +91,7 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio
             {
               try
               {
-                MessageDialog.openInformation(getShell(),
-                    MessageFormat.format(Messages.getString("CDORemoteSessionsView_0"), remoteSession), //$NON-NLS-1$
+                MessageDialog.openInformation(getShell(), MessageFormat.format(Messages.getString("CDORemoteSessionsView_0"), remoteSession), //$NON-NLS-1$
                     new String(message.getData()));
               }
               catch (RuntimeException ignore)
@@ -159,8 +158,7 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio
       CDORemoteSession remoteSession = (CDORemoteSession)element;
       if (remoteSession.isSubscribed())
       {
-        InputDialog dlg = new InputDialog(getShell(),
-            MessageFormat.format(Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
+        InputDialog dlg = new InputDialog(getShell(), MessageFormat.format(Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
             Messages.getString("CDORemoteSessionsView_2"), "", null); //$NON-NLS-1$ //$NON-NLS-2$
         if (dlg.open() == InputDialog.OK)
         {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index f237f45dce..3f23dbf562 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -53,8 +53,7 @@ public class CDOSessionsView extends ContainerView
 {
   public static final String ID = "org.eclipse.emf.cdo.ui.CDOSessionsView"; //$NON-NLS-1$
 
-  private static Map<String, ResourceOpener> resourceOpeners = Collections
-      .synchronizedMap(new HashMap<String, ResourceOpener>());
+  private static Map<String, ResourceOpener> resourceOpeners = Collections.synchronizedMap(new HashMap<String, ResourceOpener>());
 
   private OpenSessionAction openSessionAction;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
index f1dc40fa68..bddd3b1ae7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
@@ -182,15 +182,13 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
     resetNotificationAction = new ResetNotificationAction();
     resetNotificationAction.setText(Messages.getString("CDOWatchListView.8")); //$NON-NLS-1$
     resetNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-    resetNotificationAction
-        .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
+    resetNotificationAction.setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
     resetNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.9")); //$NON-NLS-1$
 
     resetAllNotificationAction = new ResetAllNotificationAction();
     resetAllNotificationAction.setText(Messages.getString("CDOWatchListView.10")); //$NON-NLS-1$
     resetAllNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-    resetAllNotificationAction
-        .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
+    resetAllNotificationAction.setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
     resetAllNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.11")); //$NON-NLS-1$
   }
 
@@ -763,8 +761,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
   /**
    * @author Victor Roldan Betancort
    */
-  private final class CDOSubscriptionViewLabelProvider extends LabelProvider
-      implements ITableLabelProvider, IColorProvider
+  private final class CDOSubscriptionViewLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider
   {
     private final Color YELLOW = UIUtil.getDisplay().getSystemColor(SWT.COLOR_YELLOW);
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
index ed8be2f45b..62fcd79e86 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
@@ -109,8 +109,7 @@ public final class CDOEditorUtil
    */
   public static CDOEditorInput createCDOEditorInputWithEditingDomain(CDOEditorInput input, EditingDomain editingDomain)
   {
-    return createCDOEditorInputWithEditingDomain(input.getView(), input.getResourcePath(), input.isViewOwned(),
-        editingDomain);
+    return createCDOEditorInputWithEditingDomain(input.getView(), input.getResourcePath(), input.isViewOwned(), editingDomain);
   }
 
   /**
@@ -126,8 +125,7 @@ public final class CDOEditorUtil
    *
    * @since 4.3
    */
-  public static CDOEditorInput createCDOEditorInputWithEditingDomain(CDOView view, String resourcePath,
-      boolean viewOwned, EditingDomain editingDomain)
+  public static CDOEditorInput createCDOEditorInputWithEditingDomain(CDOView view, String resourcePath, boolean viewOwned, EditingDomain editingDomain)
   {
     class CDOEditorInputWithEditingDomain extends CDOEditorInputImpl implements IEditingDomainProvider
     {
@@ -323,8 +321,7 @@ public final class CDOEditorUtil
   /**
    * @since 4.4
    */
-  public static IEditorInput createEditorInput(String editorID, CDOResourceLeaf resource, boolean viewOwned,
-      boolean lobCommitOnSave)
+  public static IEditorInput createEditorInput(String editorID, CDOResourceLeaf resource, boolean viewOwned, boolean lobCommitOnSave)
   {
     if (resource instanceof CDOResource)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
index bc71daa80b..dd4496a5f8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
@@ -86,8 +86,7 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl
     }
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof InternalCDOSession)
     {
@@ -101,8 +100,7 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl
     return element;
   }
 
-  protected Object processSession(IManagedContainer container, String productGroup, String factoryType,
-      String description, InternalCDOSession session)
+  protected Object processSession(IManagedContainer container, String productGroup, String factoryType, String description, InternalCDOSession session)
   {
     if (session.getExceptionHandler() == null)
     {
@@ -154,8 +152,7 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl
 
       String attemptsStr = attempt == 1 ? Messages.getString("CDOInteractiveExceptionHandler.1") //$NON-NLS-1$
           : Messages.getString("CDOInteractiveExceptionHandler.2"); //$NON-NLS-1$
-      setTitle(
-          MessageFormat.format(Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$
+      setTitle(MessageFormat.format(Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$
       setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PROTOCOL_PROBLEM));
 
       GridLayout layout = UIUtil.createGridLayout(1);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index 2e95ecb6a7..dc555d33c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -665,14 +665,10 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
       CDOResource rootResource = view.getRootResource();
       if (rootResource.cdoPermission() == CDOPermission.WRITE)
       {
-        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
-            NewTopLevelResourceNodeAction.Type.FOLDER));
-        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
-            NewTopLevelResourceNodeAction.Type.MODEL));
-        manager.add(
-            new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.TEXT));
-        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
-            NewTopLevelResourceNodeAction.Type.BINARY));
+        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.FOLDER));
+        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.MODEL));
+        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.TEXT));
+        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.BINARY));
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
index bf6894f266..912f036616 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
@@ -54,8 +54,7 @@ public class CDOLabelProvider extends AdapterFactoryLabelProvider implements ICo
 
   private static final Color RED = UIUtil.getDisplay().getSystemColor(SWT.COLOR_RED);
 
-  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages()
-      .getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+  private static final Image ERROR_IMAGE = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
 
   private Font bold;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/Support.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/Support.java
index 70d4e5d83d..4b8f49ebb8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/Support.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/Support.java
@@ -32,8 +32,7 @@ public abstract class Support
     @Override
     protected boolean determineAvailability() throws Throwable
     {
-      return CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.team",
-          "org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryPage") != null;
+      return CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.team", "org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryPage") != null;
     }
   };
 
@@ -42,8 +41,7 @@ public abstract class Support
     @Override
     protected boolean determineAvailability() throws Throwable
     {
-      return CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.compare",
-          "org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil") != null;
+      return CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.compare", "org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil") != null;
     }
   };
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java
index e7a5152b27..8b28f697ed 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java
@@ -348,8 +348,7 @@ public class CommitHistoryComposite extends Composite
       if (branchAdapter != null)
       {
         branch = branchAdapter;
-        session = (CDOSession)((CDOSessionProtocol)((InternalCDOBranchManager)branch.getBranchManager())
-            .getBranchLoader()).getSession();
+        session = (CDOSession)((CDOSessionProtocol)((InternalCDOBranchManager)branch.getBranchManager()).getBranchLoader()).getSession();
         offline = determineOffline();
         object = null;
         return;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
index 5e49c8dd43..0c620528ad 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
@@ -64,8 +64,7 @@ public class ComposeBranchPointComposite extends Composite
    * @deprecated as of 4.4 use {@link #ComposeBranchPointComposite(Composite, boolean, CDOBranchPoint)}.
    */
   @Deprecated
-  public ComposeBranchPointComposite(Composite parent, int style, CDOSession session, CDOBranchPoint branchPoint,
-      boolean allowTimeStamp)
+  public ComposeBranchPointComposite(Composite parent, int style, CDOSession session, CDOBranchPoint branchPoint, boolean allowTimeStamp)
   {
     super(parent, style);
     this.allowTimeStamp = allowTimeStamp;
@@ -263,8 +262,7 @@ public class ComposeBranchPointComposite extends Composite
     timeStampGroup.setLayout(new GridLayout(1, false));
     timeStampGroup.setText("Time Stamp:");
 
-    SelectTimeStampComposite timeStampComposite = new SelectTimeStampComposite(timeStampGroup, SWT.NONE,
-        branchPoint.getBranch(), branchPoint.getTimeStamp())
+    SelectTimeStampComposite timeStampComposite = new SelectTimeStampComposite(timeStampGroup, SWT.NONE, branchPoint.getBranch(), branchPoint.getTimeStamp())
     {
       @Override
       protected void timeStampChanged(long timeStamp)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
index f28d7621ab..b17a53722e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
@@ -124,8 +124,7 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar
 
     timeText = new Text(pointGroup, SWT.BORDER);
     timeText.setLayoutData(createTimeGridData());
-    timeText.setText(CDOCommonUtil
-        .formatTimeStamp(timeStamp > CDOBranchPoint.UNSPECIFIED_DATE ? timeStamp : System.currentTimeMillis()));
+    timeText.setText(CDOCommonUtil.formatTimeStamp(timeStamp > CDOBranchPoint.UNSPECIFIED_DATE ? timeStamp : System.currentTimeMillis()));
     timeText.addModifyListener(new ModifyListener()
     {
       public void modifyText(ModifyEvent e)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
index 839c608ba7..5d89951f7b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
@@ -201,8 +201,7 @@ public class SessionComposite extends Composite
   public boolean isDescriptionValid()
   {
     URI uri = URI.createURI(getSessionDescription());
-    return uri.hasAuthority() && uri.host() != null && !StringUtil.isEmpty(uri.host())
-        && !StringUtil.isEmpty(repositoryName);
+    return uri.hasAuthority() && uri.host() != null && !StringUtil.isEmpty(uri.host()) && !StringUtil.isEmpty(repositoryName);
   }
 
   public void rememberSettings()
diff --git a/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/AbstractCDOWorkspaceBase.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/AbstractCDOWorkspaceBase.java
index 129bf06309..31c15ec0bb 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/AbstractCDOWorkspaceBase.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/AbstractCDOWorkspaceBase.java
@@ -122,8 +122,7 @@ public abstract class AbstractCDOWorkspaceBase implements InternalCDOWorkspaceBa
     CDORevisionFactory revisionFactory = CDORevisionFactory.DEFAULT;
     CDOListFactory listFactory = CDOListFactory.DEFAULT;
 
-    return CDOCommonUtil.createCDODataInput(edis, packageRegistry, branchManager, null, revisionFactory, listFactory,
-        null);
+    return CDOCommonUtil.createCDODataInput(edis, packageRegistry, branchManager, null, revisionFactory, listFactory, null);
   }
 
   protected CDODataOutput createCDODataOutput(ExtendedDataOutputStream edos)
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceConfigurationImpl.java
index 348ef97f00..5edba2287c 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceConfigurationImpl.java
@@ -141,13 +141,12 @@ public class CDOWorkspaceConfigurationImpl implements CDOWorkspaceConfiguration
 
   public CDOWorkspace open()
   {
-    return new CDOWorkspaceImpl(localRepositoryName, store, idGenerationLocation, idGenerator,
-        (InternalCDOWorkspaceBase)base, remote);
+    return new CDOWorkspaceImpl(localRepositoryName, store, idGenerationLocation, idGenerator, (InternalCDOWorkspaceBase)base, remote);
   }
 
   public CDOWorkspace checkout()
   {
-    return new CDOWorkspaceImpl(localRepositoryName, store, idGenerationLocation, idGenerator,
-        (InternalCDOWorkspaceBase)base, remote, branchID, branchPath, timeStamp);
+    return new CDOWorkspaceImpl(localRepositoryName, store, idGenerationLocation, idGenerator, (InternalCDOWorkspaceBase)base, remote, branchID, branchPath,
+        timeStamp);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index 44425c326f..4d71b4f845 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -167,9 +167,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
   /**
    * Checkout.
    */
-  public CDOWorkspaceImpl(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation,
-      CDOIDGenerator idGenerator, InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote, int branchID,
-      String branchPath, long timeStamp)
+  public CDOWorkspaceImpl(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation, CDOIDGenerator idGenerator,
+      InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote, int branchID, String branchPath, long timeStamp)
   {
     init(localRepositoryName, store, idGenerationLocation, idGenerator, base, remote);
 
@@ -185,8 +184,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
   /**
    * Open.
    */
-  public CDOWorkspaceImpl(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation,
-      CDOIDGenerator idGenerator, InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote)
+  public CDOWorkspaceImpl(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation, CDOIDGenerator idGenerator,
+      InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote)
   {
     init(localRepositoryName, store, idGenerationLocation, idGenerator, base, remote);
     loadProperties();
@@ -269,8 +268,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
     }
   }
 
-  protected void init(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation,
-      CDOIDGenerator idGenerator, InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote)
+  protected void init(String localRepositoryName, IStore store, IDGenerationLocation idGenerationLocation, CDOIDGenerator idGenerator,
+      InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote)
   {
     this.idGenerationLocation = idGenerationLocation;
     this.idGenerator = idGenerator;
@@ -588,8 +587,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
     }
   }
 
-  private InternalCDOTransaction openLocalTransaction(final InternalCDOSession remoteSession,
-      final CDOChangeSetData remoteData, final CDOBranchPoint remotePoint, final long newTimeStamp)
+  private InternalCDOTransaction openLocalTransaction(final InternalCDOSession remoteSession, final CDOChangeSetData remoteData,
+      final CDOBranchPoint remotePoint, final long newTimeStamp)
   {
     InternalCDOTransaction transaction = (InternalCDOTransaction)getLocalSession().openTransaction();
     initView(transaction);
@@ -630,8 +629,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
         }
       }
 
-      private IStoreAccessor.Raw updateBase(InternalCDORevision localRevision, InternalCDORevision remoteRevision,
-          CDOID id, IStoreAccessor.Raw accessor)
+      private IStoreAccessor.Raw updateBase(InternalCDORevision localRevision, InternalCDORevision remoteRevision, CDOID id, IStoreAccessor.Raw accessor)
       {
         if (localRevision == null)
         {
@@ -740,8 +738,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
     throw ex;
   }
 
-  private CDOChangeSetData getMergeResult(CDOMerger merger, CDOBranchPoint basePoint, CDOBranchPoint remotePoint,
-      CDOChangeSetData localData, CDOChangeSetData remoteData)
+  private CDOChangeSetData getMergeResult(CDOMerger merger, CDOBranchPoint basePoint, CDOBranchPoint remotePoint, CDOChangeSetData localData,
+      CDOChangeSetData remoteData)
   {
     if (localData.isEmpty())
     {
@@ -805,8 +803,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
 
       SyntheticCDORevision[] synthetics = { null };
       InternalCDORevisionManager revisionManager = localSession.getRevisionManager();
-      revisionManager.getRevision(id, localSessionHead, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true,
-          synthetics);
+      revisionManager.getRevision(id, localSessionHead, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
 
       int max = synthetics[0].getVersion();
       EClass eClass = synthetics[0].getEClass();
@@ -948,8 +945,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
     }
   }
 
-  protected Set<CDOID> checkinPostProcessing(InternalCDOTransaction remoteTransaction,
-      List<CDORevisionKey> changedObjects)
+  protected Set<CDOID> checkinPostProcessing(InternalCDOTransaction remoteTransaction, List<CDORevisionKey> changedObjects)
   {
     Set<CDOID> ids = new HashSet<CDOID>();
     IStoreAccessor.Raw accessor = null;
@@ -1399,8 +1395,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
 
   protected void loadProperties()
   {
-    Set<String> names = new HashSet<String>(
-        Arrays.asList(PROP_BRANCH_ID, PROP_BRANCH_PATH, PROP_TIME_STAMP, PROP_FIXED));
+    Set<String> names = new HashSet<String>(Arrays.asList(PROP_BRANCH_ID, PROP_BRANCH_PATH, PROP_TIME_STAMP, PROP_FIXED));
     Map<String, String> props = localRepository.getStore().getPersistentProperties(names);
     String prop = props.get(PROP_BRANCH_ID);
     branchID = prop == null ? InternalCDOWorkspace.NO_BRANCH_ID : Integer.parseInt(prop);
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
index e8703162ed..a1e9e6e8e9 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
@@ -146,8 +146,7 @@ public final class CDOWorkspaceUtil
    * @deprecated Use {@link #createWorkspaceConfiguration()} and {@link CDOWorkspaceConfiguration#checkout()}
    */
   @Deprecated
-  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote,
-      String branchPath)
+  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote, String branchPath)
   {
     return checkout(local, base, remote, branchPath, CDOBranchPoint.UNSPECIFIED_DATE);
   }
@@ -156,8 +155,7 @@ public final class CDOWorkspaceUtil
    * @deprecated Use {@link #createWorkspaceConfiguration()} and {@link CDOWorkspaceConfiguration#checkout()}
    */
   @Deprecated
-  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote,
-      long timeStamp)
+  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote, long timeStamp)
   {
     return checkout(local, base, remote, null, timeStamp);
   }
@@ -166,8 +164,7 @@ public final class CDOWorkspaceUtil
    * @deprecated Use {@link #createWorkspaceConfiguration()} and {@link CDOWorkspaceConfiguration#checkout()}
    */
   @Deprecated
-  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote,
-      String branchPath, long timeStamp)
+  public static CDOWorkspace checkout(IStore local, CDOWorkspaceBase base, CDOSessionConfigurationFactory remote, String branchPath, long timeStamp)
   {
     CDOWorkspaceConfiguration config = createWorkspaceConfiguration();
     config.setStore(local);
diff --git a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
index 283058f162..60789ef828 100644
--- a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -400,7 +400,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOElement.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOElement.java
index 670cd9c6aa..5a250bbfab 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOElement.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOElement.java
@@ -128,8 +128,7 @@ public class CDOElement extends AdapterImpl implements IAdaptable
     }
 
     CDOObject cdoObject = CDOUtil.getCDOObject(eObject, false);
-    if (cdoObject != null
-        && (FSMUtil.isInvalid(cdoObject) || cdoObject.cdoView() == null || cdoObject.cdoView().isClosed()))
+    if (cdoObject != null && (FSMUtil.isInvalid(cdoObject) || cdoObject.cdoView() == null || cdoObject.cdoView().isClosed()))
     {
       return null;
     }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index a8fb8ad7ad..31854b1d44 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -779,8 +779,7 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
       @Override
       public Iterator<EObject> getChildren(Object object)
       {
-        return object == CDOResourceImpl.this ? CDOResourceImpl.this.getContents().iterator()
-            : ((EObject)object).eContents().iterator();
+        return object == CDOResourceImpl.this ? CDOResourceImpl.this.getContents().iterator() : ((EObject)object).eContents().iterator();
       }
     };
   }
@@ -1005,8 +1004,7 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
       @Override
       public Iterator<EObject> getChildren(Object object)
       {
-        return object == this.object ? ((List<EObject>)object).iterator()
-            : new ProperContentIterator<EObject>((EObject)object);
+        return object == this.object ? ((List<EObject>)object).iterator() : new ProperContentIterator<EObject>((EObject)object);
       }
     };
   }
@@ -1333,8 +1331,7 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
   public void save(Map<?, ?> options) throws IOException
   {
     CDOTransaction transaction = getTransaction(options);
-    IProgressMonitor progressMonitor = options != null
-        ? (IProgressMonitor)options.get(CDOResource.OPTION_SAVE_PROGRESS_MONITOR) : null;
+    IProgressMonitor progressMonitor = options != null ? (IProgressMonitor)options.get(CDOResource.OPTION_SAVE_PROGRESS_MONITOR) : null;
 
     try
     {
@@ -1353,9 +1350,7 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
    */
   private CDOTransaction getTransaction(Map<?, ?> options)
   {
-    CDOTransaction transaction = options != null
-        ? (CDOTransaction)options.get(CDOResource.OPTION_SAVE_OVERRIDE_TRANSACTION) : null;
-
+    CDOTransaction transaction = options != null ? (CDOTransaction)options.get(CDOResource.OPTION_SAVE_OVERRIDE_TRANSACTION) : null;
     if (transaction == null)
     {
       CDOView view = cdoView();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
index 42f2efdac2..c4884452c2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
@@ -43,8 +43,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
   {
     try
     {
-      EresourceFactory theEresourceFactory = (EresourceFactory)EPackage.Registry.INSTANCE
-          .getEFactory(EresourcePackage.eNS_URI);
+      EresourceFactory theEresourceFactory = (EresourceFactory)EPackage.Registry.INSTANCE.getEFactory(EresourcePackage.eNS_URI);
       if (theEresourceFactory != null)
       {
         return theEresourceFactory;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 788e3e45be..3dcb0234f0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -145,9 +145,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     }
 
     // Obtain or create and register package
-    EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new EresourcePackageImpl());
+    EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EresourcePackageImpl());
 
     isInited = true;
 
@@ -545,8 +544,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getCDOResourceNode_Folder(), getCDOResourceFolder(), getCDOResourceFolder_Nodes(), "folder", null, 0, //$NON-NLS-1$
-        1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getCDOResourceNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, CDOResourceNode.class, //$NON-NLS-1$
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResourceNode_Path(), ecorePackage.getEString(), "path", null, 0, 1, CDOResourceNode.class, //$NON-NLS-1$
@@ -555,8 +554,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     initEClass(cdoResourceFolderEClass, CDOResourceFolder.class, "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getCDOResourceFolder_Nodes(), getCDOResourceNode(), getCDOResourceNode_Folder(), "nodes", //$NON-NLS-1$
-        null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     EOperation op = addEOperation(cdoResourceFolderEClass, getCDOResourceFolder(), "addResourceFolder", 0, 1, //$NON-NLS-1$
         IS_UNIQUE, IS_ORDERED);
@@ -580,15 +579,13 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     initEAttribute(getCDOResource_URI(), getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getCDOResource_Contents(), ecorePackage.getEObject(), null, "contents", null, 0, -1, //$NON-NLS-1$
-        CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResource_Modified(), ecorePackage.getEBoolean(), "modified", null, 0, 1, CDOResource.class, //$NON-NLS-1$
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResource_Loaded(), ecorePackage.getEBoolean(), "loaded", "true", 0, 1, CDOResource.class, //$NON-NLS-1$//$NON-NLS-2$
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResource_TrackingModification(), ecorePackage.getEBoolean(), "trackingModification", null, 0, //$NON-NLS-1$
-        1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+        1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResource_Errors(), getDiagnostic(), "errors", null, 0, -1, CDOResource.class, //$NON-NLS-1$
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResource_Warnings(), getDiagnostic(), "warnings", null, 0, -1, CDOResource.class, //$NON-NLS-1$
@@ -611,17 +608,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     initEClass(cdoBinaryResourceEClass, CDOBinaryResource.class, "CDOBinaryResource", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCDOBinaryResource_Contents(), theEtypesPackage.getBlob(), "contents", null, 1, 1, //$NON-NLS-1$
-        CDOBinaryResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        CDOBinaryResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(cdoTextResourceEClass, CDOTextResource.class, "CDOTextResource", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCDOTextResource_Contents(), theEtypesPackage.getClob(), "contents", null, 1, 1, //$NON-NLS-1$
-        CDOTextResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        CDOTextResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOTextResource_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, //$NON-NLS-1$
-        CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(resourceSetEDataType, ResourceSet.class, "ResourceSet", !IS_SERIALIZABLE, //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
index b3dd5f92c7..54ac8145fc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
@@ -126,8 +126,8 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     }
 
     // Obtain or create and register package
-    EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof EtypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EtypesPackageImpl());
+    EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EtypesPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EtypesPackageImpl());
 
     isInited = true;
 
@@ -353,8 +353,8 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     initEClass(modelElementEClass, ModelElement.class, "ModelElement", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getModelElement_Annotations(), getAnnotation(), getAnnotation_ModelElement(), "annotations", null, 0, //$NON-NLS-1$
-        -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     EOperation op = addEOperation(modelElementEClass, getAnnotation(), "getAnnotation", 0, 1, IS_UNIQUE, //$NON-NLS-1$
         IS_ORDERED);
@@ -365,17 +365,14 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     initEAttribute(getAnnotation_Source(), ecorePackage.getEString(), "source", null, 0, 1, Annotation.class, //$NON-NLS-1$
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAnnotation_Details(), ecorePackage.getEStringToStringMapEntry(), null, "details", null, 0, -1, //$NON-NLS-1$
-        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAnnotation_ModelElement(), getModelElement(), getModelElement_Annotations(), "modelElement", null, //$NON-NLS-1$
-        0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEReference(getAnnotation_Contents(), ecorePackage.getEObject(), null, "contents", null, 0, -1, Annotation.class, //$NON-NLS-1$
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAnnotation_References(), ecorePackage.getEObject(), null, "references", null, 0, -1, //$NON-NLS-1$
-        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(blobEDataType, CDOBlob.class, "Blob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index 335c115c4d..ae57ec1daa 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -94,8 +94,7 @@ import java.util.concurrent.locks.Lock;
  * @apiviz.exclude .*\.CDOTransactionContainer
  * @apiviz.exclude .*\.CDOUpdatable
  */
-public interface CDOSession
-    extends CDOCommonSession, CDOUpdatable, CDOTransactionContainer, IPasswordCredentialsProvider.Provider
+public interface CDOSession extends CDOCommonSession, CDOUpdatable, CDOTransactionContainer, IPasswordCredentialsProvider.Provider
 {
   /**
    * Returns an instance of {@link CDORepositoryInfo} that describes the model repository this {@link CDOSession
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.java
index 5e0a7ed591..10d7203aa8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.java
@@ -64,8 +64,7 @@ public class CDOAsyncTransactionHandler implements CDOTransactionHandler
    * Asynchronously executes the delegate handler's {@link #modifyingObject(CDOTransaction, CDOObject, CDOFeatureDelta)
    * modifyingObject()} method.
    */
-  public final void modifyingObject(final CDOTransaction transaction, final CDOObject object,
-      final CDOFeatureDelta featureChange)
+  public final void modifyingObject(final CDOTransaction transaction, final CDOObject object, final CDOFeatureDelta featureChange)
   {
     runAsync(new Runnable()
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java
index de39f8e61d..ac976929cc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java
@@ -41,6 +41,5 @@ public interface CDOConflictResolver2 extends CDOConflictResolver
    *          locally (depends on local revision caching and server behavior regarding transmission of deltas instead
    *          of invalidations).
    */
-  public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> allRemoteDeltas);
+  public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger2.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger2.java
index 6a0d3373b5..829dff7b9d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger2.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOMerger2.java
@@ -29,6 +29,5 @@ public interface CDOMerger2 extends CDOMerger
   @Deprecated
   public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws UnsupportedOperationException;
 
-  public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
-      throws ConflictException;
+  public void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws ConflictException;
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
index 2c592db6ef..70f82c7eef 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
@@ -151,8 +151,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
       throw new IllegalArgumentException("Not a file: " + file.getAbsolutePath());
     }
 
-    OM.LOG.info("Using " + file.getAbsolutePath() + " for push transaction "
-        + delegate.getSession().getRepositoryInfo().getName() + ":" + //
+    OM.LOG.info("Using " + file.getAbsolutePath() + " for push transaction " + delegate.getSession().getRepositoryInfo().getName() + ":" + //
         delegate.getSession().getSessionID() + ":" + //
         delegate.getViewID());
 
@@ -740,14 +739,12 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
     return delegate.getLockStatesOfObjects(objects);
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout) throws InterruptedException
   {
     delegate.lockObjects(objects, lockType, timeout);
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive) throws InterruptedException
   {
     delegate.lockObjects(objects, lockType, timeout, recursive);
   }
@@ -762,8 +759,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
     return delegate.queryResources(folder, name, exactMatch);
   }
 
-  public CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name,
-      boolean exactMatch)
+  public CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name, boolean exactMatch)
   {
     return delegate.queryResourcesAsync(folder, name, exactMatch);
   }
@@ -805,8 +801,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
     return delegate.queryXRefs(targetObjects, sourceReferences);
   }
 
-  public CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  public CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     return delegate.queryXRefsAsync(targetObjects, sourceReferences);
   }
@@ -854,8 +849,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
   /**
    * @since 4.6
    */
-  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase,
-      CDOMerger merger)
+  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase, CDOMerger merger)
   {
     return delegate.merge(sourceBase, sourceBase, targetBase, merger);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index 69069ae043..85df1cd732 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -116,8 +116,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
    * @see #merge(CDOBranch, CDOMerger)
    * @since 4.6
    */
-  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase,
-      CDOMerger merger);
+  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase, CDOMerger merger);
 
   /**
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUndoDetector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUndoDetector.java
index 6a12b41765..d65adbc86d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUndoDetector.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUndoDetector.java
@@ -32,6 +32,5 @@ public interface CDOUndoDetector
 
   public static final CDOUndoDetector ALL_FEATURES = new CDOUndoDetectorImpl();
 
-  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision,
-      CDOFeatureDelta featureDelta);
+  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision, CDOFeatureDelta featureDelta);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
index 834921e1c0..8157c2d7b0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
@@ -53,13 +53,13 @@ public interface CDOUserTransaction
       for (;;)
       {
         transaction.getViewLock().lock();
-
+  
         try
         {
           CDOResource resource = transaction.getResource("/stock/resource1");
-
+  
           // Modify the model here...
-
+  
           transaction.commit();
           break;
         }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
index 05e6840c15..ed4f206db8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
@@ -40,8 +40,7 @@ public class DanglingReferenceException extends CDOException
 
   public DanglingReferenceException(EObject object)
   {
-    super(
-        MessageFormat.format(Messages.getString("DanglingReferenceException.0"), object, object.getClass().getName())); //$NON-NLS-1$
+    super(MessageFormat.format(Messages.getString("DanglingReferenceException.0"), object, object.getClass().getName())); //$NON-NLS-1$
     target = object;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
index d4342abdfc..6c208d9a7c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
@@ -35,8 +35,8 @@ public interface CDORevisionPrefetchingPolicy
 {
   public static final CDORevisionPrefetchingPolicy NO_PREFETCHING = new CDORevisionPrefetchingPolicy()
   {
-    public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject targetObject,
-        EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID)
+    public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject targetObject, EStructuralFeature feature, CDOList list,
+        int accessIndex, CDOID accessID)
     {
       return Collections.emptyList();
     }
@@ -51,6 +51,6 @@ public interface CDORevisionPrefetchingPolicy
    * @return Should return a list of id's to be fetch.
    * @since 3.0
    */
-  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject targetObject,
-      EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID);
+  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject targetObject, EStructuralFeature feature, CDOList list,
+      int accessIndex, CDOID accessID);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java
index 92cad41baa..ff10f61e1f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java
@@ -94,8 +94,7 @@ public interface CDOStaleReferencePolicy
   {
     private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CDOStaleReferencePolicy.class);
 
-    public Object processStaleReference(final EObject source, final EStructuralFeature feature, int index,
-        final CDOID target)
+    public Object processStaleReference(final EObject source, final EStructuralFeature feature, int index, final CDOID target)
     {
       final EClassifier type = getType(source, feature, index, target);
       InvocationHandler handler = new InvocationHandler()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 10aefd8ba1..98c1a0d89d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -95,8 +95,7 @@ import java.util.concurrent.locks.Lock;
  * @apiviz.uses {@link CDOViewLocksChangedEvent} - - fires
  * @apiviz.uses {@link CDOViewTargetChangedEvent} - - fires
  */
-public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.Provider<CDOObject, CDOObjectHistory>,
-    IContainer<CDOResourceNode>
+public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.Provider<CDOObject, CDOObjectHistory>, IContainer<CDOResourceNode>
 {
   /**
    * @since 4.5
@@ -357,8 +356,7 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
    *          <code>true</code> if the complete name of the resource must match, <code>false</code> if only a common
    *          prefix of the name must match.
    */
-  public CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name,
-      boolean exactMatch);
+  public CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name, boolean exactMatch);
 
   /**
    * Returns a list of the instances of the given type.
@@ -431,8 +429,7 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
    * @see CDOView#queryXRefs(Set, EReference...)
    * @see CDOUtil#wrapExternalObject(EObject, CDOView)
    */
-  public CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects,
-      EReference... sourceReferences);
+  public CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects, EReference... sourceReferences);
 
   /**
    * Returns the object for the given CDOID.
@@ -502,11 +499,9 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
    *
    * @since 3.0
    */
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout)
-      throws InterruptedException;
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout) throws InterruptedException;
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive)
-      throws InterruptedException;
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive) throws InterruptedException;
 
   /**
    * Unlocks the given locked objects of this view.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 96285c175b..cf53f83509 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -380,8 +380,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
 
     if (resource != null)
     {
-      throw new IllegalArgumentException(
-          "Only intended to be called by CDOTransactionImpl.removeObject(CDOID, CDOObject");
+      throw new IllegalArgumentException("Only intended to be called by CDOTransactionImpl.removeObject(CDOID, CDOObject");
     }
 
     super.eSetDirectResource(null);
@@ -767,8 +766,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
    * @since 2.0
    */
   @Override
-  public final NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain msgs)
+  public final NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID, NotificationChain msgs)
   {
     boolean isResource = this instanceof CDOResource;
     boolean isRootResource = isResource && ((CDOResource)this).isRoot();
@@ -803,8 +801,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     }
 
     CDOView oldView = viewAndState.view;
-    CDOView newView = newResource != null && newResource instanceof CDOResource ? ((CDOResource)newResource).cdoView()
-        : null;
+    CDOView newView = newResource != null && newResource instanceof CDOResource ? ((CDOResource)newResource).cdoView() : null;
 
     boolean moved = oldView != null && oldView == newView;
     if (!moved && oldResource != null && oldResource != newResource && !isRootResource)
@@ -829,8 +826,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     {
       if (oldContainer != null && oldContainerFeatureID >= 0 && oldContainerFeatureID != newContainerFeatureID)
       {
-        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, oldContainerFeatureID,
-            oldContainer, null);
+        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, oldContainerFeatureID, oldContainer, null);
         if (msgs == null)
         {
           msgs = notification;
@@ -1235,8 +1231,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
    * Adjust the reference ONLY if the opposite reference used CDOID. This is true ONLY if the state of <cdo>this</code>
    * was not {@link CDOState#NEW}.
    */
-  private static void adjustOppositeReference(InternalCDOObject instance, InternalEObject opposite,
-      EReference oppositeReference)
+  private static void adjustOppositeReference(InternalCDOObject instance, InternalEObject opposite, EReference oppositeReference)
   {
     if (opposite != null)
     {
@@ -1285,16 +1280,14 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
   /**
    * @since 3.0
    */
-  public static void instanceToRevisionFeature(InternalCDOView view, InternalCDOObject object,
-      EStructuralFeature feature, Object setting)
+  public static void instanceToRevisionFeature(InternalCDOView view, InternalCDOObject object, EStructuralFeature feature, Object setting)
   {
     if (TRACER.isEnabled())
     {
       TRACER.format("Populating feature {0}", feature); //$NON-NLS-1$
     }
 
-    PersistenceFilter filter = ((InternalCDOClassInfo)CDOModelUtil.getClassInfo(feature.getEContainingClass()))
-        .getPersistenceFilter(feature);
+    PersistenceFilter filter = ((InternalCDOClassInfo)CDOModelUtil.getClassInfo(feature.getEContainingClass())).getPersistenceFilter(feature);
     if (filter != null)
     {
       if (TRACER.isEnabled())
@@ -1332,8 +1325,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
   /**
    * @since 2.0
    */
-  public static void revisionToInstanceFeature(InternalCDOObject instance, InternalCDORevision revision,
-      EStructuralFeature eFeature)
+  public static void revisionToInstanceFeature(InternalCDOObject instance, InternalCDORevision revision, EStructuralFeature eFeature)
   {
     if (TRACER.isEnabled())
     {
@@ -1642,8 +1634,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     public CDOStoreEcoreEMap(EStructuralFeature eStructuralFeature)
     {
       super((EClass)eStructuralFeature.getEType(), BasicEMap.Entry.class, null);
-      delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(CDOObjectImpl.this,
-          eStructuralFeature)
+      delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(CDOObjectImpl.this, eStructuralFeature)
       {
         private static final long serialVersionUID = 1L;
 
@@ -1661,8 +1652,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
         }
 
         @Override
-        protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject,
-            BasicEMap.Entry<Object, Object> oldObject)
+        protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject, BasicEMap.Entry<Object, Object> oldObject)
         {
           didRemove(index, oldObject);
           didAdd(index, newObject);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
index 47da7389b0..04bedec85f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
@@ -42,69 +42,59 @@ public class CDODeltaNotificationImpl extends ENotificationImpl implements CDODe
 {
   private CDORevisionDelta revisionDelta;
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue, Object newValue)
   {
     super(getEObject(notifier), eventType, feature, oldValue, newValue);
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue, int position)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue, Object newValue, int position)
   {
     super(getEObject(notifier), eventType, feature, oldValue, newValue, position);
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      boolean oldBooleanValue, boolean newBooleanValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, boolean oldBooleanValue, boolean newBooleanValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldBooleanValue, newBooleanValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      byte oldByteValue, byte newByteValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, byte oldByteValue, byte newByteValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldByteValue, newByteValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      char oldCharValue, char newCharValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, char oldCharValue, char newCharValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldCharValue, newCharValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      double oldDoubleValue, double newDoubleValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, double oldDoubleValue, double newDoubleValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldDoubleValue, newDoubleValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      float oldFloatValue, float newFloatValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, float oldFloatValue, float newFloatValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldFloatValue, newFloatValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, int oldIntValue,
-      int newIntValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, int oldIntValue, int newIntValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldIntValue, newIntValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      long oldLongValue, long newLongValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, long oldLongValue, long newLongValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldLongValue, newLongValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      short oldShortValue, short newShortValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, short oldShortValue, short newShortValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldShortValue, newShortValue);
     this.feature = feature;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
index d3323b16cf..0a1f780280 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
@@ -51,8 +51,7 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
     super(object);
 
     instance.eAdapters().add(this);
-    ((org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList)instance.eAdapters())
-        .addListener(new AdapterListListener());
+    ((org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList)instance.eAdapters()).addListener(new AdapterListListener());
   }
 
   public void setTarget(Notifier newTarget)
@@ -330,8 +329,7 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
    * @author Martin Fluegge
    * @since 3.0
    */
-  protected class AdapterListListener
-      implements org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
+  protected class AdapterListListener implements org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
   {
     /**
      * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
index d5dc92396e..4d6bdeae30 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
@@ -605,8 +605,8 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
         TRACER.format("State of Object (" + this + "/" + instance + ") is : " + viewAndState.state); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       }
 
-      if (viewAndState.state == CDOState.CLEAN || viewAndState.state == CDOState.PROXY
-          || viewAndState.state == CDOState.NEW || viewAndState.state == CDOState.DIRTY)
+      if (viewAndState.state == CDOState.CLEAN || viewAndState.state == CDOState.PROXY || viewAndState.state == CDOState.NEW
+          || viewAndState.state == CDOState.DIRTY)
       {
         InternalCDORevision revision = cdoRevision();
         int size = revision.size(feature);
@@ -865,8 +865,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
    *          that will be used later to resolve the proxy. <code>null</code> indicates that proxy creation will be
    *          avoided!
    */
-  protected InternalEObject getEObjectFromPotentialID(InternalCDOView view, EStructuralFeature feature,
-      Object potentialID)
+  protected InternalEObject getEObjectFromPotentialID(InternalCDOView view, EStructuralFeature feature, Object potentialID)
   {
     CDOLegacyWrapper wrapper;
     if (potentialID instanceof CDOID && (wrapper = getRegisteredWrapper((CDOID)potentialID)) != null)
@@ -1178,8 +1177,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
 
   }
 
-  private void adjustPersistentOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject,
-      EReference oppositeReference)
+  private void adjustPersistentOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject, EReference oppositeReference)
   {
     InternalCDOObject oppositeCDOObject = (InternalCDOObject)CDOUtil.getCDOObject(oppositeObject);
     if (oppositeCDOObject != null)
@@ -1212,8 +1210,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
     }
   }
 
-  private void adjustTransientOppositeReference(InternalEObject instance, InternalEObject object,
-      EReference oppositeReference)
+  private void adjustTransientOppositeReference(InternalEObject instance, InternalEObject object, EReference oppositeReference)
   {
     boolean wasDeliver = object.eDeliver(); // Disable notifications
     if (wasDeliver)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
index 2dddf8cd89..b04c249ca3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
@@ -82,8 +82,8 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
   /**
    * @since 3.0
    */
-  public synchronized NotificationChain buildNotification(InternalEObject object, InternalCDORevision oldRevision,
-      CDORevisionDelta revisionDelta, Set<CDOObject> detachedObjects)
+  public synchronized NotificationChain buildNotification(InternalEObject object, InternalCDORevision oldRevision, CDORevisionDelta revisionDelta,
+      Set<CDOObject> detachedObjects)
   {
     notification = new NotificationChainImpl();
 
@@ -119,16 +119,14 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
       }
     }
 
-    add(new CDODeltaNotificationImpl(object, Notification.MOVE, feature, Integer.valueOf(oldPosition), oldValue,
-        newPosition));
+    add(new CDODeltaNotificationImpl(object, Notification.MOVE, feature, Integer.valueOf(oldPosition), oldValue, newPosition));
   }
 
   @Override
   public void visit(CDOAddFeatureDelta delta)
   {
     EStructuralFeature feature = delta.getFeature();
-    add(new CDODeltaNotificationImpl(object, Notification.ADD, feature, getOldValue(feature), delta.getValue(),
-        delta.getIndex()));
+    add(new CDODeltaNotificationImpl(object, Notification.ADD, feature, getOldValue(feature), delta.getValue(), delta.getIndex()));
   }
 
   @Override
@@ -253,8 +251,7 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
 
     }
 
-    add(new CDODeltaNotificationImpl(object, Notification.SET, EcorePackage.eINSTANCE.eContainmentFeature(), oldValue,
-        delta.getContainerID()));
+    add(new CDODeltaNotificationImpl(object, Notification.SET, EcorePackage.eINSTANCE.eContainmentFeature(), oldValue, delta.getContainerID()));
   }
 
   private CDOObject findObjectByID(CDOID id)
@@ -294,8 +291,7 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
     return oldRevision.getValue(feature);
   }
 
-  private CDODeltaNotificationImpl createNotification(int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue, int position)
+  private CDODeltaNotificationImpl createNotification(int eventType, EStructuralFeature feature, Object oldValue, Object newValue, int position)
   {
     EClassifier eType = feature.getEType();
 
@@ -343,42 +339,34 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
     return new CDODeltaNotificationImpl(object, eventType, feature, oldValue, newValue, position);
   }
 
-  private CDODeltaNotificationImpl createPrimitiveNotification(int eventType, EStructuralFeature feature,
-      Class<?> instanceClass, Object oldValue, Object newValue)
+  private CDODeltaNotificationImpl createPrimitiveNotification(int eventType, EStructuralFeature feature, Class<?> instanceClass, Object oldValue,
+      Object newValue)
   {
     switch (ReflectUtil.PrimitiveType.forClass(instanceClass))
     {
     case BOOLEAN:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Boolean)oldValue).booleanValue(),
-          ((Boolean)newValue).booleanValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Boolean)oldValue).booleanValue(), ((Boolean)newValue).booleanValue());
 
     case BYTE:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).byteValue(),
-          ((Number)newValue).byteValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).byteValue(), ((Number)newValue).byteValue());
 
     case CHAR:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Character)oldValue).charValue(),
-          ((Character)newValue).charValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Character)oldValue).charValue(), ((Character)newValue).charValue());
 
     case SHORT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).shortValue(),
-          ((Number)newValue).shortValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).shortValue(), ((Number)newValue).shortValue());
 
     case INT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).intValue(),
-          ((Number)newValue).intValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).intValue(), ((Number)newValue).intValue());
 
     case LONG:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).longValue(),
-          ((Number)newValue).longValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).longValue(), ((Number)newValue).longValue());
 
     case FLOAT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).floatValue(),
-          ((Number)newValue).floatValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).floatValue(), ((Number)newValue).floatValue());
 
     case DOUBLE:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).doubleValue(),
-          ((Number)newValue).doubleValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).doubleValue(), ((Number)newValue).doubleValue());
 
     case VOID:
       throw new IllegalArgumentException("Feature of void type not supported: " + feature); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
index 4bd6f0c288..60e6170637 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
@@ -228,8 +228,7 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
     return instance.eBasicRemoveFromContainer(notifications);
   }
 
-  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain notifications)
+  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID, NotificationChain notifications)
   {
     return instance.eBasicSetContainer(newContainer, newContainerFeatureID, notifications);
   }
@@ -347,14 +346,12 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
     return instance.eInternalResource();
   }
 
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass, NotificationChain notifications)
   {
     return instance.eInverseAdd(otherEnd, featureID, baseClass, notifications);
   }
 
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass, NotificationChain notifications)
   {
     return instance.eInverseRemove(otherEnd, featureID, baseClass, notifications);
   }
@@ -372,10 +369,8 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
   public boolean eIsSet(int featureID)
   {
     // Features that need special handling
-    if (featureID == EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE
-        || featureID == EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME
-        || featureID == EcorePackage.ECLASS__EGENERIC_SUPER_TYPES
-        || featureID == EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS)
+    if (featureID == EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE || featureID == EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME
+        || featureID == EcorePackage.ECLASS__EGENERIC_SUPER_TYPES || featureID == EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS)
     {
       return isSetInstanceValue(instance, instance.eClass().getEStructuralFeature(featureID));
     }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
index 1e4cdb9cdf..270a7664ad 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
@@ -94,8 +94,7 @@ public class CDOAuthenticatorImpl implements org.eclipse.emf.cdo.common.protocol
   {
     try
     {
-      return SecurityUtil.encrypt(token, password, encryptionAlgorithmName, encryptionSaltBytes,
-          encryptionIterationCount);
+      return SecurityUtil.encrypt(token, password, encryptionAlgorithmName, encryptionSaltBytes, encryptionIterationCount);
     }
     catch (RuntimeException ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
index c205764635..15c2d23ded 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
@@ -78,8 +78,7 @@ public class CDOCollectionLoadingPolicyImpl implements CDOCollectionLoadingPolic
     return doResolveProxy(rev, feature, accessIndex, serverIndex, chunkSize);
   }
 
-  private Object doResolveProxy(CDORevision rev, EStructuralFeature feature, int accessIndex, int serverIndex,
-      int chunkSize)
+  private Object doResolveProxy(CDORevision rev, EStructuralFeature feature, int accessIndex, int serverIndex, int chunkSize)
   {
     // Get proxy values
     InternalCDORevision revision = (InternalCDORevision)rev;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
index 22776fc045..7313988d36 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
@@ -45,8 +45,7 @@ public abstract class CDOSessionFactory extends Factory
       String query = uri.getQuery();
       if (StringUtil.isEmpty(query))
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
       }
 
       Map<String, String> parameters = CDOURIUtil.getParameters(query);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index ba43d6eaaf..553b9098a0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -159,8 +159,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * @author Eike Stepper
  */
-public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
-    implements InternalCDOSession, IExecutorServiceProvider
+public abstract class CDOSessionImpl extends CDOTransactionContainerImpl implements InternalCDOSession, IExecutorServiceProvider
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, CDOSessionImpl.class);
 
@@ -671,8 +670,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     });
   }
 
-  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch,
-      List<InternalCDOView> branchViews, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
+  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch, List<InternalCDOView> branchViews,
+      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
   {
     Map<CDOID, InternalCDORevision> oldRevisions = viewedRevisions.get(branch);
 
@@ -712,8 +711,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     }
   }
 
-  private void collectViewedRevisions(Map<CDOBranch, List<InternalCDOView>> views,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
+  private void collectViewedRevisions(Map<CDOBranch, List<InternalCDOView>> views, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
   {
     for (InternalCDOView view : getViews())
     {
@@ -1100,8 +1098,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
   }
 
   @Deprecated
-  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache,
-      byte securityImpact, Map<CDOID, CDOPermission> newPermissions)
+  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache, byte securityImpact,
+      Map<CDOID, CDOPermission> newPermissions)
   {
     throw new UnsupportedOperationException();
   }
@@ -1191,14 +1189,12 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     return CDORevisionUtil.createChangeSetData(ids, sourceInfo, targetInfo);
   }
 
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase,
-      boolean computeChangeSets)
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, boolean computeChangeSets)
   {
     return getMergeData(target, source, null, sourceBase, computeChangeSets);
   }
 
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase,
-      CDOBranchPoint sourceBase, boolean computeChangeSets)
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase, CDOBranchPoint sourceBase, boolean computeChangeSets)
   {
     boolean auto;
     if (sourceBase == CDOBranchUtil.AUTO_BRANCH_POINT)
@@ -1265,8 +1261,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       sourceChanges = createChangeSet(result.getSourceIDs(), sourceBaseInfo, sourceInfo);
     }
 
-    return new MergeData(target, targetInfo, targetBase, targetBaseInfo, result.getTargetIDs(), targetChanges, source,
-        sourceInfo, sourceBase, sourceBaseInfo, result.getSourceIDs(), sourceChanges, result.getResultBase());
+    return new MergeData(target, targetInfo, targetBase, targetBaseInfo, result.getTargetIDs(), targetChanges, source, sourceInfo, sourceBase, sourceBaseInfo,
+        result.getSourceIDs(), sourceChanges, result.getResultBase());
   }
 
   @Deprecated
@@ -1330,8 +1326,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       if (revision.getBranch() != branch)
       {
         CDOID id = revision.getID();
-        CDORevision firstRevision = revisionManager.getCache().getRevisionByVersion(id,
-            branch.getVersion(CDOBranchVersion.FIRST_VERSION));
+        CDORevision firstRevision = revisionManager.getCache().getRevisionByVersion(id, branch.getVersion(CDOBranchVersion.FIRST_VERSION));
         if (firstRevision != null)
         {
           long revised = firstRevision.getTimeStamp() - 1L;
@@ -1343,8 +1338,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     }
   }
 
-  private CDOChangeSet createChangeSet(Set<CDOID> ids, CDORevisionAvailabilityInfo startInfo,
-      CDORevisionAvailabilityInfo endInfo)
+  private CDOChangeSet createChangeSet(Set<CDOID> ids, CDORevisionAvailabilityInfo startInfo, CDORevisionAvailabilityInfo endInfo)
   {
     CDOChangeSetData data = CDORevisionUtil.createChangeSetData(ids, startInfo, endInfo);
     return CDORevisionUtil.createChangeSet(startInfo.getBranchPoint(), endInfo.getBranchPoint(), data);
@@ -1506,8 +1500,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
           IListener[] listeners = getListeners();
           if (listeners != null)
           {
-            fireEvent(new PassiveUpdateEventImpl(!passiveUpdateEnabled, passiveUpdateEnabled, passiveUpdateMode,
-                passiveUpdateMode), listeners);
+            fireEvent(new PassiveUpdateEventImpl(!passiveUpdateEnabled, passiveUpdateEnabled, passiveUpdateMode, passiveUpdateMode), listeners);
           }
         }
       }
@@ -1533,9 +1526,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
           IListener[] listeners = getListeners();
           if (listeners != null)
           {
-            fireEvent(
-                new PassiveUpdateEventImpl(passiveUpdateEnabled, passiveUpdateEnabled, oldMode, passiveUpdateMode),
-                listeners);
+            fireEvent(new PassiveUpdateEventImpl(passiveUpdateEnabled, passiveUpdateEnabled, oldMode, passiveUpdateMode), listeners);
           }
         }
       }
@@ -1713,8 +1704,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     /**
      * @author Eike Stepper
      */
-    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent
-        implements GeneratedPackageEmulationEvent
+    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent implements GeneratedPackageEmulationEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -1739,8 +1729,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       private PassiveUpdateMode newMode;
 
-      public PassiveUpdateEventImpl(boolean oldEnabled, boolean newEnabled, PassiveUpdateMode oldMode,
-          PassiveUpdateMode newMode)
+      public PassiveUpdateEventImpl(boolean oldEnabled, boolean newEnabled, PassiveUpdateMode oldMode, PassiveUpdateMode newMode)
       {
         super(OptionsImpl.this);
         this.oldEnabled = oldEnabled;
@@ -1906,10 +1895,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       if (DEBUG)
       {
-        IOUtil.OUT()
-            .println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] "
-                + invalidation.getPreviousTimeStamp() % 10000 + " --> " + invalidation.getTimeStamp() % 10000
-                + "    reorderQueue=" + reorderQueue + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
+        IOUtil.OUT().println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + invalidation.getPreviousTimeStamp() % 10000 + " --> "
+            + invalidation.getTimeStamp() % 10000 + "    reorderQueue=" + reorderQueue + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
       }
 
       scheduleInvalidations();
@@ -2002,8 +1989,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       if (Invalidator.DEBUG)
       {
-        IOUtil.OUT().println(
-            CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + timeStamp % 10000 + "    INVALIDATE");
+        IOUtil.OUT().println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + timeStamp % 10000 + "    INVALIDATE");
       }
 
       try
@@ -2044,8 +2030,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
         for (InternalCDOView view : views)
         {
-          invalidateView(commitInfo, view, sender, oldRevisions, invalidationData.isClearResourcePathCache(),
-              lockChangeInfo);
+          invalidateView(commitInfo, view, sender, oldRevisions, invalidationData.isClearResourcePathCache(), lockChangeInfo);
         }
       }
       catch (RuntimeException ex)
@@ -2142,8 +2127,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
         {
           CDORevisionDelta revisionDelta = (CDORevisionDelta)key;
 
-          InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, revisionDelta,
-              CDORevision.UNCHUNKED, false);
+          InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, revisionDelta, CDORevision.UNCHUNKED, false);
           if (oldRevision != null)
           {
             addOldValuesToDelta(oldRevision, revisionDelta);
@@ -2213,8 +2197,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       revisionManager.addRevision(newRevision);
     }
 
-    private void invalidateView(CDOCommitInfo commitInfo, InternalCDOView view, InternalCDOTransaction sender,
-        Map<CDOID, InternalCDORevision> oldRevisions, boolean clearResourcePathCache, CDOLockChangeInfo lockChangeInfo)
+    private void invalidateView(CDOCommitInfo commitInfo, InternalCDOView view, InternalCDOTransaction sender, Map<CDOID, InternalCDORevision> oldRevisions,
+        boolean clearResourcePathCache, CDOLockChangeInfo lockChangeInfo)
     {
       try
       {
@@ -2268,8 +2252,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
     private Map<CDORevision, CDOPermission> oldPermissions;
 
-    public InvalidationEvent(InternalCDOTransaction sender, CDOCommitInfo commitInfo, byte securityImpact,
-        Map<CDORevision, CDOPermission> oldPermissions)
+    public InvalidationEvent(InternalCDOTransaction sender, CDOCommitInfo commitInfo, byte securityImpact, Map<CDORevision, CDOPermission> oldPermissions)
     {
       super(CDOSessionImpl.this);
       this.sender = sender;
@@ -2343,8 +2326,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     public CDOCommitInfo getMergedCommitInfo()
     {
       CDOBranchPoint mergeSource = getMergeSource();
-      return mergeSource == null ? null
-          : commitInfoManager.getCommitInfo(mergeSource.getBranch(), mergeSource.getTimeStamp(), false);
+      return mergeSource == null ? null : commitInfoManager.getCommitInfo(mergeSource.getBranch(), mergeSource.getTimeStamp(), false);
     }
 
     public boolean isEmpty()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
index 10a8834966..5cc979e828 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
@@ -197,8 +197,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
+  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
   {
     int attempt = 0;
     for (;;)
@@ -269,8 +269,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     int attempt = 0;
     for (;;)
@@ -288,8 +287,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
+      Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -311,8 +310,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
+      Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -659,8 +658,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex,
-      int fromIndex, int toIndex)
+  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex)
   {
     int attempt = 0;
     for (;;)
@@ -676,8 +674,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth)
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     int attempt = 0;
     for (;;)
@@ -726,8 +723,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch,
-      LockType lockType, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
+      throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
@@ -735,8 +732,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   /**
    * @since 4.1
    */
-  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch,
-      LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch, LockType lockType, boolean recursive,
+      long timeout) throws InterruptedException
 
   {
     int attempt = 0;
@@ -753,8 +750,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys,
-      CDOBranch viewedBranch, LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, LockType lockType,
+      boolean recursive, long timeout) throws InterruptedException
   {
     int attempt = 0;
     for (;;)
@@ -770,8 +767,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     int attempt = 0;
     for (;;)
@@ -855,8 +851,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public RefreshSessionResult refresh(long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
+  public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates)
   {
     int attempt = 0;
@@ -879,8 +874,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     throw new UnsupportedOperationException();
   }
 
-  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     int attempt = 0;
     for (;;)
@@ -995,8 +989,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
+  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo)
   {
     throw new UnsupportedOperationException();
   }
@@ -1068,8 +1062,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler,
-      OMMonitor monitor)
+  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor)
   {
     int attempt = 0;
     for (;;)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
index e292fc67da..3882fe8a16 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
@@ -57,8 +57,7 @@ public class CDOHandlingConflictResolver extends CDOMergingConflictResolver impl
     super(merger);
   }
 
-  public CDOHandlingConflictResolver(ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications,
-      ConflictHandler conflictHandler)
+  public CDOHandlingConflictResolver(ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications, ConflictHandler conflictHandler)
   {
     super(resolutionPreference, ensureRemoteNotifications);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
index 6dfaf285b6..b6f5af508c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
@@ -373,8 +373,8 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
     }
   }
 
-  private CDOChangeSetData createChangeSetData(Map<CDOID, CDOObject> newObjects,
-      Map<CDOID, CDORevisionDelta> revisionDeltas, Map<CDOID, CDOObject> detachedObjects)
+  private CDOChangeSetData createChangeSetData(Map<CDOID, CDOObject> newObjects, Map<CDOID, CDORevisionDelta> revisionDeltas,
+      Map<CDOID, CDOObject> detachedObjects)
   {
     List<CDOIDAndVersion> newList = new ArrayList<CDOIDAndVersion>(newObjects.size());
     for (CDOObject object : newObjects.values())
@@ -450,8 +450,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
         }
 
         Map<CDOID, CDOObject> newObjects = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           newObjects.putAll(savepoint.getNewObjects());
 
@@ -519,8 +518,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
 
         // We need to combined the result for all delta in different Savepoint
         Map<CDOID, CDORevisionDelta> allRevisionDeltas = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           for (CDORevisionDelta revisionDelta : savepoint.getRevisionDeltas2().values())
           {
@@ -576,8 +574,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
         }
 
         Map<CDOID, CDOObject> detachedObjects = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           for (Entry<CDOID, CDOObject> entry : savepoint.getDetachedObjects().entrySet())
           {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
index de7f8331a7..a62f2d5427 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
@@ -60,8 +60,7 @@ public class CDOSingleTransactionStrategyImpl implements CDOTransactionStrategy
     InternalCDOSession session = transaction.getSession();
     CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
 
-    CommitTransactionResult result = sessionProtocol.commitTransaction(commitContext,
-        EclipseMonitor.convert(progressMonitor));
+    CommitTransactionResult result = sessionProtocol.commitTransaction(commitContext, EclipseMonitor.convert(progressMonitor));
 
     commitContext.postCommit(result);
 
@@ -109,8 +108,7 @@ public class CDOSingleTransactionStrategyImpl implements CDOTransactionStrategy
     String userID = session.getUserID();
 
     InternalCDOCommitInfoManager commitInfoManager = session.getCommitInfoManager();
-    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-        commitData);
+    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
   }
 
   public void rollback(InternalCDOTransaction transaction, InternalCDOUserSavepoint savepoint)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index a018653509..01992801c8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -559,8 +559,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return merge(source, sourceBase, null, merger);
   }
 
-  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase,
-      CDOMerger merger)
+  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase, CDOMerger merger)
   {
     synchronized (getViewMonitor())
     {
@@ -641,14 +640,14 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Deprecated
-  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData,
-      CDORevisionProvider targetBaseProvider, CDORevisionProvider targetProvider, CDOBranchPoint source)
+  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData, CDORevisionProvider targetBaseProvider,
+      CDORevisionProvider targetProvider, CDOBranchPoint source)
   {
     throw new UnsupportedOperationException();
   }
 
-  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider resultBaseProvider,
-      CDORevisionProvider targetProvider, CDOBranchPoint source, boolean keepVersions) throws ChangeSetOutdatedException
+  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider resultBaseProvider, CDORevisionProvider targetProvider,
+      CDOBranchPoint source, boolean keepVersions) throws ChangeSetOutdatedException
   {
     synchronized (getViewMonitor())
     {
@@ -659,8 +658,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         ApplyChangeSetResult result = new ApplyChangeSetResult();
 
         // Merges from local offline branches may require additional ID mappings: localID -> tempID
-        if (source != null && source.getBranch().isLocal() && getSession().getRepositoryInfo()
-            .getIDGenerationLocation() == CDOCommonRepository.IDGenerationLocation.STORE)
+        if (source != null && source.getBranch().isLocal()
+            && getSession().getRepositoryInfo().getIDGenerationLocation() == CDOCommonRepository.IDGenerationLocation.STORE)
         {
           applyLocalIDMapping(changeSetData, result);
         }
@@ -671,12 +670,11 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         applyNewObjects(changeSetData.getNewObjects(), resultData.getNewObjects());
 
         // Detached objects
-        Set<CDOObject> detachedSet = applyDetachedObjects(changeSetData.getDetachedObjects(),
-            resultData.getDetachedObjects());
+        Set<CDOObject> detachedSet = applyDetachedObjects(changeSetData.getDetachedObjects(), resultData.getDetachedObjects());
 
         // Changed objects
-        Map<CDOID, InternalCDORevision> oldRevisions = applyChangedObjects(changeSetData.getChangedObjects(),
-            resultBaseProvider, targetProvider, keepVersions, resultData.getChangedObjects());
+        Map<CDOID, InternalCDORevision> oldRevisions = applyChangedObjects(changeSetData.getChangedObjects(), resultBaseProvider, targetProvider, keepVersions,
+            resultData.getChangedObjects());
 
         // Delta notifications
         Collection<CDORevisionDelta> notificationDeltas = lastSavepoint.getRevisionDeltas2().values();
@@ -792,9 +790,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return detachedSet;
   }
 
-  private Map<CDOID, InternalCDORevision> applyChangedObjects(List<CDORevisionKey> changedObjects,
-      CDORevisionProvider resultBaseProvider, CDORevisionProvider targetProvider, boolean keepVersions,
-      List<CDORevisionKey> result) throws ChangeSetOutdatedException
+  private Map<CDOID, InternalCDORevision> applyChangedObjects(List<CDORevisionKey> changedObjects, CDORevisionProvider resultBaseProvider,
+      CDORevisionProvider targetProvider, boolean keepVersions, List<CDORevisionKey> result) throws ChangeSetOutdatedException
   {
     Map<CDOID, InternalCDORevision> oldRevisions = CDOIDUtil.createMap();
 
@@ -884,8 +881,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
    * Synchronized through InvalidationRunnable.run()
    */
   @Override
-  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> deltas)
+  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> deltas)
   {
     synchronized (getViewMonitor())
     {
@@ -925,8 +921,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
         try
         {
-          Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> remaining = new HashMap<CDOObject, Pair<CDORevision, CDORevisionDelta>>(
-              conflicts);
+          Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> remaining = new HashMap<CDOObject, Pair<CDORevision, CDORevisionDelta>>(conflicts);
           for (CDOConflictResolver resolver : resolvers)
           {
             if (resolver instanceof CDOConflictResolver2)
@@ -1599,8 +1594,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return info;
   }
 
-  private CDOCommitInfo commitSynced(IProgressMonitor progressMonitor)
-      throws DanglingIntegrityException, CommitException
+  private CDOCommitInfo commitSynced(IProgressMonitor progressMonitor) throws DanglingIntegrityException, CommitException
   {
     synchronized (getViewMonitor())
     {
@@ -1643,8 +1637,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
           {
             // The commit may have succeeded on the server, but after that network problems or timeouts have hit us.
             // Let's see if we can recover...
-            CDOCommitInfo info = session.getSessionProtocol().resetTransaction(getViewID(),
-                commitToken.getCommitNumber());
+            CDOCommitInfo info = session.getSessionProtocol().resetTransaction(getViewID(), commitToken.getCommitNumber());
             if (info != null)
             {
               lastCommitTime = info.getTimeStamp();
@@ -1751,8 +1744,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     Set<InternalCDOObject> newObjects = new HashSet<InternalCDOObject>();
 
     // Start from the last savepoint and come back up to the active
-    for (InternalCDOSavepoint itrSavepoint = lastSavepoint; itrSavepoint != null; itrSavepoint = itrSavepoint
-        .getPreviousSavepoint())
+    for (InternalCDOSavepoint itrSavepoint = lastSavepoint; itrSavepoint != null; itrSavepoint = itrSavepoint.getPreviousSavepoint())
     {
       Set<Object> toBeDetached = new HashSet<Object>();
 
@@ -1953,8 +1945,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
 
     CDOObjectMerger merger = new CDOObjectMerger();
-    for (InternalCDOSavepoint itrSavepoint = firstSavepoint; itrSavepoint != savepoint; itrSavepoint = itrSavepoint
-        .getNextSavepoint())
+    for (InternalCDOSavepoint itrSavepoint = firstSavepoint; itrSavepoint != savepoint; itrSavepoint = itrSavepoint.getNextSavepoint())
     {
       for (CDORevisionDelta delta : itrSavepoint.getRevisionDeltas2().values())
       {
@@ -2094,8 +2085,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         if (lastSavepoint == firstSavepoint && options().isAutoReleaseLocksEnabled())
         {
           CDORepositoryInfo repositoryInfo = getSession().getRepositoryInfo();
-          if (isDurableView() && repositoryInfo.getState() == CDOCommonRepository.State.ONLINE
-              || repositoryInfo.getType() == CDOCommonRepository.Type.MASTER)
+          if (isDurableView() && repositoryInfo.getState() == CDOCommonRepository.State.ONLINE || repositoryInfo.getType() == CDOCommonRepository.Type.MASTER)
           {
             // Unlock all objects
             unlockObjects(null, null);
@@ -2288,8 +2278,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private CDOOriginSizeProvider getOriginSizeProvider(InternalCDOObject object, CDOFeatureDelta featureDelta,
-      InternalCDORevision cleanRevision)
+  private CDOOriginSizeProvider getOriginSizeProvider(InternalCDOObject object, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
   {
     EStructuralFeature feature = featureDelta.getFeature();
     if (feature.isMany())
@@ -2338,8 +2327,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta,
-      InternalCDORevision cleanRevision)
+  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
   {
     synchronized (getViewMonitor())
     {
@@ -2503,8 +2491,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private static List<EPackage> analyzeNewPackages(Collection<EPackage> usedTopLevelPackages,
-      CDOPackageRegistry packageRegistry)
+  private static List<EPackage> analyzeNewPackages(Collection<EPackage> usedTopLevelPackages, CDOPackageRegistry packageRegistry)
   {
     // Determine which of the corresponding EPackages are new
     List<EPackage> newPackages = new ArrayList<EPackage>();
@@ -2586,18 +2573,14 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   {
     InternalCDOSavepoint newSavepoint = createSavepoint(null);
     copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());
-    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(),
-        newSavepoint.getDirtyObjects());
-    copyUncommitted(lastSavepoint.getAllRevisionDeltas(), commitContext.getRevisionDeltas(),
-        newSavepoint.getRevisionDeltas2());
-    copyUncommitted(lastSavepoint.getAllDetachedObjects(), commitContext.getDetachedObjects(),
-        newSavepoint.getDetachedObjects());
+    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(), newSavepoint.getDirtyObjects());
+    copyUncommitted(lastSavepoint.getAllRevisionDeltas(), commitContext.getRevisionDeltas(), newSavepoint.getRevisionDeltas2());
+    copyUncommitted(lastSavepoint.getAllDetachedObjects(), commitContext.getDetachedObjects(), newSavepoint.getDetachedObjects());
     lastSavepoint = newSavepoint;
     firstSavepoint = lastSavepoint;
   }
 
-  private <T> void copyUncommitted(Map<CDOID, T> oldSavepointMap, Map<CDOID, T> commitContextMap,
-      Map<CDOID, T> newSavepointMap)
+  private <T> void copyUncommitted(Map<CDOID, T> oldSavepointMap, Map<CDOID, T> commitContextMap, Map<CDOID, T> newSavepointMap)
   {
     for (Entry<CDOID, T> entry : oldSavepointMap.entrySet())
     {
@@ -2823,8 +2806,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private void importNewRevisions(CDODataInput in, List<InternalCDORevision> revisions, Map<CDOID, CDOID> idMappings)
-      throws IOException
+  private void importNewRevisions(CDODataInput in, List<InternalCDORevision> revisions, Map<CDOID, CDOID> idMappings) throws IOException
   {
     int size = in.readInt();
     for (int i = 0; i < size; i++)
@@ -2962,8 +2944,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, final String name,
-      final boolean exactMatch)
+  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, final String name, final boolean exactMatch)
   {
     if (!isDirty())
     {
@@ -3051,8 +3032,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       return new AbstractCloseableIterator<CDOResourceNode>()
       {
-        private Iterator<CDOResourceNode> addedNodesIterator = finalAddedNodes == null ? null
-            : finalAddedNodes.iterator();
+        private Iterator<CDOResourceNode> addedNodesIterator = finalAddedNodes == null ? null : finalAddedNodes.iterator();
 
         @Override
         protected Object computeNextElement()
@@ -3242,8 +3222,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     if (!isDirty())
     {
@@ -3317,8 +3296,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return AbstractCloseableIterator.emptyCloseable();
   }
 
-  private List<CDOObjectReference> queryXRefsLocal(Set<CDOID> localIDs, Set<CDOID> targetIDs,
-      Set<EReference> relevantReferences)
+  private List<CDOObjectReference> queryXRefsLocal(Set<CDOID> localIDs, Set<CDOID> targetIDs, Set<EReference> relevantReferences)
   {
     List<CDOObjectReference> refs = null;
 
@@ -3344,8 +3322,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       for (EReference reference : revision.getClassInfo().getAllPersistentReferences())
       {
-        if (!reference.isContainer() && !reference.isContainment()
-            && (relevantReferences == null || relevantReferences.contains(reference)))
+        if (!reference.isContainer() && !reference.isContainment() && (relevantReferences == null || relevantReferences.contains(reference)))
         {
           if (reference.isMany())
           {
@@ -3370,8 +3347,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return refs;
   }
 
-  private List<CDOObjectReference> addXRefLocal(List<CDOObjectReference> refs, Set<CDOID> targetIDs, CDOObject object,
-      EReference reference, int index, Object value)
+  private List<CDOObjectReference> addXRefLocal(List<CDOObjectReference> refs, Set<CDOID> targetIDs, CDOObject object, EReference reference, int index,
+      Object value)
   {
     if (value != null)
     {
@@ -3726,8 +3703,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
   private EContentsEList.FeatureIterator<EObject> getChangeableCrossReferences(EObject object)
   {
-    EClassImpl.FeatureSubsetSupplier features = (EClassImpl.FeatureSubsetSupplier)object.eClass()
-        .getEAllStructuralFeatures();
+    EClassImpl.FeatureSubsetSupplier features = (EClassImpl.FeatureSubsetSupplier)object.eClass().getEAllStructuralFeatures();
 
     EStructuralFeature[] crossReferences = features.crossReferences();
     if (crossReferences != null)
@@ -3754,8 +3730,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       if (!changeableReferences.isEmpty())
       {
-        EStructuralFeature[] collectedStructuralFeatures = changeableReferences
-            .toArray(new EStructuralFeature[changeableReferences.size()]);
+        EStructuralFeature[] collectedStructuralFeatures = changeableReferences.toArray(new EStructuralFeature[changeableReferences.size()]);
         return new EContentsEList.ResolvingFeatureIteratorImpl<EObject>(object, collectedStructuralFeatures);
       }
     }
@@ -3935,8 +3910,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected InternalCDOLockState createUpdatedLockStateForNewObject(CDOObject object, IRWLockManager.LockType lockType,
-      boolean on)
+  protected InternalCDOLockState createUpdatedLockStateForNewObject(CDOObject object, IRWLockManager.LockType lockType, boolean on)
   {
     CheckUtil.checkState(FSMUtil.isNew(object), "Object is not in NEW state");
     CheckUtil.checkArg(lockType, "lockType");
@@ -4048,8 +4022,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     SyntheticCDORevision[] synthetics = new SyntheticCDORevision[1];
     InternalCDORevisionManager revisionManager = transaction.getSession().getRevisionManager();
 
-    InternalCDORevision result = revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED,
-        CDORevision.DEPTH_NONE, true, synthetics);
+    InternalCDORevision result = revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
 
     if (result != null)
     {
@@ -4598,8 +4571,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
       CDOBranchPoint mergeSource = getCommitMergeSource();
 
       InternalCDOCommitInfoManager commitInfoManager = session.getCommitInfoManager();
-      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-          commitData);
+      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
     }
 
     private CDOLockChangeInfo makeUnlockChangeInfo(CommitTransactionResult result)
@@ -5275,8 +5247,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     /**
      * @author Eike Stepper
      */
-    private final class AutoReleaseLocksExemptionsEventImpl extends OptionsEvent
-        implements AutoReleaseLocksExemptionsEvent
+    private final class AutoReleaseLocksExemptionsEventImpl extends OptionsEvent implements AutoReleaseLocksExemptionsEvent
     {
       private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
index a693fd8322..dfe3ad28cd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
@@ -35,8 +35,7 @@ import java.util.List;
  */
 public class CDOUndoDetectorImpl implements CDOUndoDetector
 {
-  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision,
-      CDOFeatureDelta featureDelta)
+  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision, CDOFeatureDelta featureDelta)
   {
     EStructuralFeature feature = featureDelta.getFeature();
     InternalCDORevision cleanInternalRevision = (InternalCDORevision)cleanRevision;
@@ -102,8 +101,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
     throw new UnsupportedOperationException();
   }
 
-  protected boolean detectUndoContainer(CDOTransaction transaction, InternalCDORevision cleanRevision,
-      InternalCDORevision currentRevision)
+  protected boolean detectUndoContainer(CDOTransaction transaction, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
   {
     CDOID cleanResourceID = cleanRevision.getResourceID();
     CDOID currentResourceID = currentRevision.getResourceID();
@@ -131,8 +129,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
     return true;
   }
 
-  protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision,
-      InternalCDORevision currentRevision)
+  protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
   {
     return feature.isMany() && !cleanRevision.isUnchunked() && !currentRevision.isUnchunked();
   }
@@ -166,8 +163,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
    */
   public static final class NoFeatures implements CDOUndoDetector
   {
-    public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision,
-        CDOFeatureDelta featureDelta)
+    public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision, CDOFeatureDelta featureDelta)
     {
       return false;
     }
@@ -179,8 +175,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
   public static final class SingleValuedFeatures extends CDOUndoDetectorImpl
   {
     @Override
-    protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision,
-        InternalCDORevision currentRevision)
+    protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
     {
       if (feature.isMany())
       {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
index faebec4b36..a56f0afaf3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
@@ -71,8 +71,7 @@ public abstract class CDOUserSavepointImpl implements InternalCDOUserSavepoint
   public boolean isValid()
   {
     InternalCDOUserSavepoint lastSavepoint = getTransaction().getLastSavepoint();
-    for (InternalCDOUserSavepoint savepoint = lastSavepoint; savepoint != null; savepoint = savepoint
-        .getPreviousSavepoint())
+    for (InternalCDOUserSavepoint savepoint = lastSavepoint; savepoint != null; savepoint = savepoint.getPreviousSavepoint())
     {
       if (savepoint == this)
       {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index c13d84c78f..d98216f59f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -206,8 +206,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
     return activeContexts.get(transaction);
   }
 
-  private void send(Collection<InternalCDOXACommitContext> xaContexts, final IProgressMonitor progressMonitor)
-      throws InterruptedException, ExecutionException
+  private void send(Collection<InternalCDOXACommitContext> xaContexts, final IProgressMonitor progressMonitor) throws InterruptedException, ExecutionException
   {
     int xaContextSize = xaContexts.size();
     if (progressMonitor != null)
@@ -233,8 +232,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
 
       do
       {
-        for (Iterator<Entry<Future<Object>, InternalCDOXACommitContext>> it = futures.entrySet().iterator(); it
-            .hasNext();)
+        for (Iterator<Entry<Future<Object>, InternalCDOXACommitContext>> it = futures.entrySet().iterator(); it.hasNext();)
         {
           Entry<Future<Object>, InternalCDOXACommitContext> entry = it.next();
           Future<Object> future = entry.getKey();
@@ -359,8 +357,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
 
       try
       {
-        send(activeContexts.values(),
-            progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase) : null);
+        send(activeContexts.values(), progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase) : null);
       }
       catch (InterruptedException ex1)
       {
@@ -602,8 +599,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       }
     }
 
-    public CDOCommitInfo commit(InternalCDOTransaction transactionCommit, IProgressMonitor progressMonitor)
-        throws Exception
+    public CDOCommitInfo commit(InternalCDOTransaction transactionCommit, IProgressMonitor progressMonitor) throws Exception
     {
       checkAccess();
       return xaTransaction.commit(progressMonitor);
@@ -669,8 +665,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       if (xaContext.getTransaction().isDirty())
       {
         CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase2(xaContext,
-            EclipseMonitor.convert(progressMonitor));
+        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase2(xaContext, EclipseMonitor.convert(progressMonitor));
         check_result(result);
       }
 
@@ -701,8 +696,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       if (xaContext.getTransaction().isDirty())
       {
         CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase3(xaContext,
-            EclipseMonitor.convert(progressMonitor));
+        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase3(xaContext, EclipseMonitor.convert(progressMonitor));
         check_result(result);
       }
 
@@ -732,8 +726,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
     public void handle(InternalCDOXACommitContext xaContext, IProgressMonitor progressMonitor) throws Exception
     {
       CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-      CommitTransactionResult result = sessionProtocol.commitXATransactionCancel(xaContext,
-          EclipseMonitor.convert(progressMonitor));
+      CommitTransactionResult result = sessionProtocol.commitXATransactionCancel(xaContext, EclipseMonitor.convert(progressMonitor));
       check_result(result);
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
index 7934b97b23..8e896aacf8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
@@ -226,8 +226,7 @@ public class CommitIntegrityCheck
     // else: Transient object -- ignore
   }
 
-  private void checkFeatureDelta(CDOFeatureDelta featureDelta, boolean hasPersistentOpposite, CDOObject dirtyObject)
-      throws CommitIntegrityException
+  private void checkFeatureDelta(CDOFeatureDelta featureDelta, boolean hasPersistentOpposite, CDOObject dirtyObject) throws CommitIntegrityException
   {
     EReference ref = (EReference)featureDelta.getFeature();
     boolean containmentOrWithOpposite = ref.isContainment() || hasPersistentOpposite;
@@ -398,8 +397,7 @@ public class CommitIntegrityCheck
           boolean hasPersistentOpposite = classInfo.hasPersistentOpposite(reference);
           for (Object refTarget : list)
           {
-            checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite,
-                msgFrag);
+            checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite, msgFrag);
           }
         }
       }
@@ -409,15 +407,14 @@ public class CommitIntegrityCheck
         if (refTarget != null)
         {
           boolean hasPersistentOpposite = classInfo.hasPersistentOpposite(reference);
-          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite,
-              msgFrag);
+          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite, msgFrag);
         }
       }
     }
   }
 
-  private void checkBidiRefTargetOrNewNonBidiTargetIncluded(CDOObject referencer, EReference eRef, Object refTarget,
-      boolean hasPersistentOpposite, String msgFrag) throws CommitIntegrityException
+  private void checkBidiRefTargetOrNewNonBidiTargetIncluded(CDOObject referencer, EReference eRef, Object refTarget, boolean hasPersistentOpposite,
+      String msgFrag) throws CommitIntegrityException
   {
     if (hasPersistentOpposite)
     {
@@ -468,8 +465,7 @@ public class CommitIntegrityCheck
     }
   }
 
-  private void checkBidiRefTargetIncluded(Object refTarget, CDOObject referencer, String refName, String msgFrag)
-      throws CommitIntegrityException
+  private void checkBidiRefTargetIncluded(Object refTarget, CDOObject referencer, String refName, String msgFrag) throws CommitIntegrityException
   {
     CheckUtil.checkArg(refTarget, "refTarget");
     CDOID refTargetID = null;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
index 5832ffa868..cd4bc2e40a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
@@ -108,8 +108,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleEStructuralFeatures(List<EStructuralFeature> structuralFeatures, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleEStructuralFeatures(List<EStructuralFeature> structuralFeatures, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (structuralFeatures != null)
     {
@@ -146,8 +145,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleEGenericTypes(EList<EGenericType> genericTypes, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleEGenericTypes(EList<EGenericType> genericTypes, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (genericTypes != null)
     {
@@ -171,8 +169,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleETypeParameters(EList<ETypeParameter> typeParameters, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleETypeParameters(EList<ETypeParameter> typeParameters, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (typeParameters != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 3cbb733145..c502eaae3d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -143,8 +143,7 @@ import java.util.concurrent.locks.Lock;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory>
-    implements InternalCDOView, DoNotDescend
+public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory> implements InternalCDOView, DoNotDescend
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, AbstractCDOView.class);
 
@@ -1436,8 +1435,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public final CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name,
-      boolean exactMatch)
+  public final CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name, boolean exactMatch)
   {
     synchronized (getViewMonitor())
     {
@@ -1454,8 +1452,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, String name,
-      boolean exactMatch)
+  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, String name, boolean exactMatch)
   {
     CDOQuery resourceQuery = createResourcesQuery(folder, name, exactMatch);
     return resourceQuery.getResultAsync(CDOResourceNode.class);
@@ -1589,8 +1586,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public final CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  public final CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     synchronized (getViewMonitor())
     {
@@ -1607,8 +1603,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     CDOQuery query = createXRefsQuery(true, null, targetObjects, sourceReferences);
     if (query.getQueryString() != null)
@@ -1619,8 +1614,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     return AbstractCloseableIterator.emptyCloseable();
   }
 
-  protected final CDOQuery createXRefsQuery(boolean excludeNewObjects, Set<CDOID> targetIDs,
-      Set<CDOObject> targetObjects, EReference... sourceReferences)
+  protected final CDOQuery createXRefsQuery(boolean excludeNewObjects, Set<CDOID> targetIDs, Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     StringBuilder builder = null;
 
@@ -1637,8 +1631,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       {
         if (excludeNewObjects)
         {
-          throw new IllegalArgumentException(
-              "Cross referencing for uncommitted new objects is not supported: " + target);
+          throw new IllegalArgumentException("Cross referencing for uncommitted new objects is not supported: " + target);
         }
       }
       else
@@ -1871,8 +1864,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
         {
           if (!view.getSession().getRepositoryInfo().getUUID().equals(getSession().getRepositoryInfo().getUUID()))
           {
-            throw new IllegalArgumentException(
-                MessageFormat.format(Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
+            throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
           }
 
           CDOID id = object.cdoID();
@@ -2028,8 +2020,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       String oldName = existingResource.getName();
       existingResource.setName(oldName + ".renamed");
 
-      OM.LOG.warn("URI clash: resource being instantiated had same URI as a resource already present "
-          + "locally; local resource was renamed from " + oldName + " to " + existingResource.getName());
+      OM.LOG.warn("URI clash: resource being instantiated had same URI as a resource already present " + "locally; local resource was renamed from " + oldName
+          + " to " + existingResource.getName());
     }
 
     return getResource(path, true);
@@ -2194,8 +2186,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
           }
           else
           {
-            InternalCDOObject object = (InternalCDOObject)EcoreUtil
-                .getAdapter(((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
+            InternalCDOObject object = (InternalCDOObject)EcoreUtil.getAdapter(((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
             if (object != null)
             {
               CDOID id = getID(object, onlyPersistedID);
@@ -2248,8 +2239,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
             return object.cdoID();
           }
 
-          throw new IllegalArgumentException(
-              "Object " + object + " is managed by a view with different target: " + view);
+          throw new IllegalArgumentException("Object " + object + " is managed by a view with different target: " + view);
         }
 
         return null;
@@ -2549,8 +2539,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       Set<CDOObject> detachedObjects, //
       Map<CDOID, InternalCDORevision> oldRevisions)
   {
-    boolean hasConflictResolvers = this instanceof CDOTransaction
-        && ((CDOTransaction)this).options().getConflictResolvers().length != 0;
+    boolean hasConflictResolvers = this instanceof CDOTransaction && ((CDOTransaction)this).options().getConflictResolvers().length != 0;
     Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts = null;
 
     // Bug 363355: manage detached objects before changed objects to avoid issue on eContainer
@@ -2647,8 +2636,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
   /**
    * Overridden by {@link CDOTransactionImpl#handleConflicts(long, Map, List)}.
    */
-  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> deltas)
+  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> deltas)
   {
     // Do nothing
   }
@@ -2940,8 +2928,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
 
     if (eClass == EresourcePackage.Literals.CDO_RESOURCE_FOLDER)
     {
-      CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta
-          .getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES);
+      CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta.getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES);
       if (canHaveResourcePathImpact(featureDelta))
       {
         return true;
@@ -2952,8 +2939,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     {
       if (rootResourceID == delta.getID())
       {
-        CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta
-            .getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS);
+        CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta.getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS);
         if (canHaveResourcePathImpact(featureDelta))
         {
           return true;
@@ -3110,8 +3096,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       switch (eventType)
       {
       case Notification.ADD:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getNewValue(),
-            IContainerDelta.Kind.ADDED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getNewValue(), IContainerDelta.Kind.ADDED);
         break;
 
       case Notification.ADD_MANY:
@@ -3119,8 +3104,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
         break;
 
       case Notification.REMOVE:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getOldValue(),
-            IContainerDelta.Kind.REMOVED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getOldValue(), IContainerDelta.Kind.REMOVED);
         break;
 
       case Notification.REMOVE_MANY:
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
index 08ed21e644..5f41b1c41e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
@@ -115,8 +115,7 @@ public class CDOObjectHistoryImpl extends CDOCommitHistoryImpl implements CDOObj
             break;
           }
 
-          CDORevision revision = revisionManager.getRevision(object.cdoID(), base, CDORevision.UNCHUNKED,
-              CDORevision.DEPTH_NONE, true);
+          CDORevision revision = revisionManager.getRevision(object.cdoID(), base, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
           if (revision == null)
           {
             // Reached branch where the object does not exist anymore.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
index 9c5910875a..0847b3ef59 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
@@ -39,8 +39,8 @@ public class CDORevisionPrefetchingPolicyImpl implements CDORevisionPrefetchingP
     this.chunkSize = chunkSize;
   }
 
-  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject eObject,
-      EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID)
+  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject eObject, EStructuralFeature feature, CDOList list,
+      int accessIndex, CDOID accessID)
   {
     if (chunkSize > 1 && !revisionManager.containsRevision(accessID, branchPoint))
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
index 75fe71646e..8f1c1c56c3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
@@ -242,8 +242,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * Phase 1: TRANSIENT --> PREPARED
    */
-  private void prepare(InternalCDOObject object,
-      Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
+  private void prepare(InternalCDOObject object, Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
   {
     if (TRACER.isEnabled())
     {
@@ -802,11 +801,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @see AttachTransition
    * @author Eike Stepper
    */
-  private final class PrepareTransition implements
-      ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
+  private final class PrepareTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
     {
       InternalCDOTransaction transaction = transactionAndContents.getElement1();
       List<InternalCDOObject> contents = transactionAndContents.getElement2();
@@ -876,9 +873,8 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
 
         if (packageObject instanceof EPackage && packageObject != eClass.getEPackage())
         {
-          throw new IllegalStateException(MessageFormat.format(
-              "Global EPackage {0} for EClass {1} is different from EPackage found in CDOPackageRegistry", packageURI,
-              eClass));
+          throw new IllegalStateException(
+              MessageFormat.format("Global EPackage {0} for EClass {1} is different from EPackage found in CDOPackageRegistry", packageURI, eClass));
         }
       }
     }
@@ -916,8 +912,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    *
    * @author Caspar De Groot
    */
-  private final class ReattachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
+  private final class ReattachTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, InternalCDOTransaction transaction)
     {
@@ -1016,11 +1011,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private static final class DetachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
+  private static final class DetachTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        List<InternalCDOObject> objectsToDetach)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, List<InternalCDOObject> objectsToDetach)
     {
       InternalCDOTransaction transaction = (InternalCDOTransaction)object.cdoView();
       objectsToDetach.add(object);
@@ -1046,8 +1039,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  final private class CommitTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
+  final private class CommitTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
   {
     public CommitTransition(boolean useDeltas)
     {
@@ -1081,8 +1073,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private final class RollbackTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
+  private final class RollbackTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, InternalCDOTransaction transaction)
     {
@@ -1104,11 +1095,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private static abstract class AbstractWriteTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
+  private static abstract class AbstractWriteTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        FeatureDeltaAndResult featureDeltaAndResult)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, FeatureDeltaAndResult featureDeltaAndResult)
     {
       InternalCDORevision revision = object.cdoRevision();
       if (!revision.isWritable())
@@ -1122,8 +1111,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
       featureDeltaAndResult.setResult(result);
     }
 
-    protected abstract Object execute(InternalCDOObject object, InternalCDOTransaction transaction,
-        CDOFeatureDelta featureDelta, InternalCDORevision revision);
+    protected abstract Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision);
   }
 
   /**
@@ -1132,8 +1120,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   private final class WriteNewTransition extends AbstractWriteTransition
   {
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision revision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision)
     {
       Object result = null;
       if (featureDelta != null)
@@ -1159,8 +1146,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
     }
 
     @Override
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        FeatureDeltaAndResult featureDeltaAndResult)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, FeatureDeltaAndResult featureDeltaAndResult)
     {
       if (load)
       {
@@ -1171,8 +1157,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
     }
 
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision cleanRevision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
     {
       InternalCDORevision revision = cleanRevision.copy();
 
@@ -1206,8 +1191,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   private final class RewriteTransition extends AbstractWriteTransition
   {
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision revision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision)
     {
       Map<InternalCDOObject, InternalCDORevision> cleanRevisions = transaction.getCleanRevisions();
       InternalCDORevision cleanRevision = cleanRevisions.get(object);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
index 93541dd8da..69d1df257e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
@@ -514,8 +514,7 @@ public final class CDOStoreImpl implements CDOStore
   /**
    * @category WRITE
    */
-  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer,
-      int newContainerFeatureID)
+  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer, int newContainerFeatureID)
   {
     synchronized (view.getViewMonitor())
     {
@@ -822,8 +821,7 @@ public final class CDOStoreImpl implements CDOStore
   /**
    * @since 2.0
    */
-  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index,
-      Object value)
+  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index, Object value)
   {
     if (value != null)
     {
@@ -890,8 +888,7 @@ public final class CDOStoreImpl implements CDOStore
     return value;
   }
 
-  private Object convertIDToObject(InternalCDOView view, EObject eObject, EStructuralFeature feature, int index,
-      Object value)
+  private Object convertIDToObject(InternalCDOView view, EObject eObject, EStructuralFeature feature, int index, Object value)
   {
     try
     {
@@ -933,8 +930,7 @@ public final class CDOStoreImpl implements CDOStore
     return object;
   }
 
-  private Object getOldListValue(InternalEObject eObject, InternalCDOObject cdoObject, EStructuralFeature feature,
-      int index)
+  private Object getOldListValue(InternalEObject eObject, InternalCDOObject cdoObject, EStructuralFeature feature, int index)
   {
     if (!feature.isMany())
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 99a21df448..8815ab077e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -273,8 +273,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
         }
 
         CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
-        sessionProtocol.switchTarget(viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects,
-            EclipseMonitor.convert(progressMonitor));
+        sessionProtocol.switchTarget(viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects, EclipseMonitor.convert(progressMonitor));
 
         basicSetBranchPoint(branchPoint);
 
@@ -340,14 +339,12 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout) throws InterruptedException
   {
     lockObjects(objects, lockType, timeout, false);
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive) throws InterruptedException
   {
     checkActive();
     checkState(getTimeStamp() == UNSPECIFIED_DATE, "Locking not supported for historial views");
@@ -417,15 +414,14 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
           {
             if (!session.options().isPassiveUpdateEnabled())
             {
-              throw new AssertionError(
-                  "Lock result requires client to wait, but client does not have passiveUpdates enabled");
+              throw new AssertionError("Lock result requires client to wait, but client does not have passiveUpdates enabled");
             }
 
             long requiredTimestamp = result.getRequiredTimestamp();
             if (!waitForUpdate(requiredTimestamp, 10000L))
             {
-              throw new AssertionError("Lock result requires client to wait for commit " + requiredTimestamp
-                  + ", but client did not receive invalidations after " + lastUpdateTime);
+              throw new AssertionError(
+                  "Lock result requires client to wait for commit " + requiredTimestamp + ", but client did not receive invalidations after " + lastUpdateTime);
             }
 
             InternalCDOSession session = this.session;
@@ -439,8 +435,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
               CDORevision revision = object.cdoRevision(true);
               if (!requiredKey.equals(revision))
               {
-                InternalCDORevision requiredRevision = revisionManager.getRevisionByVersion(id, requiredKey,
-                    CDORevision.UNCHUNKED, true);
+                InternalCDORevision requiredRevision = revisionManager.getRevisionByVersion(id, requiredKey, CDORevision.UNCHUNKED, true);
                 InternalCDORevisionDelta revisionDelta = requiredRevision.compare(revision);
                 CDOStateMachine.INSTANCE.invalidate(object, revisionDelta);
               }
@@ -533,8 +528,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * Notifies other views of lock changes performed in this view
    */
-  protected void notifyOtherViewsAboutLockChanges(Operation op, LockType type, long timestamp,
-      CDOLockState[] lockStates)
+  protected void notifyOtherViewsAboutLockChanges(Operation op, LockType type, long timestamp, CDOLockState[] lockStates)
   {
     if (lockStates.length > 0)
     {
@@ -548,8 +542,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     }
   }
 
-  protected final CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp,
-      CDOLockState[] newLockStates)
+  protected final CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp, CDOLockState[] newLockStates)
   {
     return CDOLockUtil.createLockChangeInfo(timestamp, this, getBranch(), op, type, newLockStates);
   }
@@ -1148,16 +1141,15 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
   {
     throw new UnsupportedOperationException();
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async,
-      boolean clearResourcePathCache)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async, boolean clearResourcePathCache)
   {
     throw new UnsupportedOperationException();
   }
@@ -1235,8 +1227,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
         handleConflicts(lastUpdateTime, conflicts, deltas);
 
         sendInvalidationNotifications(revisionDeltas.keySet(), detachedObjects);
-        fireInvalidationEvent(lastUpdateTime, Collections.unmodifiableMap(revisionDeltas),
-            Collections.unmodifiableSet(detachedObjects));
+        fireInvalidationEvent(lastUpdateTime, Collections.unmodifiableMap(revisionDeltas), Collections.unmodifiableSet(detachedObjects));
 
         // Then send the notifications. The deltas could have been modified by the conflict resolvers.
         if (!deltas.isEmpty() || !detachedObjects.isEmpty())
@@ -1319,8 +1310,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  private void fireInvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas,
-      Set<CDOObject> detachedObjects)
+  private void fireInvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas, Set<CDOObject> detachedObjects)
   {
     if (!revisionDeltas.isEmpty() || !detachedObjects.isEmpty())
     {
@@ -1335,8 +1325,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  public void sendDeltaNotifications(Collection<CDORevisionDelta> deltas, Set<CDOObject> detachedObjects,
-      Map<CDOID, InternalCDORevision> oldRevisions)
+  public void sendDeltaNotifications(Collection<CDORevisionDelta> deltas, Set<CDOObject> detachedObjects, Map<CDOID, InternalCDORevision> oldRevisions)
   {
     synchronized (getViewMonitor())
     {
@@ -2147,16 +2136,14 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
             CDOUnit containingUnit = getOpenUnit(root);
             if (containingUnit != null)
             {
-              throw new CDOException(
-                  "Attempt to nest the new unit " + root + " in the existing unit " + containingUnit);
+              throw new CDOException("Attempt to nest the new unit " + root + " in the existing unit " + containingUnit);
             }
 
             for (CDOUnit existingUnit : unitPerRoot.values())
             {
               if (EcoreUtil.isAncestor(root, existingUnit.getRoot()))
               {
-                throw new CDOException(
-                    "Attempt to nest the existing unit " + existingUnit + " in the new unit " + root);
+                throw new CDOException("Attempt to nest the existing unit " + existingUnit + " in the new unit " + root);
               }
             }
           }
@@ -2192,8 +2179,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
           }
 
           CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
-          boolean success = sessionProtocol.requestUnit(viewID, rootID, opcode, revisionHandler,
-              EclipseMonitor.safe(monitor));
+          boolean success = sessionProtocol.requestUnit(viewID, rootID, opcode, revisionHandler, EclipseMonitor.safe(monitor));
 
           if (success)
           {
@@ -2822,8 +2808,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
 
     private Set<CDOObject> detachedObjects;
 
-    public InvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas,
-        Set<CDOObject> detachedObjects)
+    public InvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas, Set<CDOObject> detachedObjects)
     {
       this.timeStamp = timeStamp;
       this.revisionDeltas = revisionDeltas;
@@ -2859,8 +2844,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     @Override
     protected String formatAdditionalParameters()
     {
-      return "timeStamp=" + timeStamp + ", revisionDeltas=" + revisionDeltas + ", detachedObjects=" + detachedObjects
-          + "]";
+      return "timeStamp=" + timeStamp + ", revisionDeltas=" + revisionDeltas + ", detachedObjects=" + detachedObjects + "]";
     }
   }
 
@@ -2987,8 +2971,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
 
     private LockStatePrefetcher lockStatePrefetcher;
 
-    private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy = CDOUtil
-        .createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
+    private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy = CDOUtil.createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
 
     private CDOFeatureAnalyzer featureAnalyzer = CDOFeatureAnalyzer.NOOP;
 
@@ -3665,8 +3648,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     /**
      * @author Eike Stepper
      */
-    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent
-        implements ChangeSubscriptionPoliciesEvent
+    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent implements ChangeSubscriptionPoliciesEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -3771,8 +3753,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     /**
      * @author Eike Stepper
      */
-    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent
-        implements RevisionPrefetchingPolicyEvent
+    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent implements RevisionPrefetchingPolicyEvent
     {
       private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
index 6664ed73ee..f43cbce1e6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
@@ -115,8 +115,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
     return null;
   }
 
-  private InternalCDOView provideView(URI uri, ResourceSet resourceSet, CDOViewSet viewSet,
-      CDOViewProvider viewProvider)
+  private InternalCDOView provideView(URI uri, ResourceSet resourceSet, CDOViewSet viewSet, CDOViewProvider viewProvider)
   {
     if (viewSet != null && viewProvider instanceof CDOViewProvider2)
     {
@@ -312,8 +311,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
 
       if (StringUtil.isEmpty(element.getAttribute("class"))) //$NON-NLS-1$
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
       }
     }
 
@@ -369,8 +367,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
       String value = element.getAttribute("regex");
       if (StringUtil.isEmpty(value))
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
       }
 
       return value;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
index 259984a544..7444528b4d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
@@ -97,8 +97,7 @@ public class ViewProperties extends Properties<CDOView>
     });
 
     add(new Property<CDOView>("rootResourcePermission", //$NON-NLS-1$
-        "Root Resource Permission", "The permission the current user has for the root resource of this view.",
-        CATEGORY_VIEW)
+        "Root Resource Permission", "The permission the current user has for the root resource of this view.", CATEGORY_VIEW)
     {
       @Override
       protected Object eval(CDOView view)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
index fc2c6a667f..3542aa09ee 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
@@ -88,8 +88,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes
   /**
    * @since 4.0
    */
-  public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> allRemoteDeltas)
+  public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
   {
     Map<CDOID, CDORevisionDelta> localDeltas = getTransaction().getRevisionDeltas();
     for (Entry<CDOObject, Pair<CDORevision, CDORevisionDelta>> entry : conflicts.entrySet())
@@ -117,8 +116,8 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes
    *
    * @since 4.0
    */
-  protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta,
-      CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas)
+  protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta,
+      List<CDORevisionDelta> allRemoteDeltas)
   {
     throw new UnsupportedOperationException("Must be overridden");
   }
@@ -169,8 +168,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes
     }
 
     @Override
-    public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-        List<CDORevisionDelta> allRemoteDeltas)
+    public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
     {
       CDOChangeSetData remoteChangeSet = createChangeSet(allRemoteDeltas);
 
@@ -193,8 +191,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes
         changedObjects.add(delta);
       }
 
-      CDOChangeSetData remoteChangeSet = CDORevisionUtil.createChangeSetData(newObjects, changedObjects,
-          detachedObjects);
+      CDOChangeSetData remoteChangeSet = CDORevisionUtil.createChangeSetData(newObjects, changedObjects, detachedObjects);
       return remoteChangeSet;
     }
   }
@@ -277,14 +274,13 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes
     }
 
     @Override
-    protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta,
-        CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas)
+    protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta,
+        List<CDORevisionDelta> allRemoteDeltas)
     {
       resolveConflict(conflict, localDelta, collector.getDeltas(conflict));
     }
 
-    protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta,
-        List<CDORevisionDelta> remoteDeltas);
+    protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas);
 
     /**
      * If the meaning of this type isn't clear, there really should be more of a description here...
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
index cb5029795b..ea16adbb14 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
@@ -91,8 +91,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
    * @param ensureRemoteNotifications boolean to disable the use of {@link CDOAdapterPolicy} to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when {@link PassiveUpdateMode} is enabled and in {@link PassiveUpdateMode#CHANGES} or {@link PassiveUpdateMode#ADDITIONS}
    * @since 4.4
    */
-  public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference,
-      boolean ensureRemoteNotifications)
+  public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications)
   {
     this(new DefaultCDOMerger.PerFeature.ManyValued(resolutionPreference), ensureRemoteNotifications);
   }
@@ -212,8 +211,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
     conflict = false;
   }
 
-  private void updateTransactionWithResult(Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet,
-      CDOChangeSetData result)
+  private void updateTransactionWithResult(Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet, CDOChangeSetData result)
   {
     InternalCDOTransaction transaction = (InternalCDOTransaction)getTransaction();
     InternalCDOSavepoint savepoint = transaction.getLastSavepoint();
@@ -240,8 +238,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
         // Adjust local object
         object.cdoInternalSetRevision(newLocalRevision);
 
-        final InternalCDORevision newCleanRevision = computeNewCleanRevision(remoteDeltas, id, newVersion,
-            cleanRevision);
+        final InternalCDORevision newCleanRevision = computeNewCleanRevision(remoteDeltas, id, newVersion, cleanRevision);
 
         // Compute new local delta
         InternalCDORevisionDelta newLocalDelta = newLocalRevision.compare(newCleanRevision);
@@ -284,8 +281,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
     return newVersion;
   }
 
-  private InternalCDORevision computeNewLocalRevision(InternalCDORevisionDelta resultDelta, int newVersion,
-      InternalCDORevision cleanRevision)
+  private InternalCDORevision computeNewLocalRevision(InternalCDORevisionDelta resultDelta, int newVersion, InternalCDORevision cleanRevision)
   {
     InternalCDORevision newLocalRevision = cleanRevision.copy();
     newLocalRevision.setVersion(newVersion);
@@ -293,8 +289,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
     return newLocalRevision;
   }
 
-  private InternalCDORevision computeNewCleanRevision(Map<CDOID, CDORevisionDelta> remoteDeltas, CDOID id,
-      int newVersion, InternalCDORevision cleanRevision)
+  private InternalCDORevision computeNewCleanRevision(Map<CDOID, CDORevisionDelta> remoteDeltas, CDOID id, int newVersion, InternalCDORevision cleanRevision)
   {
     CDORevisionDelta remoteDelta = remoteDeltas.get(id);
     if (remoteDelta != null)
@@ -308,8 +303,7 @@ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolv
     return cleanRevision;
   }
 
-  private void updateObjects(final InternalCDORevision newCleanRevision, InternalCDORevisionDelta newLocalDelta,
-      final ObjectsMapUpdater detachedObjectsUpdater)
+  private void updateObjects(final InternalCDORevision newCleanRevision, InternalCDORevisionDelta newLocalDelta, final ObjectsMapUpdater detachedObjectsUpdater)
   {
     newLocalDelta.accept(new CDOFeatureDeltaVisitorImpl()
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOPermissionUpdater.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOPermissionUpdater.java
index 79eb10b3a8..8813793465 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOPermissionUpdater.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOPermissionUpdater.java
@@ -28,8 +28,7 @@ public interface CDOPermissionUpdater
 {
   public static final CDOPermissionUpdater SERVER = new CDOPermissionUpdater()
   {
-    public Map<CDORevision, CDOPermission> updatePermissions(InternalCDOSession session,
-        Set<InternalCDORevision> revisions)
+    public Map<CDORevision, CDOPermission> updatePermissions(InternalCDOSession session, Set<InternalCDORevision> revisions)
     {
       InternalCDORevision[] revisionArray = revisions.toArray(new InternalCDORevision[revisions.size()]);
       CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
@@ -37,6 +36,5 @@ public interface CDOPermissionUpdater
     }
   };
 
-  public Map<CDORevision, CDOPermission> updatePermissions(InternalCDOSession session,
-      Set<InternalCDORevision> revisions);
+  public Map<CDORevision, CDOPermission> updatePermissions(InternalCDOSession session, Set<InternalCDORevision> revisions);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index ec22fb4519..e6359bc297 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -112,8 +112,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
   /**
    * @since 3.0
    */
-  public RefreshSessionResult refresh(long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
+  public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates);
 
   /**
@@ -126,8 +125,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @param toIndex
    *          Load objects at the client to toIndex (inclusive)
    */
-  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex,
-      int fromIndex, int toIndex);
+  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex);
 
   /**
    * @since 4.0
@@ -142,8 +140,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
   /**
    * @since 4.0
    */
-  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor);
+  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor);
 
   public void closeView(int viewID);
 
@@ -161,20 +159,20 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @deprecated Not called anymore. Use {@link #lockObjects2(List, int, CDOBranch, LockType, boolean, long)} instead.
    */
   @Deprecated
-  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch,
-      LockType lockType, long timeout) throws InterruptedException;
+  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
+      throws InterruptedException;
 
   /**
    * @since 4.1
    */
-  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch,
-      LockType lockType, boolean recursive, long timeout) throws InterruptedException;
+  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch, LockType lockType, boolean recursive,
+      long timeout) throws InterruptedException;
 
   /**
    * @since 4.1
    */
-  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys,
-      CDOBranch viewedBranch, LockType lockType, boolean recursive, long timeout) throws InterruptedException;
+  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, LockType lockType,
+      boolean recursive, long timeout) throws InterruptedException;
 
   /**
    * @since 3.0
@@ -186,14 +184,12 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
   /**
    * @since 4.1
    */
-  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive);
+  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType, boolean recursive);
 
   /**
    * @since 4.1
    */
-  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive);
+  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive);
 
   /**
    * @since 3.0
@@ -220,8 +216,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @deprecated Not called anymore. Use {@link #commitTransaction(InternalCDOCommitContext, OMMonitor)} instead.
    */
   @Deprecated
-  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor);
+  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
+      Collection<CDOLob<?>> lobs, OMMonitor monitor);
 
   /**
    * @since 4.1
@@ -233,8 +229,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @deprecated Not called anymore. Use {@link #commitDelegation(InternalCDOCommitContext, OMMonitor)} instead.
    */
   @Deprecated
-  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor);
+  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
+      Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor);
 
   /**
    * @since 4.1
@@ -298,8 +294,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @deprecated As of 4.6 use {@link #loadMergeData2(CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo, CDORevisionAvailabilityInfo)}.
    */
   @Deprecated
-  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo);
+  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo);
 
   /**
    * @since 4.6
@@ -356,8 +352,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
   /**
    * @since 4.5
    */
-  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler,
-      OMMonitor monitor);
+  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor);
 
   /**
    * If the meaning of this type isn't clear, there really should be more of a description here...
@@ -455,10 +450,9 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
      * @deprecated as of 4.4 use {@link #OpenSessionResult(CDODataInput, int)}.
      */
     @Deprecated
-    public OpenSessionResult(int sessionID, String userID, String repositoryUUID,
-        CDOCommonRepository.Type repositoryType, CDOCommonRepository.State repositoryState, String storeType,
-        Set<CDOID.ObjectType> objectIDTypes, long repositoryCreationTime, long lastUpdateTime, CDOID rootResourceID,
-        boolean repositorySupportingAudits, boolean repositorySupportingBranches, boolean repositorySerializingCommits,
+    public OpenSessionResult(int sessionID, String userID, String repositoryUUID, CDOCommonRepository.Type repositoryType,
+        CDOCommonRepository.State repositoryState, String storeType, Set<CDOID.ObjectType> objectIDTypes, long repositoryCreationTime, long lastUpdateTime,
+        CDOID rootResourceID, boolean repositorySupportingAudits, boolean repositorySupportingBranches, boolean repositorySerializingCommits,
         boolean repositoryEnsuringReferentialIntegrity, IDGenerationLocation repositoryIDGenerationLocation)
     {
       throw new UnsupportedOperationException();
@@ -934,8 +928,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
     public String toString()
     {
       return MessageFormat.format("RepositoryTime[requested={0}, indicated={1}, responded={2}, confirmed={3}]", //$NON-NLS-1$
-          CDOCommonUtil.formatTimeStamp(requested), CDOCommonUtil.formatTimeStamp(indicated),
-          CDOCommonUtil.formatTimeStamp(responded), CDOCommonUtil.formatTimeStamp(confirmed));
+          CDOCommonUtil.formatTimeStamp(requested), CDOCommonUtil.formatTimeStamp(indicated), CDOCommonUtil.formatTimeStamp(responded),
+          CDOCommonUtil.formatTimeStamp(confirmed));
     }
   }
 
@@ -1020,8 +1014,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
      * @deprecated As of 4.2
      */
     @Deprecated
-    public CommitTransactionResult(CDOIDProvider idProvider, String rollbackMessage, CDOBranchPoint branchPoint,
-        long previousTimeStamp, List<CDOObjectReference> xRefs)
+    public CommitTransactionResult(CDOIDProvider idProvider, String rollbackMessage, CDOBranchPoint branchPoint, long previousTimeStamp,
+        List<CDOObjectReference> xRefs)
     {
       throw new UnsupportedOperationException();
     }
@@ -1031,9 +1025,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
      * @deprecated As of 4.3
      */
     @Deprecated
-    public CommitTransactionResult(CDOIDProvider idProvider, byte rollbackReason, String rollbackMessage,
-        CDOBranchPoint branchPoint, long previousTimeStamp, List<CDOObjectReference> xRefs,
-        boolean clearResourcePathCache)
+    public CommitTransactionResult(CDOIDProvider idProvider, byte rollbackReason, String rollbackMessage, CDOBranchPoint branchPoint, long previousTimeStamp,
+        List<CDOObjectReference> xRefs, boolean clearResourcePathCache)
     {
       throw new UnsupportedOperationException();
     }
@@ -1053,8 +1046,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
      * @deprecated As of 4.3
      */
     @Deprecated
-    public CommitTransactionResult(CDOIDProvider idProvider, CDOBranchPoint branchPoint, long previousTimeStamp,
-        boolean clearResourcePathCache)
+    public CommitTransactionResult(CDOIDProvider idProvider, CDOBranchPoint branchPoint, long previousTimeStamp, boolean clearResourcePathCache)
     {
       throw new UnsupportedOperationException();
     }
@@ -1325,8 +1317,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
     private CDOLockState[] newLockStates;
 
     @Deprecated
-    public LockObjectsResult(boolean successful, boolean timedOut, boolean waitForUpdate, long requiredTimestamp,
-        CDORevisionKey[] staleRevisions)
+    public LockObjectsResult(boolean successful, boolean timedOut, boolean waitForUpdate, long requiredTimestamp, CDORevisionKey[] staleRevisions)
     {
       throw new AssertionError("Deprecated");
     }
@@ -1334,8 +1325,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
     /**
      * @since 4.1
      */
-    public LockObjectsResult(boolean successful, boolean timedOut, boolean waitForUpdate, long requiredTimestamp,
-        CDORevisionKey[] staleRevisions, CDOLockState[] newLockStates, long timestamp)
+    public LockObjectsResult(boolean successful, boolean timedOut, boolean waitForUpdate, long requiredTimestamp, CDORevisionKey[] staleRevisions,
+        CDOLockState[] newLockStates, long timestamp)
     {
       this.successful = successful;
       this.timedOut = timedOut;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOStore.java
index e9dd51f29b..645979b02c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOStore.java
@@ -47,8 +47,7 @@ public interface CDOStore extends EStore
   /**
    * @since 2.0
    */
-  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer,
-      int newContainerFeatureID);
+  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer, int newContainerFeatureID);
 
   public int getContainingFeatureID(InternalEObject eObject);
 
@@ -70,6 +69,5 @@ public interface CDOStore extends EStore
   /**
    * @since 2.0
    */
-  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index,
-      Object value);
+  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index, Object value);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
index 773d3bc340..769540adc6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
@@ -358,8 +358,7 @@ public class DefaultCDOMerger implements CDOMerger
     }
     else if (data != null)
     {
-      throw new IllegalArgumentException(
-          "Must be a CDORevision, a CDORevisionDelta, a CDOID, a Conflict or null: " + data);
+      throw new IllegalArgumentException("Must be a CDORevision, a CDORevisionDelta, a CDOID, a Conflict or null: " + data);
     }
     else
     {
@@ -574,8 +573,7 @@ public class DefaultCDOMerger implements CDOMerger
                 throw new UnsupportedOperationException();
 
               case NONE:
-                conflict = new ChangedInSourceAndTargetConflict(new CDORevisionDeltaImpl(targetDelta, false),
-                    new CDORevisionDeltaImpl(sourceDelta, false));
+                conflict = new ChangedInSourceAndTargetConflict(new CDORevisionDeltaImpl(targetDelta, false), new CDORevisionDeltaImpl(sourceDelta, false));
                 break;
 
               default:
@@ -636,8 +634,7 @@ public class DefaultCDOMerger implements CDOMerger
     /**
      * @return the result feature delta, or <code>null</code> to indicate an unresolved conflict.
      */
-    protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta,
-        CDOFeatureDelta sourceFeatureDelta)
+    protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
     {
       EStructuralFeature feature = targetFeatureDelta.getFeature();
       if (feature.isMany())
@@ -651,8 +648,8 @@ public class DefaultCDOMerger implements CDOMerger
     /**
      * @return the result feature delta, or <code>null</code> to indicate an unresolved conflict.
      */
-    protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature,
-        CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
+    protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta,
+        CDOFeatureDelta sourceFeatureDelta)
     {
       return null;
     }
@@ -660,8 +657,8 @@ public class DefaultCDOMerger implements CDOMerger
     /**
      * @return the result feature delta, or <code>null</code> to indicate an unresolved conflict.
      */
-    protected CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature,
-        CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
+    protected CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta,
+        CDOFeatureDelta sourceFeatureDelta)
     {
       if (targetFeatureDelta.isStructurallyEqual(sourceFeatureDelta))
       {
@@ -699,8 +696,8 @@ public class DefaultCDOMerger implements CDOMerger
       }
 
       @Override
-      protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature,
-          CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
+      protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta,
+          CDOFeatureDelta sourceFeatureDelta)
       {
         if (targetFeatureDelta instanceof CDOListFeatureDelta && sourceFeatureDelta instanceof CDOListFeatureDelta)
         {
@@ -712,8 +709,8 @@ public class DefaultCDOMerger implements CDOMerger
           initWorkLists(originSize, ancestorList, listPerSide);
 
           // Apply list changes to source and target work lists
-          PerSide<List<CDOFeatureDelta>> changesPerSide = new PerSide<List<CDOFeatureDelta>>(
-              copyListChanges(sourceFeatureDelta), copyListChanges(targetFeatureDelta));
+          PerSide<List<CDOFeatureDelta>> changesPerSide = new PerSide<List<CDOFeatureDelta>>(copyListChanges(sourceFeatureDelta),
+              copyListChanges(targetFeatureDelta));
           Map<Object, List<Element>> additions = new HashMap<Object, List<Element>>();
           Map<CDOFeatureDelta, Element> allElements = new HashMap<CDOFeatureDelta, Element>();
 
@@ -724,10 +721,8 @@ public class DefaultCDOMerger implements CDOMerger
           CDOListFeatureDelta result = new CDOListFeatureDeltaImpl(feature, originSize);
           List<CDOFeatureDelta> resultChanges = result.getListChanges();
 
-          pickChangesIntoResult(Side.SOURCE, feature, ancestorList, changesPerSide, allElements, additions,
-              resultChanges);
-          pickChangesIntoResult(Side.TARGET, feature, ancestorList, changesPerSide, allElements, additions,
-              resultChanges);
+          pickChangesIntoResult(Side.SOURCE, feature, ancestorList, changesPerSide, allElements, additions, resultChanges);
+          pickChangesIntoResult(Side.TARGET, feature, ancestorList, changesPerSide, allElements, additions, resultChanges);
 
           return result;
         }
@@ -735,8 +730,7 @@ public class DefaultCDOMerger implements CDOMerger
         return super.changedInSourceAndTargetManyValued(feature, targetFeatureDelta, sourceFeatureDelta);
       }
 
-      private void initWorkLists(int originSize, BasicEList<Element> ancestorList,
-          PerSide<BasicEList<Element>> listPerSide)
+      private void initWorkLists(int originSize, BasicEList<Element> ancestorList, PerSide<BasicEList<Element>> listPerSide)
       {
         BasicEList<Element> sourceList = new BasicEList<Element>(originSize);
         BasicEList<Element> targetList = new BasicEList<Element>(originSize);
@@ -787,9 +781,8 @@ public class DefaultCDOMerger implements CDOMerger
         return expandedDeltas;
       }
 
-      private void applyChangesToWorkList(Side side, PerSide<BasicEList<Element>> listPerSide,
-          PerSide<List<CDOFeatureDelta>> changesPerSide, Map<CDOFeatureDelta, Element> allElements,
-          Map<Object, List<Element>> additions)
+      private void applyChangesToWorkList(Side side, PerSide<BasicEList<Element>> listPerSide, PerSide<List<CDOFeatureDelta>> changesPerSide,
+          Map<CDOFeatureDelta, Element> allElements, Map<Object, List<Element>> additions)
       {
         BasicEList<Element> list = listPerSide.get(side);
         List<CDOFeatureDelta> changes = changesPerSide.get(side);
@@ -874,9 +867,8 @@ public class DefaultCDOMerger implements CDOMerger
         additionsList.add(element);
       }
 
-      private void pickChangesIntoResult(Side side, EStructuralFeature feature, BasicEList<Element> ancestorList,
-          PerSide<List<CDOFeatureDelta>> changesPerSide, Map<CDOFeatureDelta, Element> allElements,
-          Map<Object, List<Element>> additions, List<CDOFeatureDelta> result)
+      private void pickChangesIntoResult(Side side, EStructuralFeature feature, BasicEList<Element> ancestorList, PerSide<List<CDOFeatureDelta>> changesPerSide,
+          Map<CDOFeatureDelta, Element> allElements, Map<Object, List<Element>> additions, List<CDOFeatureDelta> result)
       {
         List<CDOFeatureDelta> changes = changesPerSide.get(side);
         for (CDOFeatureDelta change : changes)
@@ -1096,8 +1088,7 @@ public class DefaultCDOMerger implements CDOMerger
         }
       }
 
-      private static void adjustAfterMove(List<CDOFeatureDelta> list, int oldPosition, int newPosition,
-          CDOFeatureDelta deltaToRemove)
+      private static void adjustAfterMove(List<CDOFeatureDelta> list, int oldPosition, int newPosition, CDOFeatureDelta deltaToRemove)
       {
         for (Iterator<CDOFeatureDelta> it = list.iterator(); it.hasNext();)
         {
@@ -1226,29 +1217,25 @@ public class DefaultCDOMerger implements CDOMerger
       }
 
       @Deprecated
-      protected void handleListDelta(List<CDOFeatureDelta> resultList, List<CDOFeatureDelta> listToHandle,
-          List<CDOFeatureDelta> listToAdjust)
+      protected void handleListDelta(List<CDOFeatureDelta> resultList, List<CDOFeatureDelta> listToHandle, List<CDOFeatureDelta> listToAdjust)
       {
         throw new UnsupportedOperationException();
       }
 
       @Deprecated
-      protected boolean handleListDeltaAdd(List<CDOFeatureDelta> resultList, CDOAddFeatureDelta addDelta,
-          List<CDOFeatureDelta> listToAdjust)
+      protected boolean handleListDeltaAdd(List<CDOFeatureDelta> resultList, CDOAddFeatureDelta addDelta, List<CDOFeatureDelta> listToAdjust)
       {
         throw new UnsupportedOperationException();
       }
 
       @Deprecated
-      protected boolean handleListDeltaRemove(List<CDOFeatureDelta> resultList, CDORemoveFeatureDelta removeDelta,
-          List<CDOFeatureDelta> listToAdjust)
+      protected boolean handleListDeltaRemove(List<CDOFeatureDelta> resultList, CDORemoveFeatureDelta removeDelta, List<CDOFeatureDelta> listToAdjust)
       {
         throw new UnsupportedOperationException();
       }
 
       @Deprecated
-      protected boolean handleListDeltaMove(List<CDOFeatureDelta> resultList, CDOMoveFeatureDelta moveDelta,
-          List<CDOFeatureDelta> listToAdjust)
+      protected boolean handleListDeltaMove(List<CDOFeatureDelta> resultList, CDOMoveFeatureDelta moveDelta, List<CDOFeatureDelta> listToAdjust)
       {
         throw new UnsupportedOperationException();
       }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
index fb1b8682b5..16deb67593 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
@@ -56,8 +56,7 @@ import java.util.Set;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface InternalCDOSession
-    extends CDOSession, PackageProcessor, PackageLoader, RevisionLocker, CDORevisionUnchunker, ILifecycle
+public interface InternalCDOSession extends CDOSession, PackageProcessor, PackageLoader, RevisionLocker, CDORevisionUnchunker, ILifecycle
 {
   public CDOSessionProtocol getSessionProtocol();
 
@@ -260,8 +259,8 @@ public interface InternalCDOSession
    * @deprecated As of 4.6 use {@link #invalidate(InvalidationData)}.
    */
   @Deprecated
-  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache,
-      byte securityImpact, Map<CDOID, CDOPermission> newPermissions);
+  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache, byte securityImpact,
+      Map<CDOID, CDOPermission> newPermissions);
 
   /**
    * @since 4.6
@@ -271,8 +270,8 @@ public interface InternalCDOSession
   /**
    * @since 3.0
    */
-  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch,
-      List<InternalCDOView> branchViews, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions);
+  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch, List<InternalCDOView> branchViews,
+      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions);
 
   /**
    * @since 4.0
@@ -316,14 +315,12 @@ public interface InternalCDOSession
   /**
    * @since 4.2
    */
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase,
-      boolean computeChangeSets);
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, boolean computeChangeSets);
 
   /**
    * @since 4.6
    */
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase,
-      CDOBranchPoint sourceBase, boolean computeChangeSets);
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase, CDOBranchPoint sourceBase, boolean computeChangeSets);
 
   /**
    * @author Eike Stepper
@@ -508,23 +505,19 @@ public interface InternalCDOSession
      * @deprecated As of 4.6 use {@link #MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)}.
      */
     @Deprecated
-    public MergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase,
-        CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-        CDORevisionAvailabilityInfo sourceBaseInfo, CDORevisionAvailabilityInfo targetBaseInfo, Set<CDOID> ids,
+    public MergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase, CDORevisionAvailabilityInfo targetInfo,
+        CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo sourceBaseInfo, CDORevisionAvailabilityInfo targetBaseInfo, Set<CDOID> ids,
         CDOChangeSet targetChanges, CDOChangeSet sourceChanges)
     {
-      this(target, targetInfo, targetBase, targetBaseInfo, ids, targetChanges, source, sourceInfo, sourceBase,
-          sourceBaseInfo, ids, sourceChanges, null);
+      this(target, targetInfo, targetBase, targetBaseInfo, ids, targetChanges, source, sourceInfo, sourceBase, sourceBaseInfo, ids, sourceChanges, null);
     }
 
     /**
      * @since 4.6
      */
-    public MergeData(CDOBranchPoint target, CDORevisionAvailabilityInfo targetInfo, CDOBranchPoint targetBase,
-        CDORevisionAvailabilityInfo targetBaseInfo, Set<CDOID> targetIDs, CDOChangeSet targetChanges,
-        CDOBranchPoint source, CDORevisionAvailabilityInfo sourceInfo, CDOBranchPoint sourceBase,
-        CDORevisionAvailabilityInfo sourceBaseInfo, Set<CDOID> sourceIDs, CDOChangeSet sourceChanges,
-        CDOBranchPoint resultBase)
+    public MergeData(CDOBranchPoint target, CDORevisionAvailabilityInfo targetInfo, CDOBranchPoint targetBase, CDORevisionAvailabilityInfo targetBaseInfo,
+        Set<CDOID> targetIDs, CDOChangeSet targetChanges, CDOBranchPoint source, CDORevisionAvailabilityInfo sourceInfo, CDOBranchPoint sourceBase,
+        CDORevisionAvailabilityInfo sourceBaseInfo, Set<CDOID> sourceIDs, CDOChangeSet sourceChanges, CDOBranchPoint resultBase)
     {
       this.target = target;
       this.targetInfo = targetInfo;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
index f93d04df3f..268ccc5d1f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
@@ -132,8 +132,7 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT
   /**
    * @since 4.3
    */
-  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta,
-      InternalCDORevision cleanRevision);
+  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision);
 
   public void registerRevisionDelta(CDORevisionDelta revisionDelta);
 
@@ -159,8 +158,8 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT
    *             {@link #applyChangeSet(CDOChangeSetData, CDORevisionProvider, CDORevisionProvider, CDOBranchPoint, boolean)}
    */
   @Deprecated
-  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData,
-      CDORevisionProvider targetBaseProvider, CDORevisionProvider targetProvider, CDOBranchPoint source);
+  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData, CDORevisionProvider targetBaseProvider,
+      CDORevisionProvider targetProvider, CDOBranchPoint source);
 
   /**
    * @param source
@@ -169,9 +168,8 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT
    *          a {@link CDOBranch#isLocal() local} branch.
    * @since 4.1
    */
-  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider targetBaseProvider,
-      CDORevisionProvider targetProvider, CDOBranchPoint source, boolean keepVersions)
-      throws ChangeSetOutdatedException;
+  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider targetBaseProvider, CDORevisionProvider targetProvider,
+      CDOBranchPoint source, boolean keepVersions) throws ChangeSetOutdatedException;
 
   /**
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOView.java
index 3c4dc5c838..d4aba27539 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOView.java
@@ -110,17 +110,16 @@ public interface InternalCDOView extends CDOView, CDOIDProvider, ILifecycle
    * @deprecated As of 4.2. use {@link #invalidate(CDOBranch, long, List, List, Map, boolean, boolean)}
    */
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async);
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async);
 
   /**
    * @since 4.2
    * @deprecated As of 4.6. use {@link #invalidate(ViewInvalidationData)}
    */
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async,
-      boolean clearResourcePathCache);
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async, boolean clearResourcePathCache);
 
   /**
    * @since 4.6
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java
index 16e13e8d1f..f305d3faf2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOXATransaction.java
@@ -118,8 +118,7 @@ public interface InternalCDOXATransaction extends CDOXATransaction, InternalCDOU
         }
       }
 
-      public abstract void handle(InternalCDOXACommitContext xaContext, IProgressMonitor progressMonitor)
-          throws Exception;
+      public abstract void handle(InternalCDOXACommitContext xaContext, IProgressMonitor progressMonitor) throws Exception;
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
index fa0796a354..d1229f36c9 100644
--- a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.common
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator
 Bundle-ClassPath: .
@@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.buddies.common;version="4.0.400",
- org.eclipse.net4j.buddies.internal.common;version="4.0.400";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.buddies.internal.common.bundle;version="4.0.400";x-internal:=true,
- org.eclipse.net4j.buddies.internal.common.protocol;version="4.0.400";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
- org.eclipse.net4j.buddies.spi.common;version="4.0.400"
+Export-Package: org.eclipse.net4j.buddies.common;version="4.0.500",
+ org.eclipse.net4j.buddies.internal.common;version="4.0.500";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.buddies.internal.common.bundle;version="4.0.500";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.common.protocol;version="4.0.500";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
+ org.eclipse.net4j.buddies.spi.common;version="4.0.500"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
index 93b9279999..5a6ef0bb28 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
@@ -61,8 +61,7 @@ public class CollaborationContainer extends Lifecycle implements ICollaborationC
     IListener[] listeners = getListeners();
     if (listeners != null)
     {
-      fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.ADDED),
-          listeners);
+      fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.ADDED), listeners);
     }
 
     collaboration.addListener(this);
@@ -82,8 +81,7 @@ public class CollaborationContainer extends Lifecycle implements ICollaborationC
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.REMOVED),
-            listeners);
+        fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.REMOVED), listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
index 89396d4713..adeb085f9b 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
@@ -84,8 +84,7 @@ public class Membership extends Lifecycle implements IMembership
     if (obj instanceof IMembershipKey)
     {
       IMembershipKey key = (IMembershipKey)obj;
-      return ObjectUtil.equals(getBuddy(), key.getBuddy())
-          && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
+      return ObjectUtil.equals(getBuddy(), key.getBuddy()) && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
     }
 
     return false;
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
index 0241c7c62a..72a8bc5edc 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
@@ -69,8 +69,7 @@ public class MembershipContainer extends Lifecycle implements IMembershipContain
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED),
-            listeners);
+        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED), listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
index 7b0dab3966..741e71ec15 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
@@ -51,8 +51,7 @@ public class MembershipKey implements IMembershipKey
     if (obj instanceof IMembershipKey)
     {
       IMembershipKey key = (IMembershipKey)obj;
-      return ObjectUtil.equals(getBuddy(), key.getBuddy())
-          && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
+      return ObjectUtil.equals(getBuddy(), key.getBuddy()) && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
     }
 
     return false;
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
index 44c160db23..cf8f162843 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
@@ -27,8 +27,7 @@ public class CollaborationLeftIndication extends Indication
 
   private ICollaborationProvider collaborationProvider;
 
-  public CollaborationLeftIndication(SignalProtocol<?> protocol, IBuddyProvider buddyProvider,
-      ICollaborationProvider collaborationProvider)
+  public CollaborationLeftIndication(SignalProtocol<?> protocol, IBuddyProvider buddyProvider, ICollaborationProvider collaborationProvider)
   {
     super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_LEFT);
     this.buddyProvider = buddyProvider;
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
index 83d26b2cca..a6b07c1d8b 100644
--- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator
 Bundle-ClassPath: .
@@ -10,9 +10,9 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.messages;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.server;version="4.0.500"
+Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.messages;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.server;version="4.0.600"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
index e163b7c51a..da04842a4c 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
@@ -32,8 +32,7 @@ public class CollaborationInitiatedNotification extends Request
   /**
    * @since 2.0
    */
-  public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID,
-      Collection<IBuddy> buddies, String[] facilityTypes)
+  public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID, Collection<IBuddy> buddies, String[] facilityTypes)
   {
     super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_INITIATED);
     this.collaborationID = collaborationID;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index e091c17d7b..a8cf94bf32 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -190,15 +190,14 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
       else if (obj instanceof IBuddyCollaboration)
       {
         final IBuddyCollaboration collaboration = (IBuddyCollaboration)obj;
-        manager.add(
-            new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
-            {
-              @Override
-              protected void safeRun() throws Exception
-              {
-                collaboration.leave();
-              }
-            });
+        manager.add(new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
+        {
+          @Override
+          protected void safeRun() throws Exception
+          {
+            collaboration.leave();
+          }
+        });
       }
     }
   }
diff --git a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.core.prefs
index 636347cee7..2f5e1ed59b 100644
--- a/plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.core.prefs
@@ -378,7 +378,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
index d8a9215c4c..e16e1124dd 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.jdbc;singleton:=true
-Bundle-Version: 4.3.100.qualifier
+Bundle-Version: 4.3.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.net4j.db.jdbc;version="4.3.100"
+Export-Package: org.eclipse.net4j.db.jdbc;version="4.3.200"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.net4j.util;bundle-version="[3.4.0,4.0.0)"
diff --git a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
index 7861d94cba..3704625231 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
+++ b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
@@ -49,11 +49,9 @@ public abstract class DelegatingConnection implements Connection
 
   public abstract PreparedStatement prepareStatement(String sql) throws SQLException;
 
-  public abstract PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-      throws SQLException;
+  public abstract PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException;
 
-  public abstract PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException;
+  public abstract PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException;
 
   public abstract PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException;
 
@@ -208,14 +206,12 @@ public abstract class DelegatingConnection implements Connection
     delegate.releaseSavepoint(savepoint);
   }
 
-  public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-      throws SQLException
+  public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
   {
     return delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
-  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException
+  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
   {
     return delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
   }
@@ -381,15 +377,13 @@ public abstract class DelegatingConnection implements Connection
     }
 
     @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-        throws SQLException
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
     {
       return getDelegate().prepareStatement(sql, resultSetType, resultSetConcurrency);
     }
 
     @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-        int resultSetHoldability) throws SQLException
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
     {
       return getDelegate().prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
     }
diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
index bb9bcb9331..b256c5c3d9 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 4.2.300.qualifier
+Bundle-Version: 4.2.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=
 Import-Package: com.mysql.jdbc;version="[5.0.0,6.0.0)";resolution:=optional;x-installation:=greedy,
  com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)";resolution:=optional;x-installation:=greedy,
  org.osgi.framework;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.2.300";x-internal:=true,
- org.eclipse.net4j.db.mysql;version="4.2.300"
+Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.2.400";x-internal:=true,
+ org.eclipse.net4j.db.mysql;version="4.2.400"
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
index 7961df91fc..4f633aed09 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
@@ -155,8 +155,7 @@ public class MYSQLAdapter extends DBAdapter
   @Override
   public String sqlRenameField(IDBField field, String oldName)
   {
-    return "ALTER TABLE " + field.getTable() + " CHANGE COLUMN " + oldName + " " + field + " "
-        + createFieldDefinition(field);
+    return "ALTER TABLE " + field.getTable() + " CHANGE COLUMN " + oldName + " " + field + " " + createFieldDefinition(field);
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
index dbb49e1892..a6cad20407 100644
--- a/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.oracle;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,6 +14,6 @@ Import-Package: oracle.jdbc;resolution:=optional;x-installation:=greedy,
  oracle.jdbc.driver;resolution:=optional;x-installation:=greedy,
  oracle.jdbc.pool;resolution:=optional;x-installation:=greedy,
  org.osgi.framework;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.net4j.db.oracle;version="1.1.200",
- org.eclipse.net4j.db.oracle.internal.bundle;version="1.1.200";x-internal:=true
+Export-Package: org.eclipse.net4j.db.oracle;version="1.1.300",
+ org.eclipse.net4j.db.oracle.internal.bundle;version="1.1.300";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java b/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
index c83ace9eb3..871a923228 100644
--- a/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
+++ b/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
@@ -175,8 +175,7 @@ public class OracleAdapter extends DBAdapter
   }
 
   @Override
-  protected ResultSet readTables(Connection connection, DatabaseMetaData metaData, String schemaName)
-      throws SQLException
+  protected ResultSet readTables(Connection connection, DatabaseMetaData metaData, String schemaName) throws SQLException
   {
     if (schemaName == null && connection instanceof IUserAware)
     {
diff --git a/plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs
index 41eeb49ad0..cd08a64774 100644
--- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs
@@ -400,7 +400,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
index 7d44c9bbc3..f4478cf5c7 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
@@ -42,15 +42,13 @@ public enum DBType
   BOOLEAN(16)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       return writeValueBoolean(out, resultSet, column, canBeNull);
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       return readValueBoolean(in, statement, column, canBeNull, getCode());
     }
@@ -59,15 +57,13 @@ public enum DBType
   BIT(-7)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       return writeValueBoolean(out, resultSet, column, canBeNull);
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       return readValueBoolean(in, statement, column, canBeNull, getCode());
     }
@@ -76,8 +72,7 @@ public enum DBType
   TINYINT(-6)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       byte value = resultSet.getByte(column);
       if (canBeNull)
@@ -96,8 +91,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -114,8 +108,7 @@ public enum DBType
   SMALLINT(5)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       short value = resultSet.getShort(column);
       if (canBeNull)
@@ -134,8 +127,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -152,8 +144,7 @@ public enum DBType
   INTEGER(4)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       int value = resultSet.getInt(column);
       if (canBeNull)
@@ -172,8 +163,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -190,8 +180,7 @@ public enum DBType
   BIGINT(-5)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       long value = resultSet.getLong(column);
       if (canBeNull)
@@ -210,8 +199,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -228,8 +216,7 @@ public enum DBType
   FLOAT(6)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       float value = resultSet.getFloat(column);
       if (canBeNull)
@@ -248,8 +235,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -266,8 +252,7 @@ public enum DBType
   REAL(7)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       float value = resultSet.getFloat(column);
       if (canBeNull)
@@ -286,8 +271,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -304,8 +288,7 @@ public enum DBType
   DOUBLE(8)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       double value = resultSet.getDouble(column);
       if (canBeNull)
@@ -324,8 +307,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -342,8 +324,7 @@ public enum DBType
   NUMERIC(2)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       throw new UnsupportedOperationException("SQL NULL has to be considered");
       // BigDecimal value = resultSet.getBigDecimal(column);
@@ -356,8 +337,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       throw new UnsupportedOperationException("SQL NULL has to be considered");
       // byte[] bytes = in.readByteArray();
@@ -373,8 +353,7 @@ public enum DBType
   DECIMAL(3)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       throw new UnsupportedOperationException("SQL NULL has to be considered");
       // BigDecimal value = resultSet.getBigDecimal(column);
@@ -387,8 +366,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       throw new UnsupportedOperationException("SQL NULL has to be considered");
       // byte[] bytes = in.readByteArray();
@@ -403,8 +381,7 @@ public enum DBType
   CHAR(1)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = resultSet.getString(column);
       out.writeString(value);
@@ -412,8 +389,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = in.readString();
       statement.setString(column, value);
@@ -424,8 +400,7 @@ public enum DBType
   VARCHAR(12)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = resultSet.getString(column);
       out.writeString(value);
@@ -433,8 +408,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = in.readString();
       statement.setString(column, value);
@@ -445,8 +419,7 @@ public enum DBType
   LONGVARCHAR(-1, "LONG VARCHAR") //$NON-NLS-1$
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = resultSet.getString(column);
       out.writeString(value);
@@ -454,8 +427,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       String value = in.readString();
       statement.setString(column, value);
@@ -466,8 +438,7 @@ public enum DBType
   CLOB(2005)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       Reader value = null;
 
@@ -494,8 +465,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(final ExtendedDataInput in, PreparedStatement statement, int column,
-        boolean canBeNull) throws SQLException, IOException
+    public Object readValueWithResult(final ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -514,8 +484,7 @@ public enum DBType
   DATE(91)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       java.sql.Date value = resultSet.getDate(column);
       if (canBeNull)
@@ -535,8 +504,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -553,8 +521,7 @@ public enum DBType
   TIME(92)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       java.sql.Time value = resultSet.getTime(column);
       if (canBeNull)
@@ -574,8 +541,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -592,8 +558,7 @@ public enum DBType
   TIMESTAMP(93)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       java.sql.Timestamp value = resultSet.getTimestamp(column);
       if (canBeNull)
@@ -613,8 +578,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -634,8 +598,7 @@ public enum DBType
   BINARY(-2)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       byte[] value = resultSet.getBytes(column);
       if (canBeNull)
@@ -655,8 +618,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -673,8 +635,7 @@ public enum DBType
   VARBINARY(-3)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       byte[] value = resultSet.getBytes(column);
       if (canBeNull)
@@ -694,8 +655,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -712,8 +672,7 @@ public enum DBType
   LONGVARBINARY(-4, "LONG VARBINARY") //$NON-NLS-1$
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       byte[] value = resultSet.getBytes(column);
       if (canBeNull)
@@ -733,8 +692,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -751,8 +709,7 @@ public enum DBType
   BLOB(2004)
   {
     @Override
-    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-        throws SQLException, IOException
+    public Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
     {
       InputStream value = null;
 
@@ -779,8 +736,7 @@ public enum DBType
     }
 
     @Override
-    public Object readValueWithResult(final ExtendedDataInput in, PreparedStatement statement, int column,
-        boolean canBeNull) throws SQLException, IOException
+    public Object readValueWithResult(final ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
     {
       if (canBeNull && !in.readBoolean())
       {
@@ -836,8 +792,7 @@ public enum DBType
   /**
    * @since 3.0
    */
-  public void writeValue(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-      throws SQLException, IOException
+  public void writeValue(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
   {
     writeValueWithResult(out, resultSet, column, canBeNull);
   }
@@ -845,14 +800,12 @@ public enum DBType
   /**
    * @since 4.1
    */
-  public abstract Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column,
-      boolean canBeNull) throws SQLException, IOException;
+  public abstract Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException;
 
   /**
    * @since 3.0
    */
-  public void readValue(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull)
-      throws SQLException, IOException
+  public void readValue(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException
   {
     readValueWithResult(in, statement, column, canBeNull);
   }
@@ -860,11 +813,9 @@ public enum DBType
   /**
    * @since 4.1
    */
-  public abstract Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column,
-      boolean canBeNull) throws SQLException, IOException;
+  public abstract Object readValueWithResult(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull) throws SQLException, IOException;
 
-  private static Boolean writeValueBoolean(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-      throws SQLException, IOException
+  private static Boolean writeValueBoolean(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull) throws SQLException, IOException
   {
     boolean value = resultSet.getBoolean(column);
     if (canBeNull)
@@ -883,8 +834,8 @@ public enum DBType
     return value;
   }
 
-  private static Boolean readValueBoolean(ExtendedDataInput in, PreparedStatement statement, int column,
-      boolean canBeNull, int sqlType) throws IOException, SQLException
+  private static Boolean readValueBoolean(ExtendedDataInput in, PreparedStatement statement, int column, boolean canBeNull, int sqlType)
+      throws IOException, SQLException
   {
     if (canBeNull)
     {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index c6667dacdd..48482aa10a 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -62,8 +62,7 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static final int MAX_BATCH_SIZE = Integer
-      .parseInt(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.db.MAX_BATCH_SIZE", "2000"));
+  public static final int MAX_BATCH_SIZE = Integer.parseInt(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.db.MAX_BATCH_SIZE", "2000"));
 
   /**
    * A system property to enable noisy close, i.e. exception catch in close methods are thrown as {@link DBException} exception.
@@ -72,8 +71,7 @@ public final class DBUtil
    */
   public static final String PROP_ENABLE_NOISY_CLOSE = "org.eclipse.net4j.db.close.noisy";
 
-  private static final boolean isNoisyCloseEnabled = Boolean
-      .valueOf(OMPlatform.INSTANCE.getProperty(PROP_ENABLE_NOISY_CLOSE, Boolean.FALSE.toString()));
+  private static final boolean isNoisyCloseEnabled = Boolean.valueOf(OMPlatform.INSTANCE.getProperty(PROP_ENABLE_NOISY_CLOSE, Boolean.FALSE.toString()));
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBUtil.class);
 
@@ -203,8 +201,7 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider,
-      String schemaName)
+  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider, String schemaName)
   {
     return openDatabase(adapter, connectionProvider, schemaName, false);
   }
@@ -212,8 +209,7 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider,
-      String schemaName, boolean fixNullableIndexColumns)
+  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider, String schemaName, boolean fixNullableIndexColumns)
   {
     return new DBDatabase((DBAdapter)adapter, connectionProvider, schemaName, fixNullableIndexColumns);
   }
@@ -242,8 +238,7 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static IDBSchema readSchema(IDBAdapter adapter, Connection connection, String name,
-      boolean fixNullableIndexColumns)
+  public static IDBSchema readSchema(IDBAdapter adapter, Connection connection, String name, boolean fixNullableIndexColumns)
   {
     IDBSchema schema = new org.eclipse.net4j.internal.db.ddl.DBSchema(name);
 
@@ -279,8 +274,7 @@ public final class DBUtil
     return schema;
   }
 
-  private static void fixNullableIndexFields(IDBAdapter adapter, Connection connection,
-      Set<IDBField> nullableIndexFields)
+  private static void fixNullableIndexFields(IDBAdapter adapter, Connection connection, Set<IDBField> nullableIndexFields)
   {
     StringBuilder builder = new StringBuilder();
     builder.append("The internal schema migration has fixed the following nullable index columns:");
@@ -724,8 +718,7 @@ public final class DBUtil
     return asLong(number);
   }
 
-  private static Number getFunctionResult(Connection connection, IDBField field, String function, String... where)
-      throws DBException
+  private static Number getFunctionResult(Connection connection, IDBField field, String function, String... where) throws DBException
   {
     StringBuilder builder = new StringBuilder();
     builder.append("SELECT "); //$NON-NLS-1$
@@ -961,8 +954,7 @@ public final class DBUtil
     return update(connection, sql);
   }
 
-  public static int select(Connection connection, IDBRowHandler rowHandler, String where, IDBField... fields)
-      throws DBException
+  public static int select(Connection connection, IDBRowHandler rowHandler, String where, IDBField... fields) throws DBException
   {
     IDBTable table = fields[0].getTable();
     for (int i = 1; i < fields.length; i++)
@@ -1167,8 +1159,8 @@ public final class DBUtil
   /**
    * @since 3.0
    */
-  public static void serializeTable(ExtendedDataOutput out, Connection connection, IDBTable table, String tableAlias,
-      String sqlSuffix) throws DBException, IOException
+  public static void serializeTable(ExtendedDataOutput out, Connection connection, IDBTable table, String tableAlias, String sqlSuffix)
+      throws DBException, IOException
   {
     serializeTable(out, connection, table, tableAlias, sqlSuffix, null);
   }
@@ -1176,8 +1168,8 @@ public final class DBUtil
   /**
    * @since 4.1
    */
-  public static void serializeTable(ExtendedDataOutput out, Connection connection, IDBTable table, String tableAlias,
-      String sqlSuffix, SerializeRowHandler handler) throws DBException, IOException
+  public static void serializeTable(ExtendedDataOutput out, Connection connection, IDBTable table, String tableAlias, String sqlSuffix,
+      SerializeRowHandler handler) throws DBException, IOException
   {
     IDBField[] fields = table.getFields();
 
@@ -1294,8 +1286,7 @@ public final class DBUtil
   /**
    * @since 4.0
    */
-  public static void deserializeTable(ExtendedDataInput in, Connection connection, IDBTable table, OMMonitor monitor)
-      throws IOException
+  public static void deserializeTable(ExtendedDataInput in, Connection connection, IDBTable table, OMMonitor monitor) throws IOException
   {
     deserializeTable(in, connection, table, monitor, null);
   }
@@ -1303,8 +1294,8 @@ public final class DBUtil
   /**
    * @since 4.1
    */
-  public static void deserializeTable(ExtendedDataInput in, Connection connection, IDBTable table, OMMonitor monitor,
-      DeserializeRowHandler handler) throws IOException
+  public static void deserializeTable(ExtendedDataInput in, Connection connection, IDBTable table, OMMonitor monitor, DeserializeRowHandler handler)
+      throws IOException
   {
     int size = in.readInt();
     if (size == 0)
@@ -1477,8 +1468,7 @@ public final class DBUtil
    */
   public interface SerializeRowHandler extends RowHandler
   {
-    public void handleRow(ExtendedDataOutput out, Connection connection, IDBField[] fields, Object[] values)
-        throws SQLException, IOException;
+    public void handleRow(ExtendedDataOutput out, Connection connection, IDBField[] fields, Object[] values) throws SQLException, IOException;
   }
 
   /**
@@ -1490,7 +1480,6 @@ public final class DBUtil
    */
   public interface DeserializeRowHandler extends RowHandler
   {
-    public void handleRow(ExtendedDataInput in, Connection connection, IDBField[] fields, Object[] values)
-        throws SQLException, IOException;
+    public void handleRow(ExtendedDataInput in, Connection connection, IDBField[] fields, Object[] values) throws SQLException, IOException;
   }
 }
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnection.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnection.java
index c5901d711d..cb0cee9afc 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnection.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnection.java
@@ -31,8 +31,7 @@ public interface IDBConnection extends Connection, IUserAware
 
   public IDBPreparedStatement prepareStatement(String sql, ReuseProbability reuseProbability);
 
-  public IDBPreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-      ReuseProbability reuseProbability);
+  public IDBPreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, ReuseProbability reuseProbability);
 
   /**
    * @deprecated Not supported.
@@ -44,8 +43,7 @@ public interface IDBConnection extends Connection, IUserAware
    * @deprecated Not supported.
    */
   @Deprecated
-  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException;
+  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException;
 
   /**
    * @deprecated Not supported.
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/SchemaElementNotFoundException.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/SchemaElementNotFoundException.java
index d0a6ebb31a..6e9fbf0a1b 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/SchemaElementNotFoundException.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/SchemaElementNotFoundException.java
@@ -29,8 +29,7 @@ public class SchemaElementNotFoundException extends DBException
 
   public SchemaElementNotFoundException(IDBSchemaElement parent, IDBSchemaElement.SchemaElementType type, String name)
   {
-    super(type.toString() + " " + DBSchemaElement.name(name) + " not found in " + parent.getSchemaElementType() + " "
-        + parent);
+    super(type.toString() + " " + DBSchemaElement.name(name) + " not found in " + parent.getSchemaElementType() + " " + parent);
     this.parent = parent;
     this.type = type;
     this.name = DBSchemaElement.name(name);
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
index a52bbc5e4b..5f19ad7973 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
@@ -819,8 +819,7 @@ public interface IDBDeltaVisitor
     {
       DBDeltaWithProperties parentCopy = getParentCopy(delta);
       @SuppressWarnings({ "rawtypes", "unchecked" })
-      DBPropertyDelta<?> copy = new DBPropertyDelta(parentCopy, delta.getName(), delta.getType(), delta.getValue(),
-          delta.getOldValue());
+      DBPropertyDelta<?> copy = new DBPropertyDelta(parentCopy, delta.getName(), delta.getType(), delta.getValue(), delta.getOldValue());
       parentCopy.addPropertyDelta(copy);
     }
 
@@ -849,8 +848,8 @@ public interface IDBDeltaVisitor
         return (T)result.getTableDelta(parent.getParent().getName()).getIndexDelta(parent.getName());
 
       case INDEX_FIELD:
-        return (T)result.getTableDelta(parent.getParent().getParent().getName())
-            .getIndexDelta(parent.getParent().getName()).getIndexFieldDelta(parent.getName());
+        return (T)result.getTableDelta(parent.getParent().getParent().getName()).getIndexDelta(parent.getParent().getName())
+            .getIndexFieldDelta(parent.getName());
 
       default:
         throw new IllegalStateException("Illegal delta type: " + deltaType);
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
index 63a88fedef..83aa0dcc8f 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
@@ -91,8 +91,7 @@ public final class DBConnection extends DelegatingConnection implements IDBConne
 
   @Override
   @Deprecated
-  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-      int resultSetHoldability) throws SQLException
+  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
   {
     throw new UnsupportedOperationException();
   }
@@ -123,8 +122,7 @@ public final class DBConnection extends DelegatingConnection implements IDBConne
     return prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, reuseProbability);
   }
 
-  public IDBPreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-      ReuseProbability reuseProbability)
+  public IDBPreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, ReuseProbability reuseProbability)
   {
     database.beginSchemaAccess(false);
 
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
index 16b4a95b6f..5df41b046f 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
@@ -47,8 +47,7 @@ public final class DBDatabase extends SetContainer<IDBConnection> implements IDB
 
   private final LinkedList<SchemaAccess> schemaAccessQueue = new LinkedList<SchemaAccess>();
 
-  public DBDatabase(final DBAdapter adapter, IDBConnectionProvider connectionProvider, final String schemaName,
-      final boolean fixNullableIndexColumns)
+  public DBDatabase(final DBAdapter adapter, IDBConnectionProvider connectionProvider, final String schemaName, final boolean fixNullableIndexColumns)
   {
     super(IDBConnection.class);
     this.adapter = adapter;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
index 5c642d6fb2..19fceabfd1 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
@@ -30,8 +30,7 @@ public class DBPreparedStatement extends DelegatingPreparedStatement implements
 
   private int touch;
 
-  public DBPreparedStatement(DBConnection transaction, String sql, ReuseProbability reuseProbability,
-      PreparedStatement delegate)
+  public DBPreparedStatement(DBConnection transaction, String sql, ReuseProbability reuseProbability, PreparedStatement delegate)
   {
     super(delegate, transaction);
     this.sql = sql;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
index 3258cabbe0..017e2875ff 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
@@ -139,10 +139,8 @@ public class DBIndex extends DBSchemaElement implements InternalDBIndex
       if (!DISABLE_NULLABLE_CHECK && FIX_NULLABLE_INDEX_COLUMNS.get() != Boolean.TRUE)
       {
         Exception constructionStackTrace = ((InternalDBField)field).getConstructionStackTrace();
-        throw new DBException(
-            "Index field is nullable: " + field //$NON-NLS-1$
-                + " (to disable this check run with '-Dorg.eclipse.net4j.db.DisableNullableCheck=true')",
-            constructionStackTrace);
+        throw new DBException("Index field is nullable: " + field //$NON-NLS-1$
+            + " (to disable this check run with '-Dorg.eclipse.net4j.db.DisableNullableCheck=true')", constructionStackTrace);
       }
 
       Set<IDBField> nullableIndexFields = NULLABLE_INDEX_FIELDS.get();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
index b4349c0398..db7606a129 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
@@ -69,8 +69,7 @@ public class DBSchema extends DBSchemaElement implements InternalDBSchema
 
       for (IDBField sourceField : sourceTable.getFields())
       {
-        table.addField(sourceField.getName(), sourceField.getType(), sourceField.getPrecision(), sourceField.getScale(),
-            sourceField.isNotNull());
+        table.addField(sourceField.getName(), sourceField.getType(), sourceField.getPrecision(), sourceField.getScale(), sourceField.isNotNull());
       }
 
       for (IDBIndex sourceIndex : sourceTable.getIndices())
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBDelta.java
index 8f776dd263..b76c8aace3 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBDelta.java
@@ -180,8 +180,7 @@ public abstract class DBDelta extends DBNamedElement implements IDBDelta
     return object == null ? ChangeKind.REMOVE : oldObject == null ? ChangeKind.ADD : ChangeKind.CHANGE;
   }
 
-  protected static <T extends IDBSchemaElement> void compare(T[] elements, T[] oldElements,
-      SchemaElementComparator<T> comparator)
+  protected static <T extends IDBSchemaElement> void compare(T[] elements, T[] oldElements, SchemaElementComparator<T> comparator)
   {
     for (int i = 0; i < elements.length; i++)
     {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
index 7f4d556b00..ad6a7ea258 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
@@ -48,32 +48,28 @@ public final class DBFieldDelta extends DBDeltaWithPosition implements IDBFieldD
     Integer oldPrecision = oldField == null ? null : oldField.getPrecision();
     if (!ObjectUtil.equals(precision, oldPrecision))
     {
-      addPropertyDelta(new DBPropertyDelta<Integer>(this, PRECISION_PROPERTY, IDBPropertyDelta.Type.INTEGER, precision,
-          oldPrecision));
+      addPropertyDelta(new DBPropertyDelta<Integer>(this, PRECISION_PROPERTY, IDBPropertyDelta.Type.INTEGER, precision, oldPrecision));
     }
 
     Integer scale = field == null ? null : field.getScale();
     Integer oldScale = oldField == null ? null : oldField.getScale();
     if (!ObjectUtil.equals(scale, oldScale))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<Integer>(this, SCALE_PROPERTY, IDBPropertyDelta.Type.INTEGER, scale, oldScale));
+      addPropertyDelta(new DBPropertyDelta<Integer>(this, SCALE_PROPERTY, IDBPropertyDelta.Type.INTEGER, scale, oldScale));
     }
 
     Boolean notNull = field == null ? null : field.isNotNull();
     Boolean oldNotNull = oldField == null ? null : oldField.isNotNull();
     if (!ObjectUtil.equals(notNull, oldNotNull))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<Boolean>(this, NOT_NULL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, notNull, oldNotNull));
+      addPropertyDelta(new DBPropertyDelta<Boolean>(this, NOT_NULL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, notNull, oldNotNull));
     }
 
     Integer position = field == null ? null : field.getPosition();
     Integer oldPosition = oldField == null ? null : oldField.getPosition();
     if (!ObjectUtil.equals(position, oldPosition))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
+      addPropertyDelta(new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
     }
   }
 
@@ -109,8 +105,7 @@ public final class DBFieldDelta extends DBDeltaWithPosition implements IDBFieldD
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(), getChangeKind(),
-        getPropertyDeltas().values());
+    return MessageFormat.format("DBFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(), getChangeKind(), getPropertyDeltas().values());
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
index fcd559ec79..02706cdf69 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
@@ -51,16 +51,14 @@ public final class DBIndexDelta extends DBDeltaWithProperties implements IDBInde
     IDBIndex.Type oldType = oldIndex == null ? null : oldIndex.getType();
     if (!ObjectUtil.equals(type, oldType))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<IDBIndex.Type>(this, TYPE_PROPERTY, IDBPropertyDelta.Type.STRING, type, oldType));
+      addPropertyDelta(new DBPropertyDelta<IDBIndex.Type>(this, TYPE_PROPERTY, IDBPropertyDelta.Type.STRING, type, oldType));
     }
 
     Boolean optional = index == null ? null : ((InternalDBIndex)index).isOptional();
     Boolean oldOptional = oldIndex == null ? null : ((InternalDBIndex)oldIndex).isOptional();
     if (!ObjectUtil.equals(optional, oldOptional))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<Boolean>(this, OPTIONAL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, optional, oldOptional));
+      addPropertyDelta(new DBPropertyDelta<Boolean>(this, OPTIONAL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, optional, oldOptional));
     }
 
     IDBIndexField[] indexFields = index == null ? InternalDBIndex.NO_INDEX_FIELDS : index.getIndexFields();
@@ -145,8 +143,8 @@ public final class DBIndexDelta extends DBDeltaWithProperties implements IDBInde
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBIndexDelta[name={0}, kind={1}, propertyDeltas={2}, indexFieldDeltas={3}]", getName(),
-        getChangeKind(), getPropertyDeltas().values(), indexFieldDeltas.values());
+    return MessageFormat.format("DBIndexDelta[name={0}, kind={1}, propertyDeltas={2}, indexFieldDeltas={3}]", getName(), getChangeKind(),
+        getPropertyDeltas().values(), indexFieldDeltas.values());
   }
 
   public void addIndexFieldDelta(DBIndexFieldDelta indexFieldDelta)
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
index 22c1999afc..60f3110921 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
@@ -40,8 +40,7 @@ public final class DBIndexFieldDelta extends DBDeltaWithPosition implements IDBI
     Integer oldPosition = oldIndexField == null ? null : oldIndexField.getPosition();
     if (!ObjectUtil.equals(position, oldPosition))
     {
-      addPropertyDelta(
-          new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
+      addPropertyDelta(new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
     }
   }
 
@@ -77,8 +76,7 @@ public final class DBIndexFieldDelta extends DBDeltaWithPosition implements IDBI
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBIndexFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(), getChangeKind(),
-        getPropertyDeltas().values());
+    return MessageFormat.format("DBIndexFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(), getChangeKind(), getPropertyDeltas().values());
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBPropertyDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBPropertyDelta.java
index 5762939f2c..f4e05db440 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBPropertyDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBPropertyDelta.java
@@ -77,8 +77,8 @@ public final class DBPropertyDelta<T> extends DBDelta implements IDBPropertyDelt
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBPropertyDelta[name={0}, kind={1}, type={2}, value={3}, oldValue={4}]", getName(),
-        getChangeKind(), getType(), getValue(), getOldValue());
+    return MessageFormat.format("DBPropertyDelta[name={0}, kind={1}, type={2}, value={3}, oldValue={4}]", getName(), getChangeKind(), getType(), getValue(),
+        getOldValue());
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBSchemaDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBSchemaDelta.java
index dc48f03d34..cfb2362794 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBSchemaDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBSchemaDelta.java
@@ -120,8 +120,7 @@ public final class DBSchemaDelta extends DBDelta implements IDBSchemaDelta
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBSchemaDelta[name={0}, kind={1}, tableDeltas={2}]", getName(), getChangeKind(),
-        tableDeltas.values());
+    return MessageFormat.format("DBSchemaDelta[name={0}, kind={1}, tableDeltas={2}]", getName(), getChangeKind(), tableDeltas.values());
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBTableDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBTableDelta.java
index 25686bb402..7c5bab3bb6 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBTableDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBTableDelta.java
@@ -160,8 +160,8 @@ public final class DBTableDelta extends DBDelta implements IDBTableDelta
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBTableDelta[name={0}, kind={1}, fieldDeltas={2}, indexDeltas={3}]", getName(),
-        getChangeKind(), fieldDeltas.values(), indexDeltas.values());
+    return MessageFormat.format("DBTableDelta[name={0}, kind={1}, fieldDeltas={2}, indexDeltas={3}]", getName(), getChangeKind(), fieldDeltas.values(),
+        indexDeltas.values());
   }
 
   public void addFieldDelta(IDBFieldDelta fieldDelta)
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index 0354782fbe..8097c26eb7 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -202,8 +202,7 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.3
    */
-  protected ResultSet readTables(Connection connection, DatabaseMetaData metaData, String schemaName)
-      throws SQLException
+  protected ResultSet readTables(Connection connection, DatabaseMetaData metaData, String schemaName) throws SQLException
   {
     return metaData.getTables(null, schemaName, null, new String[] { "TABLE" });
   }
@@ -251,8 +250,7 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.2
    */
-  protected void readIndices(Connection connection, DatabaseMetaData metaData, IDBTable table, String schemaName)
-      throws SQLException
+  protected void readIndices(Connection connection, DatabaseMetaData metaData, IDBTable table, String schemaName) throws SQLException
   {
     String tableName = table.getName();
 
@@ -266,8 +264,8 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.2
    */
-  protected void readIndices(Connection connection, ResultSet resultSet, IDBTable table, int indexNameColumn,
-      int indexTypeColumn, int fieldNameColumn, int fieldPositionColumn) throws SQLException
+  protected void readIndices(Connection connection, ResultSet resultSet, IDBTable table, int indexNameColumn, int indexTypeColumn, int fieldNameColumn,
+      int fieldPositionColumn) throws SQLException
   {
     try
     {
@@ -322,8 +320,7 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.2
    */
-  protected void addIndex(Connection connection, IDBTable table, String name, IDBIndex.Type type,
-      List<FieldInfo> fieldInfos)
+  protected void addIndex(Connection connection, IDBTable table, String name, IDBIndex.Type type, List<FieldInfo> fieldInfos)
   {
     IDBField[] fields = new IDBField[fieldInfos.size()];
 
@@ -349,8 +346,7 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.2
    */
-  protected boolean isPrimaryKeyShadow(Connection connection, IDBTable table, String name, IDBIndex.Type type,
-      IDBField[] fields)
+  protected boolean isPrimaryKeyShadow(Connection connection, IDBTable table, String name, IDBIndex.Type type, IDBField[] fields)
   {
     if (type != IDBIndex.Type.UNIQUE)
     {
@@ -521,8 +517,7 @@ public abstract class DBAdapter implements IDBAdapter
    */
   protected void createField(Connection connection, String tableName, IDBField field)
   {
-    DBUtil.execute(connection,
-        "ALTER TABLE " + tableName + " ADD COLUMN " + field.getName() + " " + createFieldDefinition(field));
+    DBUtil.execute(connection, "ALTER TABLE " + tableName + " ADD COLUMN " + field.getName() + " " + createFieldDefinition(field));
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs
index 53cf1b27ad..9a3b3b348b 100644
--- a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
index 2f5ab6cb52..b1baf59f25 100644
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.debug; singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.OM$Activator
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.internal.debug;version="3.0.400";x-internal:=true,
- org.eclipse.net4j.internal.debug.bundle;version="3.0.400";x-internal:=true,
- org.eclipse.net4j.internal.debug.messages;version="3.0.400";x-internal:=true,
- org.eclipse.net4j.internal.debug.views;version="3.0.400";x-internal:=true
+Export-Package: org.eclipse.net4j.internal.debug;version="3.0.500";x-internal:=true,
+ org.eclipse.net4j.internal.debug.bundle;version="3.0.500";x-internal:=true,
+ org.eclipse.net4j.internal.debug.messages;version="3.0.500";x-internal:=true,
+ org.eclipse.net4j.internal.debug.views;version="3.0.500";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
index 17ffdb96d3..033fc32c28 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
@@ -175,8 +175,7 @@ public class RemoteTraceView extends ViewPart
 
     clearAction.setText(Messages.getString("RemoteTraceView.9")); //$NON-NLS-1$
     clearAction.setToolTipText(Messages.getString("RemoteTraceView.10")); //$NON-NLS-1$
-    clearAction.setImageDescriptor(
-        PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+    clearAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
 
     doubleClickAction = new Action()
     {
diff --git a/plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.core.prefs
index 636347cee7..2f5e1ed59b 100644
--- a/plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.core.prefs
@@ -378,7 +378,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
index fa0796a354..d1229f36c9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.common
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator
 Bundle-ClassPath: .
@@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.buddies.common;version="4.0.400",
- org.eclipse.net4j.buddies.internal.common;version="4.0.400";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
- org.eclipse.net4j.buddies.internal.common.bundle;version="4.0.400";x-internal:=true,
- org.eclipse.net4j.buddies.internal.common.protocol;version="4.0.400";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
- org.eclipse.net4j.buddies.spi.common;version="4.0.400"
+Export-Package: org.eclipse.net4j.buddies.common;version="4.0.500",
+ org.eclipse.net4j.buddies.internal.common;version="4.0.500";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui",
+ org.eclipse.net4j.buddies.internal.common.bundle;version="4.0.500";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.common.protocol;version="4.0.500";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server",
+ org.eclipse.net4j.buddies.spi.common;version="4.0.500"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
index 93b9279999..5a6ef0bb28 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/CollaborationContainer.java
@@ -61,8 +61,7 @@ public class CollaborationContainer extends Lifecycle implements ICollaborationC
     IListener[] listeners = getListeners();
     if (listeners != null)
     {
-      fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.ADDED),
-          listeners);
+      fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.ADDED), listeners);
     }
 
     collaboration.addListener(this);
@@ -82,8 +81,7 @@ public class CollaborationContainer extends Lifecycle implements ICollaborationC
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.REMOVED),
-            listeners);
+        fireEvent(new SingleDeltaContainerEvent<ICollaboration>(this, collaboration, IContainerDelta.Kind.REMOVED), listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
index 89396d4713..adeb085f9b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Membership.java
@@ -84,8 +84,7 @@ public class Membership extends Lifecycle implements IMembership
     if (obj instanceof IMembershipKey)
     {
       IMembershipKey key = (IMembershipKey)obj;
-      return ObjectUtil.equals(getBuddy(), key.getBuddy())
-          && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
+      return ObjectUtil.equals(getBuddy(), key.getBuddy()) && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
     }
 
     return false;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
index 0241c7c62a..72a8bc5edc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
@@ -69,8 +69,7 @@ public class MembershipContainer extends Lifecycle implements IMembershipContain
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED),
-            listeners);
+        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED), listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
index 7b0dab3966..741e71ec15 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
@@ -51,8 +51,7 @@ public class MembershipKey implements IMembershipKey
     if (obj instanceof IMembershipKey)
     {
       IMembershipKey key = (IMembershipKey)obj;
-      return ObjectUtil.equals(getBuddy(), key.getBuddy())
-          && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
+      return ObjectUtil.equals(getBuddy(), key.getBuddy()) && ObjectUtil.equals(getCollaboration(), key.getCollaboration());
     }
 
     return false;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
index 44c160db23..cf8f162843 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
@@ -27,8 +27,7 @@ public class CollaborationLeftIndication extends Indication
 
   private ICollaborationProvider collaborationProvider;
 
-  public CollaborationLeftIndication(SignalProtocol<?> protocol, IBuddyProvider buddyProvider,
-      ICollaborationProvider collaborationProvider)
+  public CollaborationLeftIndication(SignalProtocol<?> protocol, IBuddyProvider buddyProvider, ICollaborationProvider collaborationProvider)
   {
     super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_LEFT);
     this.buddyProvider = buddyProvider;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
index 83d26b2cca..a6b07c1d8b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator
 Bundle-ClassPath: .
@@ -10,9 +10,9 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.messages;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.server;version="4.0.500"
+Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.messages;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.server;version="4.0.600"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
index e163b7c51a..da04842a4c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
@@ -32,8 +32,7 @@ public class CollaborationInitiatedNotification extends Request
   /**
    * @since 2.0
    */
-  public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID,
-      Collection<IBuddy> buddies, String[] facilityTypes)
+  public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID, Collection<IBuddy> buddies, String[] facilityTypes)
   {
     super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_INITIATED);
     this.collaborationID = collaborationID;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index e091c17d7b..a8cf94bf32 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -190,15 +190,14 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
       else if (obj instanceof IBuddyCollaboration)
       {
         final IBuddyCollaboration collaboration = (IBuddyCollaboration)obj;
-        manager.add(
-            new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
-            {
-              @Override
-              protected void safeRun() throws Exception
-              {
-                collaboration.leave();
-              }
-            });
+        manager.add(new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
+        {
+          @Override
+          protected void safeRun() throws Exception
+          {
+            collaboration.leave();
+          }
+        });
       }
     }
   }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
index 0a0388fcb6..e5a734fe96 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
@@ -371,7 +371,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
index f85663d824..f07891e66f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
@@ -352,8 +352,8 @@ public interface Connection
   * @see javax.jms.ConnectionConsumer
   */
 
-  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+      throws JMSException;
 
   /** Create a durable connection consumer for this connection (optional operation).
     * This is an expert facility not used by regular JMS clients.
@@ -383,6 +383,6 @@ public interface Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
index 0ec75ad2e3..6176bfd2d0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
@@ -347,7 +347,6 @@ public interface MessageProducer
     * @since 1.1
     */
 
-  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException;
+  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
index a76414254f..b7e2b248b5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
@@ -106,6 +106,5 @@ public interface QueueConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
-      int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
index 922011ac7f..b129bd62b8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
@@ -469,7 +469,7 @@ public interface Session extends Runnable
   *                         due to some internal error.
   * @exception InvalidDestinationException if an invalid destination
   * is specified.
-
+  
   * @exception InvalidSelectorException if the message selector is invalid.
   *
   * @since 1.1
@@ -507,14 +507,13 @@ public interface Session extends Runnable
    *                         due to some internal error.
    * @exception InvalidDestinationException if an invalid destination
     * is specified.
-
+  
    * @exception InvalidSelectorException if the message selector is invalid.
    *
    * @since 1.1
    *
    */
-  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal)
-      throws JMSException;
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal) throws JMSException;
 
   /** Creates a queue identity given a <CODE>Queue</CODE> name.
   *
@@ -657,8 +656,7 @@ public interface Session extends Runnable
     * @since 1.1
     */
 
-  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException;
 
   /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on
    * the specified queue.
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
index 79530ac620..a29374191f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
@@ -99,8 +99,7 @@ public interface TopicConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
-      int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 
   /** Create a durable connection consumer for this connection (optional operation).
     * This is an expert facility not used by regular JMS clients.
@@ -128,6 +127,6 @@ public interface TopicConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
index 435d6f7442..ea031fb1c2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
@@ -218,8 +218,7 @@ public interface TopicSession extends Session
     * @exception InvalidSelectorException if the message selector is invalid.
     */
 
-  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException;
 
   /** Creates a publisher for the specified topic.
     *
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
index 7c9743e513..41321439f8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
@@ -127,8 +127,7 @@ public class Server extends QueueWorker<MessageImpl> implements IServer
     return connection;
   }
 
-  public ServerConsumer createConsumer(ServerDestination destination, String messageSelector, boolean noLocal,
-      boolean durable)
+  public ServerConsumer createConsumer(ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
   {
     long consumerID = consumerIDCounter.increment();
     ServerConsumer consumer = new ServerConsumer(consumerID, destination, messageSelector, noLocal, durable);
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index 77fac5f1de..3b75ffd098 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -40,8 +40,7 @@ public class ServerConsumer implements IServerConsumer
 
   private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
 
-  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal,
-      boolean durable)
+  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
   {
     this.id = id;
     this.destination = destination;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
index 53cf1b27ad..9a3b3b348b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
index 9c0d4236d1..0e8e775ec5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
@@ -62,7 +62,6 @@ public class ConnectionFactoryImpl implements ConnectionFactory, Remote, Seriali
 
   public Connection createConnection(String userName, String password) throws JMSException
   {
-    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName,
-        password);
+    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName, password);
   }
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 721d09a021..075f8b50c8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -95,8 +95,8 @@ public class ConnectionImpl extends Container<Session> implements Connection
 
   private boolean stopped = true;
 
-  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription,
-      String userName, String password) throws JMSException
+  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription, String userName, String password)
+      throws JMSException
   {
     this.transportContainer = transportContainer == null ? JMSUtil.getTransportContainer() : transportContainer;
     if (transportContainer == null)
@@ -131,14 +131,13 @@ public class ConnectionImpl extends Container<Session> implements Connection
     }
   }
 
-  public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages)
+  public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
   {
     throw new UnsupportedOperationException();
   }
 
-  public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName,
-      String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+  public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages)
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
index 30db6227bc..bc43b2626b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
@@ -302,16 +302,14 @@ public class MessageImpl implements Message, Comparable<MessageImpl>
 
   public void setObjectProperty(String name, Object value) throws JMSException
   {
-    if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer
-        || value instanceof Long || value instanceof Float || value instanceof Double || value instanceof String
-        || value == null)
+    if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long
+        || value instanceof Float || value instanceof Double || value instanceof String || value == null)
     {
       setProperty(name, value);
     }
     else
     {
-      throw new MessageFormatException(
-          MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
+      throw new MessageFormatException(MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
index ce15159172..8691e624aa 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
@@ -119,8 +119,7 @@ public class MessageProducerImpl extends Lifecycle implements MessageProducer
     send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive());
   }
 
-  public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
+  public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
   {
     if (message == null)
     {
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index e3e4bd0509..5ab51fb752 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -138,8 +138,7 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     return createConsumer(destination, null, false);
   }
 
-  public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal)
-      throws JMSException
+  public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException
   {
     DestinationImpl dest = DestinationUtil.convert(destination);
     long consumerID = registerConsumer(dest, messageSelector, noLocal, false);
@@ -183,8 +182,7 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     return createDurableSubscriber(topic, name, null, false);
   }
 
-  public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException
+  public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException
   {
     TopicImpl dest = (TopicImpl)DestinationUtil.convert(topic);
     long consumerID = registerConsumer(dest, messageSelector, noLocal, true);
@@ -328,13 +326,11 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     throw new UnsupportedOperationException();
   }
 
-  public long registerConsumer(DestinationImpl destination, String messageSelector, boolean noLocal, boolean durable)
-      throws JMSException
+  public long registerConsumer(DestinationImpl destination, String messageSelector, boolean noLocal, boolean durable) throws JMSException
   {
     try
     {
-      return new JMSRegisterConsumerRequest(connection.getProtocol(), id, destination, messageSelector, noLocal,
-          durable).send();
+      return new JMSRegisterConsumerRequest(connection.getProtocol(), id, destination, messageSelector, noLocal, durable).send();
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
index 35d4012dc9..8881bb9bbc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
@@ -18,8 +18,7 @@ public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSub
 
   private boolean noLocal;
 
-  public TopicSubscriberImpl(SessionImpl session, long id, TopicImpl topic, String name, String messageSelector,
-      boolean noLocal)
+  public TopicSubscriberImpl(SessionImpl session, long id, TopicImpl topic, String name, String messageSelector, boolean noLocal)
   {
     super(session, id, topic, messageSelector);
     this.name = name;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
index 3c9c45c239..7164078d26 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
@@ -35,8 +35,8 @@ public class JMSRegisterConsumerRequest extends RequestWithConfirmation<Long>
   /**
    * @since 2.0
    */
-  public JMSRegisterConsumerRequest(JMSClientProtocol protocol, int sessionID, DestinationImpl destination,
-      String messageSelector, boolean noLocal, boolean durable)
+  public JMSRegisterConsumerRequest(JMSClientProtocol protocol, int sessionID, DestinationImpl destination, String messageSelector, boolean noLocal,
+      boolean durable)
   {
     super(protocol, JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER);
     this.sessionID = sessionID;
diff --git a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
index 0f586d4b61..d9c220227a 100644
--- a/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
@@ -395,7 +395,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
index 8a257a04a6..ccd4ce8e8c 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
@@ -172,8 +172,7 @@ public class HTTPAcceptor extends Acceptor implements IHTTPAcceptor, INet4jTrans
     connector.deactivate();
   }
 
-  public void handleOperations(String connectorID, ExtendedDataInputStream in, ExtendedDataOutputStream out)
-      throws IOException
+  public void handleOperations(String connectorID, ExtendedDataInputStream in, ExtendedDataOutputStream out) throws IOException
   {
     HTTPServerConnector connector = httpConnectors.get(connectorID);
     if (connector == null)
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
index 292ca79d66..adfb6992a9 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
@@ -176,8 +176,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doConnect(ExtendedDataInputStream in, ExtendedDataOutputStream out)
-      throws ServletException, IOException
+  protected void doConnect(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException, IOException
   {
     try
     {
@@ -198,8 +197,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doDisconnect(ExtendedDataInputStream in, ExtendedDataOutputStream out)
-      throws ServletException, IOException
+  protected void doDisconnect(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException, IOException
   {
     try
     {
@@ -217,8 +215,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doOperations(ExtendedDataInputStream in, ExtendedDataOutputStream out)
-      throws ServletException, IOException
+  protected void doOperations(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException, IOException
   {
     String connectorID = in.readString();
     if (TRACER.isEnabled())
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
index bc88050367..bae9726c72 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
@@ -25,8 +25,7 @@ public class RandomizerInjector implements IElementProcessor
   {
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof HTTPAcceptor)
     {
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
index bfe643ccb8..f21744e9fb 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
@@ -33,7 +33,6 @@ public final class HTTPServerUtil
 
   public static IHTTPAcceptor getAcceptor(IManagedContainer container, String description)
   {
-    return (IHTTPAcceptor)container.getElement(HTTPAcceptorFactory.PRODUCT_GROUP, HTTPAcceptorFactory.TYPE,
-        description);
+    return (IHTTPAcceptor)container.getElement(HTTPAcceptorFactory.PRODUCT_GROUP, HTTPAcceptorFactory.TYPE, description);
   }
 }
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
index b0181d6951..ed4fd698de 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
@@ -44,7 +44,6 @@ public interface INet4jTransportServlet extends Servlet
 
     public void handleDisonnect(String connectorID);
 
-    public void handleOperations(String connectorID, ExtendedDataInputStream in, ExtendedDataOutputStream out)
-        throws IOException;
+    public void handleOperations(String connectorID, ExtendedDataInputStream in, ExtendedDataOutputStream out) throws IOException;
   }
 }
diff --git a/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
index f4a56bc04a..ac8a417390 100644
--- a/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
@@ -386,7 +386,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.http/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.http/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
index 0fbefc3f80..09032b8a3f 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
@@ -35,7 +35,6 @@ public final class HTTPUtil
    */
   public static IHTTPConnector getConnector(IManagedContainer container, String description)
   {
-    return (IHTTPConnector)container.getElement(HTTPConnectorFactory.PRODUCT_GROUP, HTTPConnectorFactory.TYPE,
-        description);
+    return (IHTTPConnector)container.getElement(HTTPConnectorFactory.PRODUCT_GROUP, HTTPConnectorFactory.TYPE, description);
   }
 }
diff --git a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
index 0a0388fcb6..e5a734fe96 100644
--- a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
@@ -371,7 +371,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
index f85663d824..f07891e66f 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
@@ -352,8 +352,8 @@ public interface Connection
   * @see javax.jms.ConnectionConsumer
   */
 
-  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+      throws JMSException;
 
   /** Create a durable connection consumer for this connection (optional operation).
     * This is an expert facility not used by regular JMS clients.
@@ -383,6 +383,6 @@ public interface Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
index 0ec75ad2e3..6176bfd2d0 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
@@ -347,7 +347,6 @@ public interface MessageProducer
     * @since 1.1
     */
 
-  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException;
+  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
index a76414254f..b7e2b248b5 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
@@ -106,6 +106,5 @@ public interface QueueConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
-      int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
index 922011ac7f..b129bd62b8 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
@@ -469,7 +469,7 @@ public interface Session extends Runnable
   *                         due to some internal error.
   * @exception InvalidDestinationException if an invalid destination
   * is specified.
-
+  
   * @exception InvalidSelectorException if the message selector is invalid.
   *
   * @since 1.1
@@ -507,14 +507,13 @@ public interface Session extends Runnable
    *                         due to some internal error.
    * @exception InvalidDestinationException if an invalid destination
     * is specified.
-
+  
    * @exception InvalidSelectorException if the message selector is invalid.
    *
    * @since 1.1
    *
    */
-  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal)
-      throws JMSException;
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal) throws JMSException;
 
   /** Creates a queue identity given a <CODE>Queue</CODE> name.
   *
@@ -657,8 +656,7 @@ public interface Session extends Runnable
     * @since 1.1
     */
 
-  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException;
 
   /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on
    * the specified queue.
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
index 79530ac620..a29374191f 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
@@ -99,8 +99,7 @@ public interface TopicConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
-      int maxMessages) throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 
   /** Create a durable connection consumer for this connection (optional operation).
     * This is an expert facility not used by regular JMS clients.
@@ -128,6 +127,6 @@ public interface TopicConnection extends Connection
     * @see javax.jms.ConnectionConsumer
     */
 
-  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
index 435d6f7442..ea031fb1c2 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
@@ -218,8 +218,7 @@ public interface TopicSession extends Session
     * @exception InvalidSelectorException if the message selector is invalid.
     */
 
-  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException;
 
   /** Creates a publisher for the specified topic.
     *
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
index 7c9743e513..41321439f8 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
@@ -127,8 +127,7 @@ public class Server extends QueueWorker<MessageImpl> implements IServer
     return connection;
   }
 
-  public ServerConsumer createConsumer(ServerDestination destination, String messageSelector, boolean noLocal,
-      boolean durable)
+  public ServerConsumer createConsumer(ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
   {
     long consumerID = consumerIDCounter.increment();
     ServerConsumer consumer = new ServerConsumer(consumerID, destination, messageSelector, noLocal, durable);
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index 77fac5f1de..3b75ffd098 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -40,8 +40,7 @@ public class ServerConsumer implements IServerConsumer
 
   private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
 
-  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal,
-      boolean durable)
+  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
   {
     this.id = id;
     this.destination = destination;
diff --git a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
index 53cf1b27ad..9a3b3b348b 100644
--- a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
index 9c0d4236d1..0e8e775ec5 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
@@ -62,7 +62,6 @@ public class ConnectionFactoryImpl implements ConnectionFactory, Remote, Seriali
 
   public Connection createConnection(String userName, String password) throws JMSException
   {
-    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName,
-        password);
+    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName, password);
   }
 }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 721d09a021..075f8b50c8 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -95,8 +95,8 @@ public class ConnectionImpl extends Container<Session> implements Connection
 
   private boolean stopped = true;
 
-  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription,
-      String userName, String password) throws JMSException
+  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription, String userName, String password)
+      throws JMSException
   {
     this.transportContainer = transportContainer == null ? JMSUtil.getTransportContainer() : transportContainer;
     if (transportContainer == null)
@@ -131,14 +131,13 @@ public class ConnectionImpl extends Container<Session> implements Connection
     }
   }
 
-  public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages)
+  public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages)
   {
     throw new UnsupportedOperationException();
   }
 
-  public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName,
-      String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+  public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages)
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
index 30db6227bc..bc43b2626b 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
@@ -302,16 +302,14 @@ public class MessageImpl implements Message, Comparable<MessageImpl>
 
   public void setObjectProperty(String name, Object value) throws JMSException
   {
-    if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer
-        || value instanceof Long || value instanceof Float || value instanceof Double || value instanceof String
-        || value == null)
+    if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long
+        || value instanceof Float || value instanceof Double || value instanceof String || value == null)
     {
       setProperty(name, value);
     }
     else
     {
-      throw new MessageFormatException(
-          MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
+      throw new MessageFormatException(MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
index ce15159172..8691e624aa 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
@@ -119,8 +119,7 @@ public class MessageProducerImpl extends Lifecycle implements MessageProducer
     send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive());
   }
 
-  public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
+  public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
   {
     if (message == null)
     {
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index e3e4bd0509..5ab51fb752 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -138,8 +138,7 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     return createConsumer(destination, null, false);
   }
 
-  public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal)
-      throws JMSException
+  public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException
   {
     DestinationImpl dest = DestinationUtil.convert(destination);
     long consumerID = registerConsumer(dest, messageSelector, noLocal, false);
@@ -183,8 +182,7 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     return createDurableSubscriber(topic, name, null, false);
   }
 
-  public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException
+  public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException
   {
     TopicImpl dest = (TopicImpl)DestinationUtil.convert(topic);
     long consumerID = registerConsumer(dest, messageSelector, noLocal, true);
@@ -328,13 +326,11 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
     throw new UnsupportedOperationException();
   }
 
-  public long registerConsumer(DestinationImpl destination, String messageSelector, boolean noLocal, boolean durable)
-      throws JMSException
+  public long registerConsumer(DestinationImpl destination, String messageSelector, boolean noLocal, boolean durable) throws JMSException
   {
     try
     {
-      return new JMSRegisterConsumerRequest(connection.getProtocol(), id, destination, messageSelector, noLocal,
-          durable).send();
+      return new JMSRegisterConsumerRequest(connection.getProtocol(), id, destination, messageSelector, noLocal, durable).send();
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
index 35d4012dc9..8881bb9bbc 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
@@ -18,8 +18,7 @@ public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSub
 
   private boolean noLocal;
 
-  public TopicSubscriberImpl(SessionImpl session, long id, TopicImpl topic, String name, String messageSelector,
-      boolean noLocal)
+  public TopicSubscriberImpl(SessionImpl session, long id, TopicImpl topic, String name, String messageSelector, boolean noLocal)
   {
     super(session, id, topic, messageSelector);
     this.name = name;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
index 3c9c45c239..7164078d26 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
@@ -35,8 +35,8 @@ public class JMSRegisterConsumerRequest extends RequestWithConfirmation<Long>
   /**
    * @since 2.0
    */
-  public JMSRegisterConsumerRequest(JMSClientProtocol protocol, int sessionID, DestinationImpl destination,
-      String messageSelector, boolean noLocal, boolean durable)
+  public JMSRegisterConsumerRequest(JMSClientProtocol protocol, int sessionID, DestinationImpl destination, String messageSelector, boolean noLocal,
+      boolean durable)
   {
     super(protocol, JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER);
     this.sessionID = sessionID;
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java
index 30aa9ed6c0..9d3ee6d4be 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java
@@ -111,8 +111,7 @@ public abstract class JVMConnector extends Connector implements IJVMConnector
   }
 
   @Override
-  protected void registerChannelWithPeer(short channelID, long timeoutIgnored, IProtocol<?> protocol)
-      throws ChannelException
+  protected void registerChannelWithPeer(short channelID, long timeoutIgnored, IProtocol<?> protocol) throws ChannelException
   {
     try
     {
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
index 3345d5eb7b..4e9b5054de 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
@@ -38,7 +38,6 @@ public final class JVMUtil
 
   public static IJVMConnector getConnector(IManagedContainer container, String description)
   {
-    return (IJVMConnector)container.getElement(JVMConnectorFactory.PRODUCT_GROUP, JVMConnectorFactory.TYPE,
-        description);
+    return (IJVMConnector)container.getElement(JVMConnectorFactory.PRODUCT_GROUP, JVMConnectorFactory.TYPE, description);
   }
 }
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
index 505e272041..cbe28f995d 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
@@ -78,8 +78,7 @@ public final class SelectorUtil
         if (TRACER.isEnabled())
         {
           TRACER.trace("Setting interest " //$NON-NLS-1$
-              + formatInterestOps(newOps)
-              + (oldOps == 0 ? "" : " (was " + formatInterestOps(oldOps).toLowerCase() + ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+              + formatInterestOps(newOps) + (oldOps == 0 ? "" : " (was " + formatInterestOps(oldOps).toLowerCase() + ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
 
         selectionKey.interestOps(newOps);
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index 9b23d90cfb..7870306ea0 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -216,8 +216,7 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
       if (byteBuffer != null)
       {
         short channelID = inputBuffer.getChannelID();
-        InternalChannel channel = channelID == ControlChannel.CONTROL_CHANNEL_INDEX ? controlChannel
-            : getChannel(channelID);
+        InternalChannel channel = channelID == ControlChannel.CONTROL_CHANNEL_INDEX ? controlChannel : getChannel(channelID);
         if (channel != null)
         {
           channel.handleBufferFromMultiplexer(inputBuffer);
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
index 17b27cb551..e299e7a261 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
@@ -85,8 +85,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
     });
   }
 
-  public void orderRegistration(final SocketChannel channel, final boolean client,
-      final ITCPActiveSelectorListener listener)
+  public void orderRegistration(final SocketChannel channel, final boolean client, final ITCPActiveSelectorListener listener)
   {
     assertValidListener(listener);
     order(client, new Runnable()
@@ -393,8 +392,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
     }
   }
 
-  private void executeRegistration(final SocketChannel channel, final ITCPActiveSelectorListener listener,
-      boolean client)
+  private void executeRegistration(final SocketChannel channel, final ITCPActiveSelectorListener listener, boolean client)
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
index 58136c49fd..853d67bc8b 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
@@ -24,8 +24,7 @@ public class TCPSelectorInjector implements IElementProcessor
   {
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof TCPAcceptor)
     {
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
index a440702e26..01a2f36af1 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
@@ -346,8 +346,7 @@ public class SSLEngineManager
   public void checkRehandShake(SocketChannel socket) throws Exception
   {
     handshakeStatus = engineResult.getHandshakeStatus();
-    needRehandShake = handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK
-        || handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP
+    needRehandShake = handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK || handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP
         || handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP;
 
     if (needRehandShake)
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
index 666f9f82c3..fb9f7fc295 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
@@ -82,8 +82,7 @@ public class SSLUtil
     passPhraseVar = passPhrase;
   }
 
-  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase,
-      int handShakeTimeOut, int handShakeWaitTime)
+  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase, int handShakeTimeOut, int handShakeWaitTime)
   {
     setDefaultSSLConfiguration(keyPath, trustPath, passPhrase);
 
@@ -112,8 +111,7 @@ public class SSLUtil
 
   public static synchronized ITCPConnector getConnector(IManagedContainer container, String description)
   {
-    return (ITCPConnector)container.getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE,
-        description);
+    return (ITCPConnector)container.getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE, description);
   }
 
   public static synchronized SSLEngine createSSLEngine(boolean client, String host, int port) throws Exception
@@ -177,12 +175,12 @@ public class SSLUtil
     {
       if (client)
       {
-        throw new KeyStoreException("Trust Store[" + (trustPath != null) + "] or Pass Phrase[" + (passPhrase != null)
-            + "] is not provided. [false] means it does not exist.");
+        throw new KeyStoreException(
+            "Trust Store[" + (trustPath != null) + "] or Pass Phrase[" + (passPhrase != null) + "] is not provided. [false] means it does not exist.");
       }
 
-      throw new KeyStoreException("Key Store[" + (keyPath != null) + "] or Pass Phrase[" + (passPhrase != null)
-          + "] is not provided. [false] means it does not exist.");
+      throw new KeyStoreException(
+          "Key Store[" + (keyPath != null) + "] or Pass Phrase[" + (passPhrase != null) + "] is not provided. [false] means it does not exist.");
     }
 
     char[] pass = passPhrase.toCharArray();
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
index 25e1f12044..c34896d50d 100644
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
@@ -386,7 +386,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
index 340f9ff1bf..a8528d1552 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
@@ -56,8 +56,7 @@ public abstract class ChannelTest extends AbstractProtocolTest
     assertActive(protocol);
 
     byte[] data = HugeData.getBytes();
-    assertEquals(true,
-        data.length > 2 * ((ITransportConfigAware)getConnector()).getConfig().getBufferProvider().getBufferCapacity());
+    assertEquals(true, data.length > 2 * ((ITransportConfigAware)getConnector()).getConfig().getBufferProvider().getBufferCapacity());
 
     for (int i = 1; i < data.length; i++)
     {
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index 94e8605b5d..33a1b5eafc 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -575,8 +575,7 @@ public abstract class AbstractOMTest extends TestCase
   {
     if (!Arrays.deepEquals(expected, actual))
     {
-      throw new AssertionFailedError(
-          "expected:" + Arrays.deepToString(expected) + " but was:" + Arrays.deepToString(actual));
+      throw new AssertionFailedError("expected:" + Arrays.deepToString(expected) + " but was:" + Arrays.deepToString(actual));
     }
   }
 
@@ -628,8 +627,7 @@ public abstract class AbstractOMTest extends TestCase
 
   public static void assertInstanceOf(Class<?> expected, Object object)
   {
-    assertEquals("Not an instance of " + expected + ": " + object.getClass().getName(), true,
-        expected.isInstance(object));
+    assertEquals("Not an instance of " + expected + ": " + object.getClass().getName(), true, expected.isInstance(object));
   }
 
   public static void assertNotInstanceOf(Class<?> expected, Object object)
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
index 72dad31404..e731f19b00 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
@@ -84,8 +84,7 @@ public class ConcurrentRunner
    * @throws Throwable
    *           the throwable
    */
-  private static void throwOnFailure(Future<Throwable>[] futures, ExecutorService threadPool)
-      throws InterruptedException, ExecutionException, Throwable
+  private static void throwOnFailure(Future<Throwable>[] futures, ExecutorService threadPool) throws InterruptedException, ExecutionException, Throwable
   {
     for (Future<Throwable> future : futures)
     {
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
index 4de9e7a2fe..b6a7945531 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
@@ -35,8 +35,7 @@ public class StreamWrapperTest extends AbstractOMTest
     printStream.println("Hello world!");
     printStream.println("Hello world!");
 
-    XORInputStream xorInputStream = new XORInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()),
-        key);
+    XORInputStream xorInputStream = new XORInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()), key);
 
     InputStreamReader inputStreamReader = new InputStreamReader(xorInputStream);
     BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
diff --git a/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
index 8cd2ce2d8b..ce9aa5c98f 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
@@ -71,8 +71,8 @@ public class AcceptorsView extends ContainerView
 
   public static ElementWizardAction createNewAcceptorAction(Shell shell, IManagedContainer container)
   {
-    return new ElementWizardAction(shell, "New Acceptor", "Open a new acceptor",
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_ADD_ACCEPTOR), AcceptorFactory.PRODUCT_GROUP, container, "tcp")
+    return new ElementWizardAction(shell, "New Acceptor", "Open a new acceptor", SharedIcons.getDescriptor(SharedIcons.ETOOL_ADD_ACCEPTOR),
+        AcceptorFactory.PRODUCT_GROUP, container, "tcp")
     {
       @Override
       public String getDefaultDescription(String factoryType)
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
index f2bec8f5cd..8453d4bf69 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
@@ -71,8 +71,8 @@ public class ConnectorsView extends ContainerView
 
   public static ElementWizardAction createNewConnectorAction(Shell shell, IManagedContainer container)
   {
-    return new ElementWizardAction(shell, "New Connector", "Open a new connector",
-        SharedIcons.getDescriptor(SharedIcons.ETOOL_ADD_CONNECTOR), ConnectorFactory.PRODUCT_GROUP, container, "tcp")
+    return new ElementWizardAction(shell, "New Connector", "Open a new connector", SharedIcons.getDescriptor(SharedIcons.ETOOL_ADD_CONNECTOR),
+        ConnectorFactory.PRODUCT_GROUP, container, "tcp")
     {
       @Override
       public String getDefaultDescription(String factoryType)
diff --git a/plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.core.prefs
index 636347cee7..2f5e1ed59b 100644
--- a/plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.core.prefs
@@ -378,7 +378,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/DisplayDelegateDetector.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/DisplayDelegateDetector.java
index 35263ee424..abd1e1e29f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/DisplayDelegateDetector.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/DisplayDelegateDetector.java
@@ -46,8 +46,7 @@ public class DisplayDelegateDetector implements DelegateDetector
   /**
    * @author Eike Stepper
    */
-  public static abstract class Factory
-      extends org.eclipse.net4j.util.concurrent.DelegableReentrantLock.DelegateDetector.Factory
+  public static abstract class Factory extends org.eclipse.net4j.util.concurrent.DelegableReentrantLock.DelegateDetector.Factory
   {
     public static final String TYPE = "display";
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index 39e8f80d4d..91b9a68308 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -63,8 +63,7 @@ import java.util.Stack;
 /**
  * @author Eike Stepper
  */
-public class Net4jIntrospectorView extends ViewPart
-    implements IPartListener, ISelectionListener, IDoubleClickListener, IListener
+public class Net4jIntrospectorView extends ViewPart implements IPartListener, ISelectionListener, IDoubleClickListener, IListener
 {
   public static final String VIEW_ID = "org.eclipse.net4j.util.Net4jIntrospectorView"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
index 6d7980ce80..7244a60663 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
@@ -26,8 +26,7 @@ import org.eclipse.swt.widgets.Display;
  * @author Eike Stepper
  */
 @SuppressWarnings("deprecation")
-public abstract class StructuredContentProvider<INPUT> extends org.eclipse.jface.viewers.ViewerSorter
-    implements IStructuredContentProvider, IListener
+public abstract class StructuredContentProvider<INPUT> extends org.eclipse.jface.viewers.ViewerSorter implements IStructuredContentProvider, IListener
 {
   private StructuredViewer viewer;
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
index c102500dd2..3deab117de 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
@@ -31,8 +31,7 @@ import java.util.List;
  * @author Eike Stepper
  * @since 3.3
  */
-public class TableLabelProvider<T> extends ManagedLabelProvider
-    implements ITableLabelProvider, ITableColorProvider, ITableFontProvider
+public class TableLabelProvider<T> extends ManagedLabelProvider implements ITableLabelProvider, ITableColorProvider, ITableFontProvider
 {
   private final List<Column<T>> columns = new ArrayList<Column<T>>();
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 2283d9a5c9..1727fbabf4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -797,8 +797,7 @@ public final class UIUtil
       {
         try
         {
-          IViewSite site = (IViewSite)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-              .getActivePart().getSite();
+          IViewSite site = (IViewSite)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite();
           if (image == null)
           {
             site.getActionBars().getStatusLineManager().setMessage(message);
@@ -821,27 +820,26 @@ public final class UIUtil
    */
   public static void addDragSupport(final StructuredViewer viewer)
   {
-    viewer.addDragSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
-        new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter()
-        {
-          private long lastDragTime;
+    viewer.addDragSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY, new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter()
+    {
+      private long lastDragTime;
 
-          @Override
-          public void dragStart(DragSourceEvent event)
-          {
-            lastDragTime = System.currentTimeMillis();
-            LocalSelectionTransfer.getTransfer().setSelection(viewer.getSelection());
-            LocalSelectionTransfer.getTransfer().setSelectionSetTime(lastDragTime);
-          }
+      @Override
+      public void dragStart(DragSourceEvent event)
+      {
+        lastDragTime = System.currentTimeMillis();
+        LocalSelectionTransfer.getTransfer().setSelection(viewer.getSelection());
+        LocalSelectionTransfer.getTransfer().setSelectionSetTime(lastDragTime);
+      }
 
-          @Override
-          public void dragFinished(DragSourceEvent event)
-          {
-            if (LocalSelectionTransfer.getTransfer().getSelectionSetTime() == lastDragTime)
-            {
-              LocalSelectionTransfer.getTransfer().setSelection(null);
-            }
-          }
-        });
+      @Override
+      public void dragFinished(DragSourceEvent event)
+      {
+        if (LocalSelectionTransfer.getTransfer().getSelectionSetTime() == lastDragTime)
+        {
+          LocalSelectionTransfer.getTransfer().setSelection(null);
+        }
+      }
+    });
   }
 }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
index bf36b17555..a7d92c2da8 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
@@ -30,11 +30,9 @@ import java.util.Set;
  */
 public class ConfirmationDialog extends MessageDialog
 {
-  public ConfirmationDialog(Shell shell, String title, String message, Set<Confirmation> acceptableResponses,
-      Confirmation suggestedResponse)
+  public ConfirmationDialog(Shell shell, String title, String message, Set<Confirmation> acceptableResponses, Confirmation suggestedResponse)
   {
-    this(shell, title, message, getButtonLabels(inOrder(acceptableResponses)),
-        inOrder(acceptableResponses).indexOf(suggestedResponse));
+    this(shell, title, message, getButtonLabels(inOrder(acceptableResponses)), inOrder(acceptableResponses).indexOf(suggestedResponse));
   }
 
   private ConfirmationDialog(Shell shell, String title, String message, String[] buttonLabels, int defaultIndex)
@@ -42,8 +40,7 @@ public class ConfirmationDialog extends MessageDialog
     super(shell, title, null, message, MessageDialog.CONFIRM, buttonLabels, defaultIndex);
   }
 
-  public static Confirmation openConfirm(Shell shell, String title, String message,
-      Set<Confirmation> acceptableResponses, Confirmation suggestedResponse)
+  public static Confirmation openConfirm(Shell shell, String title, String message, Set<Confirmation> acceptableResponses, Confirmation suggestedResponse)
   {
     List<Confirmation> inOrder = inOrder(acceptableResponses);
     String[] buttonLabels = getButtonLabels(inOrder);
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
index 35b8ce3475..8966415b60 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
@@ -35,8 +35,7 @@ public class InteractiveConfirmationProvider implements IConfirmationProvider
     return true;
   }
 
-  public Confirmation confirm(final String subject, final String message, final Set<Confirmation> acceptable,
-      final Confirmation suggestion)
+  public Confirmation confirm(final String subject, final String message, final Set<Confirmation> acceptable, final Confirmation suggestion)
   {
     final Confirmation[] confirmation = new Confirmation[1];
     final Display display = UIUtil.getDisplay();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java
index 0bc7669541..63ea95c336 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java
@@ -77,8 +77,8 @@ public abstract class ElementWizard extends Notifier implements IElementWizard,
     return container.getElement(productGroup, factoryType, resultDescription);
   }
 
-  public void create(Composite parent, IManagedContainer container, String productGroup, String factoryType,
-      String defaultDescription, ValidationContext context)
+  public void create(Composite parent, IManagedContainer container, String productGroup, String factoryType, String defaultDescription,
+      ValidationContext context)
   {
     this.container = container;
     this.productGroup = productGroup;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
index a252e76625..074210dcc6 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
@@ -47,14 +47,13 @@ public class ElementWizardAction extends LongRunningAction
     this(shell, title, toolTip, image, productGroup, IPluginContainer.INSTANCE);
   }
 
-  public ElementWizardAction(Shell shell, String title, String toolTip, ImageDescriptor image, String productGroup,
-      IManagedContainer container)
+  public ElementWizardAction(Shell shell, String title, String toolTip, ImageDescriptor image, String productGroup, IManagedContainer container)
   {
     this(shell, title, toolTip, image, productGroup, container, null);
   }
 
-  public ElementWizardAction(Shell shell, String title, String toolTip, ImageDescriptor image, String productGroup,
-      IManagedContainer container, String defaultFactoryType)
+  public ElementWizardAction(Shell shell, String title, String toolTip, ImageDescriptor image, String productGroup, IManagedContainer container,
+      String defaultFactoryType)
   {
     super(title, toolTip, image);
     this.shell = shell;
@@ -121,8 +120,7 @@ public class ElementWizardAction extends LongRunningAction
       {
         public void run()
         {
-          MessageDialog.openError(shell, title, "An error occured: " + ex.getMessage()
-              + "\n\nThe error log may contain more information about the problem.");
+          MessageDialog.openError(shell, title, "An error occured: " + ex.getMessage() + "\n\nThe error log may contain more information about the problem.");
         }
       });
     }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
index f697b72be2..64f89c9f01 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
@@ -82,8 +82,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
   /**
    * @since 3.2
    */
-  public ElementWizardComposite(Composite parent, int style, String productGroup, String label,
-      ValidationContext validationContext)
+  public ElementWizardComposite(Composite parent, int style, String productGroup, String label, ValidationContext validationContext)
   {
     this(parent, style, productGroup, label, validationContext, null);
   }
@@ -91,8 +90,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
   /**
    * @since 3.2
    */
-  public ElementWizardComposite(Composite parent, int style, String productGroup, String label,
-      ValidationContext validationContext, String defaultFactoryType)
+  public ElementWizardComposite(Composite parent, int style, String productGroup, String label, ValidationContext validationContext, String defaultFactoryType)
   {
     super(parent, style);
     this.productGroup = productGroup;
@@ -158,8 +156,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
 
       try
       {
-        IElementWizard wizard = (IElementWizard)container.getElement(ElementWizardFactory.PRODUCT_GROUP,
-            getProductGroup() + ":" + factoryType, null);
+        IElementWizard wizard = (IElementWizard)container.getElement(ElementWizardFactory.PRODUCT_GROUP, getProductGroup() + ":" + factoryType, null);
 
         wizards.add(wizard);
         wizardControls.put(wizard, new ArrayList<Control>());
@@ -331,8 +328,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
     /**
      * @since 3.2
      */
-    public WithCombo(Composite parent, int style, String productGroup, String label,
-        ValidationContext validationContext)
+    public WithCombo(Composite parent, int style, String productGroup, String label, ValidationContext validationContext)
     {
       super(parent, style, productGroup, label, validationContext);
     }
@@ -340,8 +336,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
     /**
      * @since 3.2
      */
-    public WithCombo(Composite parent, int style, String productGroup, String label,
-        ValidationContext validationContext, String defaultFactoryType)
+    public WithCombo(Composite parent, int style, String productGroup, String label, ValidationContext validationContext, String defaultFactoryType)
     {
       super(parent, style, productGroup, label, validationContext, defaultFactoryType);
     }
@@ -406,8 +401,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
     /**
      * @since 3.2
      */
-    public WithRadios(Composite parent, int style, String productGroup, String label,
-        ValidationContext validationContext)
+    public WithRadios(Composite parent, int style, String productGroup, String label, ValidationContext validationContext)
     {
       super(parent, style, productGroup, label, validationContext);
     }
@@ -415,8 +409,7 @@ public abstract class ElementWizardComposite extends Composite implements IListe
     /**
      * @since 3.2
      */
-    public WithRadios(Composite parent, int style, String productGroup, String label,
-        ValidationContext validationContext, String defaultFactoryType)
+    public WithRadios(Composite parent, int style, String productGroup, String label, ValidationContext validationContext, String defaultFactoryType)
     {
       super(parent, style, productGroup, label, validationContext, defaultFactoryType);
     }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardDialog.java
index 38f01662bc..f244ca9665 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardDialog.java
@@ -43,8 +43,7 @@ public class ElementWizardDialog extends TitleAreaDialog implements ValidationCo
 
   private ElementWizardComposite wizardComposite;
 
-  public ElementWizardDialog(Shell parentShell, String title, String toolTip, String productGroup,
-      String defaultFactoryType)
+  public ElementWizardDialog(Shell parentShell, String title, String toolTip, String productGroup, String defaultFactoryType)
   {
     super(parentShell);
     this.title = title;
@@ -106,8 +105,7 @@ public class ElementWizardDialog extends TitleAreaDialog implements ValidationCo
     composite.setLayoutData(new GridData(GridData.FILL_BOTH));
     composite.setLayout(new GridLayout(1, false));
 
-    wizardComposite = new ElementWizardComposite.WithRadios(composite, SWT.NONE, productGroup, "Type:", this,
-        defaultFactoryType)
+    wizardComposite = new ElementWizardComposite.WithRadios(composite, SWT.NONE, productGroup, "Type:", this, defaultFactoryType)
     {
       @Override
       public String getDefaultDescription(String factoryType)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java
index 4325e8ed41..c7e1e07ee7 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java
@@ -21,8 +21,8 @@ import org.eclipse.swt.widgets.Composite;
  */
 public interface IElementWizard
 {
-  public void create(Composite parent, IManagedContainer container, String productGroup, String factoryType,
-      String defaultDescription, ValidationContext context);
+  public void create(Composite parent, IManagedContainer container, String productGroup, String factoryType, String defaultDescription,
+      ValidationContext context);
 
   public String getResultDescription();
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/SafeHandler.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/SafeHandler.java
index f033f97586..d1906929d4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/SafeHandler.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/SafeHandler.java
@@ -68,8 +68,7 @@ public abstract class SafeHandler extends AbstractHandler
     catch (Exception ex)
     {
       OM.LOG.error(ex);
-      MessageDialog.openError(null, getText(),
-          ex.getLocalizedMessage() + "\n" + Messages.getString("SafeActionDelegate_0")); //$NON-NLS-1$ //$NON-NLS-2$
+      MessageDialog.openError(null, getText(), ex.getLocalizedMessage() + "\n" + Messages.getString("SafeActionDelegate_0")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     return result;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefIntegerAndDisable.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefIntegerAndDisable.java
index 8ee5362246..6922404677 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefIntegerAndDisable.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefIntegerAndDisable.java
@@ -25,8 +25,7 @@ public class PrefIntegerAndDisable extends TextAndDisable implements OMPreferenc
 
   private final OMPreference<Boolean> disabledPreference;
 
-  public PrefIntegerAndDisable(Composite parent, int textStyle, OMPreference<Integer> integerPreference,
-      OMPreference<Boolean> disabledPreference)
+  public PrefIntegerAndDisable(Composite parent, int textStyle, OMPreference<Integer> integerPreference, OMPreference<Boolean> disabledPreference)
   {
     super(parent, textStyle, null);
     this.integerPreference = integerPreference;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefTextAndDisable.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefTextAndDisable.java
index 44c86af1ee..38db2d5487 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefTextAndDisable.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/PrefTextAndDisable.java
@@ -25,8 +25,7 @@ public class PrefTextAndDisable extends TextAndDisable implements OMPreference.P
 
   private final OMPreference<Boolean> disabledPreference;
 
-  public PrefTextAndDisable(Composite parent, int textStyle, OMPreference<String> textPreference,
-      OMPreference<Boolean> disabledPreference)
+  public PrefTextAndDisable(Composite parent, int textStyle, OMPreference<String> textPreference, OMPreference<Boolean> disabledPreference)
   {
     super(parent, textStyle, null);
     this.textPreference = textPreference;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
index cd32b648ad..47b6df718f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
@@ -361,13 +361,11 @@ public class RegExContentProposalProvider implements IContentProposalProvider
           String epilog = fExpression.substring(fDocumentOffset);
           if (epilog.startsWith(postfix))
           {
-            fPriorityProposals.add(
-                new Proposal(proposal.substring(i, cursorPosition), displayString, additionalInfo, cursorPosition - i));
+            fPriorityProposals.add(new Proposal(proposal.substring(i, cursorPosition), displayString, additionalInfo, cursorPosition - i));
           }
           else
           {
-            fPriorityProposals
-                .add(new Proposal(proposal.substring(i), displayString, additionalInfo, cursorPosition - i));
+            fPriorityProposals.add(new Proposal(proposal.substring(i), displayString, additionalInfo, cursorPosition - i));
           }
           return;
         }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
index cc2be61ccb..c6a1e0b0ab 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
@@ -83,8 +83,7 @@ public class InteractiveCredentialsProvider implements IPasswordCredentialsProvi
   /**
    * @since 3.4
    */
-  public IPasswordCredentialsUpdate getCredentialsUpdate(final String realm, final String userID,
-      final CredentialsUpdateOperation operation)
+  public IPasswordCredentialsUpdate getCredentialsUpdate(final String realm, final String userID, final CredentialsUpdateOperation operation)
   {
     final IPasswordCredentialsUpdate[] update = { null };
     final Display display = UIUtil.getDisplay();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
index 40c21a4b85..71157d4cde 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
@@ -24,8 +24,7 @@ import java.util.Map;
  * @author Eike Stepper
  */
 @Deprecated
-public class ContainerPathItemProvider<CONTAINER extends IContainer<Object>> extends ContainerItemProvider<CONTAINER>
-    implements ITreePathContentProvider
+public class ContainerPathItemProvider<CONTAINER extends IContainer<Object>> extends ContainerItemProvider<CONTAINER> implements ITreePathContentProvider
 {
   private Map<Object, List<TreePath>> parents = new HashMap<Object, List<TreePath>>();
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
index a09f82526e..a0b4e6cf9d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
@@ -198,8 +198,7 @@ public abstract class MasterDetailsView extends MultiViewersView
     }
 
     // Temporarily remember old values
-    String oldDetailTitle = detailItems == null || currentDetailIndex < 0 ? null
-        : detailItems[currentDetailIndex].getText();
+    String oldDetailTitle = detailItems == null || currentDetailIndex < 0 ? null : detailItems[currentDetailIndex].getText();
     StructuredViewer[] oldDetails = details;
     CTabItem[] oldDetailItems = detailItems;
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
index fc89db7b73..0ebe77b1fb 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
@@ -47,8 +47,7 @@ public abstract class BaseDialog<VIEWER extends Viewer> extends TitleAreaDialog
   /**
    * @since 3.4
    */
-  public BaseDialog(Shell parentShell, int shellStyle, String title, String message, IDialogSettings settings,
-      ImageDescriptor descriptor)
+  public BaseDialog(Shell parentShell, int shellStyle, String title, String message, IDialogSettings settings, ImageDescriptor descriptor)
   {
     super(parentShell);
     setShellStyle(shellStyle);
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
index 72e7a9656d..314eab9f4f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
@@ -41,8 +41,7 @@ public class HistoryTextDialog extends InputDialog
 
   private HistoryText historyText;
 
-  public HistoryTextDialog(Shell parentShell, String dialogTitle, String dialogMessage, IHistory<String> history,
-      IInputValidator validator)
+  public HistoryTextDialog(Shell parentShell, String dialogTitle, String dialogMessage, IHistory<String> history, IInputValidator validator)
   {
     super(parentShell, dialogTitle, dialogMessage, history.getMostRecent(), validator);
     this.history = history;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
index cc213ce4c2..2fac765856 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
@@ -159,8 +159,7 @@ public class SearchField extends Composite
   {
     private final PatternFilter patternFilter;
 
-    private InternalTree(Composite parent, int treeStyle, PatternFilter filter, boolean useNewLook,
-        PatternFilter patternFilter)
+    private InternalTree(Composite parent, int treeStyle, PatternFilter filter, boolean useNewLook, PatternFilter patternFilter)
     {
       super(parent, treeStyle, filter, useNewLook);
       this.patternFilter = patternFilter;
@@ -172,8 +171,7 @@ public class SearchField extends Composite
     {
       ReflectUtil.setValue(patternFilterField, this, filter);
 
-      showFilterControls = PlatformUI.getPreferenceStore()
-          .getBoolean(IWorkbenchPreferenceConstants.SHOW_FILTERED_TEXTS);
+      showFilterControls = PlatformUI.getPreferenceStore().getBoolean(IWorkbenchPreferenceConstants.SHOW_FILTERED_TEXTS);
       createControl(SearchField.this, treeStyle);
 
       Job refreshJob = new Job("Refresh Filter")
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
index f4a56bc04a..ac8a417390 100644
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
@@ -386,7 +386,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
index ff29749f8f..7c1cd99ff1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
@@ -204,15 +204,13 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
 
   private void doActivateOSGi() throws Exception
   {
-    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform
-        .getExtensionRegistry();
+    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform.getExtensionRegistry();
     if (extensionRegistry == null)
     {
       return;
     }
 
-    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE,
-        EXT_POINT);
+    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE, EXT_POINT);
     for (org.eclipse.core.runtime.IConfigurationElement element : elements)
     {
       IElementProcessor processor = (IElementProcessor)element.createExecutableExtension(ATTR_CLASS);
@@ -238,14 +236,12 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
 
   private void doDeactivateOSGi()
   {
-    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform
-        .getExtensionRegistry();
+    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform.getExtensionRegistry();
     if (extensionRegistry == null)
     {
       return;
     }
 
-    extensionRegistry
-        .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
+    extensionRegistry.removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
index 9a42f83477..68981da6c8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
@@ -96,15 +96,13 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
 
   private void doActivateOSGi()
   {
-    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform
-        .getExtensionRegistry();
+    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform.getExtensionRegistry();
     if (extensionRegistry == null)
     {
       return;
     }
 
-    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE,
-        EXT_POINT);
+    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE, EXT_POINT);
     for (org.eclipse.core.runtime.IConfigurationElement element : elements)
     {
       registerFactory(new FactoryDescriptor(element));
@@ -129,14 +127,12 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
 
   private void doDeactivateOSGi()
   {
-    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform
-        .getExtensionRegistry();
+    org.eclipse.core.runtime.IExtensionRegistry extensionRegistry = org.eclipse.core.runtime.Platform.getExtensionRegistry();
     if (extensionRegistry == null)
     {
       return;
     }
 
-    extensionRegistry
-        .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
+    extensionRegistry.removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/Dumper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/Dumper.java
index 1cc3fec927..260cd2d7d9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/Dumper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/Dumper.java
@@ -21,8 +21,8 @@ public class Dumper
 {
   public static final Dumper ASCII = new Dumper();
 
-  public static final Dumper UTF8 = new Dumper('\u2500', '\u2534', '\u252c', '\u253c', '\u2518', '\u2510', '\u2524',
-      '\u2502', '\u251c', '\u2514', '\u250c', "\n", " ");
+  public static final Dumper UTF8 = new Dumper('\u2500', '\u2534', '\u252c', '\u253c', '\u2518', '\u2510', '\u2524', '\u2502', '\u251c', '\u2514', '\u250c',
+      "\n", " ");
 
   public final char borderLeftRight;
 
@@ -52,9 +52,8 @@ public class Dumper
 
   public final String paddingBorder;
 
-  public Dumper(char borderLeftRight, char borderLeftRightUp, char borderLeftRightDown, char borderLeftRightUpDown,
-      char borderLeftUp, char borderLeftDown, char borderLeftUpDown, char borderUpDown, char borderUpDownRight,
-      char borderUpRight, char borderDownRight, String newLine, String padding)
+  public Dumper(char borderLeftRight, char borderLeftRightUp, char borderLeftRightDown, char borderLeftRightUpDown, char borderLeftUp, char borderLeftDown,
+      char borderLeftUpDown, char borderUpDown, char borderUpDownRight, char borderUpRight, char borderDownRight, String newLine, String padding)
   {
     this.borderLeftRight = borderLeftRight;
     this.borderLeftRightUp = borderLeftRightUp;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/RectangularRange.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/RectangularRange.java
index 4d002f1158..1fe441fa10 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/RectangularRange.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/table/RectangularRange.java
@@ -102,8 +102,8 @@ public class RectangularRange extends AbstractRange
     if (range instanceof RectangularRange)
     {
       RectangularRange rect = (RectangularRange)range;
-      return topLeft.col <= rect.topLeft.col && rect.bottomRight.col <= bottomRight.col
-          && topLeft.row <= rect.topLeft.row && rect.bottomRight.row <= bottomRight.row;
+      return topLeft.col <= rect.topLeft.col && rect.bottomRight.col <= bottomRight.col && topLeft.row <= rect.topLeft.row
+          && rect.bottomRight.row <= bottomRight.row;
     }
 
     return super.contains(range);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AdapterUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AdapterUtil.java
index cb9e22f750..871c938994 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AdapterUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AdapterUtil.java
@@ -112,8 +112,7 @@ public final class AdapterUtil
    */
   private static final class AdapterManagerHelper
   {
-    private static org.eclipse.core.runtime.IAdapterManager adapterManager = org.eclipse.core.runtime.Platform
-        .getAdapterManager();
+    private static org.eclipse.core.runtime.IAdapterManager adapterManager = org.eclipse.core.runtime.Platform.getAdapterManager();
 
     public static Object adapt(Object object, Class<?> type)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
index 9c0e8b5192..881c200e3b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
@@ -32,8 +32,7 @@ public final class CheckUtil
   /**
    * @since 3.7
    */
-  public static final boolean SANITIZE_TIMEOUT = OMPlatform.INSTANCE
-      .isProperty("org.eclipse.net4j.util.CheckUtil.sanitizeTimeout", HAS_DEBUGGER_ATTACHED);
+  public static final boolean SANITIZE_TIMEOUT = OMPlatform.INSTANCE.isProperty("org.eclipse.net4j.util.CheckUtil.sanitizeTimeout", HAS_DEBUGGER_ATTACHED);
 
   private static final long ONE_DAY = 1000 * 60 * 60 * 24;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
index 24f7cee73d..7b132e3462 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
@@ -25,8 +25,7 @@ import java.io.Writer;
  */
 public final class HexUtil
 {
-  public static final char DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
-      'f', };
+  public static final char DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', };
 
   private HexUtil()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
index 80a1167881..e2fb21b715 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -385,9 +385,8 @@ public final class ReflectUtil
     return result;
   }
 
-  public static Object instantiate(Map<Object, Object> properties, String namespace, String classKey,
-      ClassLoader classLoader) throws ClassNotFoundException, InstantiationException, IllegalAccessException,
-      IllegalArgumentException, InvocationTargetException
+  public static Object instantiate(Map<Object, Object> properties, String namespace, String classKey, ClassLoader classLoader)
+      throws ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
   {
     if (namespace != null)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
index 535e4194bf..693c3b5cb9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
@@ -332,8 +332,7 @@ public final class StringUtil
     return globRecurse(pattern, 0, string, 0, subStrings, 0);
   }
 
-  private static boolean globRecurse(String pattern, int patternIndex, String string, int stringIndex,
-      String[] subStrings, int subStringsIndex)
+  private static boolean globRecurse(String pattern, int patternIndex, String string, int stringIndex, String[] subStrings, int subStringsIndex)
   {
     int patternLength = pattern.length();
     int stringLength = string.length();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
index 963097d598..38e34101fb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
@@ -133,10 +133,9 @@ public final class UUIDGenerator
     return uuid;
   }
 
-  private static final char[] BASE64_DIGITS = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-      'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
-      'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
-      '8', '9', '-', '_' };
+  private static final char[] BASE64_DIGITS = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+      'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0',
+      '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_' };
 
   private static final byte[] BASE64_INDEX;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/XMLUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/XMLUtil.java
index 96dd17b012..6df4c6ad37 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/XMLUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/XMLUtil.java
@@ -75,8 +75,7 @@ public final class XMLUtil
     return handleElements(childNodes, handler);
   }
 
-  public static int handleElementsByTagName(Element rootElement, String tagName, ElementHandler handler)
-      throws Exception
+  public static int handleElementsByTagName(Element rootElement, String tagName, ElementHandler handler) throws Exception
   {
     int count = 0;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
index 1782d1cb50..d53c9fbd9c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
@@ -21,8 +21,7 @@ public class HysteresisConditionPolicy extends ThresholdConditionPolicy
 
   private long thresholdGreenYellow;
 
-  public HysteresisConditionPolicy(long thresholdYellowRed, long thresholdRedYellow, long thresholdGreenYellow,
-      long thresholdYellowGreen)
+  public HysteresisConditionPolicy(long thresholdYellowRed, long thresholdRedYellow, long thresholdGreenYellow, long thresholdYellowGreen)
   {
     super(thresholdRedYellow, thresholdYellowGreen);
     if (thresholdYellowRed > thresholdRedYellow)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/DelegatingExecutorService.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/DelegatingExecutorService.java
index ebf9f3103d..5217122ebe 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/DelegatingExecutorService.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/DelegatingExecutorService.java
@@ -83,8 +83,7 @@ public class DelegatingExecutorService implements ExecutorService
     return delegate.invokeAll(tasks);
   }
 
-  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
-      throws InterruptedException
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException
   {
     return delegate.invokeAll(tasks, timeout, unit);
   }
@@ -94,8 +93,7 @@ public class DelegatingExecutorService implements ExecutorService
     return delegate.invokeAny(tasks);
   }
 
-  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
-      throws InterruptedException, ExecutionException, TimeoutException
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
   {
     return delegate.invokeAny(tasks, timeout, unit);
   }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
index 681d60dc0c..2b22a3c13f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
@@ -42,66 +42,65 @@ public class ExecutorServiceFactory extends Factory
   {
     final ExecutorService executorService = ThreadPool.create(description);
 
-    return LifecycleUtil.delegateLifecycle(getClass().getClassLoader(), executorService, ExecutorService.class,
-        new ILifecycle()
+    return LifecycleUtil.delegateLifecycle(getClass().getClassLoader(), executorService, ExecutorService.class, new ILifecycle()
+    {
+      private boolean active;
+
+      public void activate() throws LifecycleException
+      {
+        active = true;
+      }
+
+      public Exception deactivate()
+      {
+        try
         {
-          private boolean active;
-
-          public void activate() throws LifecycleException
-          {
-            active = true;
-          }
-
-          public Exception deactivate()
-          {
-            try
-            {
-              executorService.shutdown();
-              active = false;
-              return null;
-            }
-            catch (Exception ex)
-            {
-              return ex;
-            }
-          }
-
-          public LifecycleState getLifecycleState()
-          {
-            return active ? LifecycleState.ACTIVE : LifecycleState.INACTIVE;
-          }
-
-          public boolean isActive()
-          {
-            return active;
-          }
-
-          public void addListener(IListener listener)
-          {
-            // Do nothing
-          }
-
-          public void removeListener(IListener listener)
-          {
-            // Do nothing
-          }
-
-          public IListener[] getListeners()
-          {
-            return EventUtil.NO_LISTENERS;
-          }
-
-          public boolean hasListeners()
-          {
-            return false;
-          }
-
-          @Override
-          public String toString()
-          {
-            return "CachedThreadPool";
-          }
-        });
+          executorService.shutdown();
+          active = false;
+          return null;
+        }
+        catch (Exception ex)
+        {
+          return ex;
+        }
+      }
+
+      public LifecycleState getLifecycleState()
+      {
+        return active ? LifecycleState.ACTIVE : LifecycleState.INACTIVE;
+      }
+
+      public boolean isActive()
+      {
+        return active;
+      }
+
+      public void addListener(IListener listener)
+      {
+        // Do nothing
+      }
+
+      public void removeListener(IListener listener)
+      {
+        // Do nothing
+      }
+
+      public IListener[] getListeners()
+      {
+        return EventUtil.NO_LISTENERS;
+      }
+
+      public boolean hasListeners()
+      {
+        return false;
+      }
+
+      @Override
+      public String toString()
+      {
+        return "CachedThreadPool";
+      }
+    });
   }
 
   public static ExecutorService get(IManagedContainer container)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
index 8a1803e778..733166803d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
@@ -26,8 +26,7 @@ public interface IRWLockManager<OBJECT, CONTEXT>
 
   public static final int NO_WAIT = 1;
 
-  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout)
-      throws InterruptedException;
+  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout) throws InterruptedException;
 
   public void lock(LockType type, CONTEXT context, OBJECT objectToLock, long timeout) throws InterruptedException;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
index 53a98d21f7..304288a2cd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
@@ -27,14 +27,13 @@ public interface IRWOLockManager<OBJECT, CONTEXT> extends IRWLockManager<OBJECT,
   /**
    * Adds locks of the given type, owned by the given context on the given objects.
    */
-  public List<LockState<OBJECT, CONTEXT>> lock2(LockType type, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLock, long timeout) throws InterruptedException;
+  public List<LockState<OBJECT, CONTEXT>> lock2(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout)
+      throws InterruptedException;
 
   /**
    * Removes all locks of the given type, owned by the given context on the given objects.
    */
-  public List<LockState<OBJECT, CONTEXT>> unlock2(LockType type, CONTEXT context,
-      Collection<? extends OBJECT> objectsToUnlock);
+  public List<LockState<OBJECT, CONTEXT>> unlock2(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToUnlock);
 
   /**
    * Removes all locks owned by the given context on any objects.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
index 7301f0327d..d85e62a660 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
@@ -112,8 +112,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
   /**
    * @since 3.0
    */
-  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout)
-      throws InterruptedException
+  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout) throws InterruptedException
   {
     LockStrategy<OBJECT, CONTEXT> lockingStrategy = getLockingStrategy(type);
     lock(lockingStrategy, context, objectsToLock, timeout);
@@ -271,8 +270,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
    * @throws IllegalMonitorStateException
    *           Unlocking object not locked.
    */
-  private void unlock(LockStrategy<OBJECT, CONTEXT> lockingStrategy, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLock)
+  private void unlock(LockStrategy<OBJECT, CONTEXT> lockingStrategy, CONTEXT context, Collection<? extends OBJECT> objectsToLock)
   {
     synchronized (lockChanged)
     {
@@ -319,8 +317,8 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
     return entry != null && lockingStrategy.isLocked(entry, context);
   }
 
-  private void lock(LockStrategy<OBJECT, CONTEXT> lockStrategy, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLocks, long timeout) throws InterruptedException
+  private void lock(LockStrategy<OBJECT, CONTEXT> lockStrategy, CONTEXT context, Collection<? extends OBJECT> objectsToLocks, long timeout)
+      throws InterruptedException
   {
     long startTime = System.currentTimeMillis();
     while (true)
@@ -352,8 +350,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
     }
   }
 
-  private OBJECT obtainLock(LockStrategy<OBJECT, CONTEXT> lockingStrategy, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLock)
+  private OBJECT obtainLock(LockStrategy<OBJECT, CONTEXT> lockingStrategy, CONTEXT context, Collection<? extends OBJECT> objectsToLock)
   {
     List<LockEntry<OBJECT, CONTEXT>> lockEntrys = new ArrayList<LockEntry<OBJECT, CONTEXT>>();
     for (OBJECT objectToLock : objectsToLock)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
index 54da47ae52..26a2acc620 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
@@ -55,14 +55,13 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
    */
   private final Map<CONTEXT, Set<LockState<OBJECT, CONTEXT>>> contextToLockStates = createContextToLocksMap();
 
-  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout)
-      throws InterruptedException
+  public void lock(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout) throws InterruptedException
   {
     lock2(type, context, objectsToLock, timeout);
   }
 
-  public List<LockState<OBJECT, CONTEXT>> lock2(LockType type, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLock, long timeout) throws InterruptedException
+  public List<LockState<OBJECT, CONTEXT>> lock2(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock, long timeout)
+      throws InterruptedException
   {
     if (objectsToLock.isEmpty())
     {
@@ -113,20 +112,17 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
     unlock2(type, context, objectsToUnlock);
   }
 
-  public synchronized List<LockState<OBJECT, CONTEXT>> unlock2(CONTEXT context,
-      Collection<? extends OBJECT> objectsToUnlock)
+  public synchronized List<LockState<OBJECT, CONTEXT>> unlock2(CONTEXT context, Collection<? extends OBJECT> objectsToUnlock)
   {
     return unlock2(LockType.values(), context, objectsToUnlock);
   }
 
-  public synchronized List<LockState<OBJECT, CONTEXT>> unlock2(LockType type, CONTEXT context,
-      Collection<? extends OBJECT> objectsToUnlock)
+  public synchronized List<LockState<OBJECT, CONTEXT>> unlock2(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToUnlock)
   {
     return unlock2(new LockType[] { type }, context, objectsToUnlock);
   }
 
-  private List<LockState<OBJECT, CONTEXT>> unlock2(LockType[] types, CONTEXT context,
-      Collection<? extends OBJECT> objectsToUnlock)
+  private List<LockState<OBJECT, CONTEXT>> unlock2(LockType[] types, CONTEXT context, Collection<? extends OBJECT> objectsToUnlock)
   {
     if (objectsToUnlock.isEmpty())
     {
@@ -350,8 +346,7 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
     return lockState;
   }
 
-  private ArrayList<LockState<OBJECT, CONTEXT>> getLockStatesForContext(LockType type, CONTEXT context,
-      Collection<? extends OBJECT> objectsToLock)
+  private ArrayList<LockState<OBJECT, CONTEXT>> getLockStatesForContext(LockType type, CONTEXT context, Collection<? extends OBJECT> objectsToLock)
   {
     ArrayList<LockState<OBJECT, CONTEXT>> lockStates = new ArrayList<LockState<OBJECT, CONTEXT>>(objectsToLock.size());
     Iterator<? extends OBJECT> it = objectsToLock.iterator();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
index e2d925b815..99f62cb2c5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
@@ -19,8 +19,8 @@ import org.eclipse.net4j.util.om.OMPlatform;
  */
 public abstract class RunnableWithName implements Runnable
 {
-  private static final boolean DISABLE_RUNNABLE_NAMES = Boolean.parseBoolean(
-      OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.concurrent.DISABLE_RUNNABLE_NAMES", "false"));
+  private static final boolean DISABLE_RUNNABLE_NAMES = Boolean
+      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.concurrent.DISABLE_RUNNABLE_NAMES", "false"));
 
   public final void run()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
index 698932b73c..57b5d2d7cf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
@@ -18,8 +18,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class SynchronizingCorrelator<CORRELATION, RESULT> implements ICorrelator<CORRELATION, ISynchronizer<RESULT>>
 {
-  private ConcurrentMap<CORRELATION, ISynchronizer<RESULT>> map = new ConcurrentHashMap<CORRELATION, ISynchronizer<RESULT>>(
-      0);
+  private ConcurrentMap<CORRELATION, ISynchronizer<RESULT>> map = new ConcurrentHashMap<CORRELATION, ISynchronizer<RESULT>>(0);
 
   /**
    * @since 3.0
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
index d07c06af77..77d8d9ac69 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
@@ -73,8 +73,7 @@ public interface IConfirmationProvider
           return false;
         }
 
-        public Confirmation confirm(String subject, String message, Set<Confirmation> acceptable,
-            Confirmation suggestion)
+        public Confirmation confirm(String subject, String message, Set<Confirmation> acceptable, Confirmation suggestion)
         {
           // Just return the suggestion, or else the greatest of the acceptable set
           return suggestion != null ? suggestion : max(acceptable);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
index cab2c5d830..051c32ff47 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
@@ -17,6 +17,5 @@ package org.eclipse.net4j.util.container;
  */
 public interface IElementProcessor
 {
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element);
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element);
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
index 8ecfbae334..65336f36fd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
@@ -61,8 +61,7 @@ public interface IManagedContainer extends IContainer<Object>, ILifecycle
 
   public Object[] getElements(String productGroup, String factoryType);
 
-  public Object getElement(String productGroup, String factoryType, String description)
-      throws FactoryNotFoundException, ProductCreationException;
+  public Object getElement(String productGroup, String factoryType, String description) throws FactoryNotFoundException, ProductCreationException;
 
   /**
    * @since 2.0
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
index 4ef445dabb..cd04a82ded 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
@@ -93,15 +93,13 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
       factoryRegistry.addListener(new ContainerEventAdapter<Map.Entry<IFactoryKey, IFactory>>()
       {
         @Override
-        protected void onAdded(IContainer<Map.Entry<IFactoryKey, IFactory>> container,
-            Map.Entry<IFactoryKey, IFactory> entry)
+        protected void onAdded(IContainer<Map.Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> entry)
         {
           updateFactory(entry, ManagedContainer.this);
         }
 
         @Override
-        protected void onRemoved(IContainer<Map.Entry<IFactoryKey, IFactory>> container,
-            Map.Entry<IFactoryKey, IFactory> entry)
+        protected void onRemoved(IContainer<Map.Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> entry)
         {
           updateFactory(entry, null);
         }
@@ -285,8 +283,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
     {
       ElementKey key = entry.getKey();
-      if (ObjectUtil.equals(key.getProductGroup(), productGroup)
-          && ObjectUtil.equals(key.getFactoryType(), factoryType))
+      if (ObjectUtil.equals(key.getProductGroup(), productGroup) && ObjectUtil.equals(key.getFactoryType(), factoryType))
       {
         result.add(entry.getValue());
       }
@@ -295,8 +292,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     return result.toArray();
   }
 
-  public Object getElement(String productGroup, String factoryType, String description)
-      throws FactoryNotFoundException, ProductCreationException
+  public Object getElement(String productGroup, String factoryType, String description) throws FactoryNotFoundException, ProductCreationException
   {
     return getElement(productGroup, factoryType, description, true);
   }
@@ -566,8 +562,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     }
   }
 
-  protected Object createElement(String productGroup, String factoryType, String description)
-      throws FactoryNotFoundException, ProductCreationException
+  protected Object createElement(String productGroup, String factoryType, String description) throws FactoryNotFoundException, ProductCreationException
   {
     IFactory factory = getFactory(productGroup, factoryType);
     return factory.create(description);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index ed7dcf32ba..6e309a9b9b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -56,8 +56,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
   private ITransition<STATE, EVENT, SUBJECT, ?>[][] transitions;
 
   @SuppressWarnings("unchecked")
-  public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum,
-      ITransition<STATE, EVENT, SUBJECT, ?> defaultTransition)
+  public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum, ITransition<STATE, EVENT, SUBJECT, ?> defaultTransition)
   {
     states = stateEnum.getEnumConstants();
     events = eventEnum.getEnumConstants();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
index 05e761a2a7..d8877c3038 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -573,8 +573,7 @@ public final class IOUtil
       int bytesRead = inputStream.read(buffer, 0, bytesToCopy);
       if (bytesRead < 1)
       {
-        throw new EOFException("Read only " + (size - remaining) + "+" + bytesRead + "="
-            + (size - remaining + bytesRead) + "  but expected to read " + size);
+        throw new EOFException("Read only " + (size - remaining) + "+" + bytesRead + "=" + (size - remaining + bytesRead) + "  but expected to read " + size);
       }
 
       outputStream.write(buffer, 0, bytesRead);
@@ -626,8 +625,7 @@ public final class IOUtil
       int charsRead = reader.read(buffer, 0, charsToCopy);
       if (charsRead < 1)
       {
-        throw new EOFException("Read only " + (size - remaining) + "+" + charsRead + "="
-            + (size - remaining + charsRead) + "  but expected to read " + size);
+        throw new EOFException("Read only " + (size - remaining) + "+" + charsRead + "=" + (size - remaining + charsRead) + "  but expected to read " + size);
       }
 
       writer.write(buffer, 0, charsRead);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index 8a2a3cffa4..0dde04413c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -302,8 +302,7 @@ public final class LifecycleUtil
           if (annotation != null)
           {
             invokeMethod(object, method);
-            boolean propagate = annotationClass == Activator.class ? ((Activator)annotation).propagate()
-                : ((Deactivator)annotation).propagate();
+            boolean propagate = annotationClass == Activator.class ? ((Activator)annotation).propagate() : ((Deactivator)annotation).propagate();
             if (!propagate)
             {
               break;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
index 6964dfaf76..99d652de73 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
@@ -23,8 +23,7 @@ import java.util.TimerTask;
  */
 public abstract class AbstractMonitor implements OMMonitor
 {
-  private static final boolean CHECK_BEGIN = Boolean
-      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.om.monitor.CheckBegin", "false"));
+  private static final boolean CHECK_BEGIN = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.om.monitor.CheckBegin", "false"));
 
   private static final long NOT_BEGUN = -1;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
index c79c4693e0..cd2279e43b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
@@ -133,8 +133,7 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
 
   private int forkTicks;
 
-  ProbingSubMonitor(ProbingSubMonitor parent, RootInfo rootInfo, int totalWork, int availableToChildren, int flags,
-      boolean full)
+  ProbingSubMonitor(ProbingSubMonitor parent, RootInfo rootInfo, int totalWork, int availableToChildren, int flags, boolean full)
   {
     super(rootInfo, totalWork, availableToChildren, flags | (full ? FULL_MODE : 0));
     this.parent = parent;
@@ -501,8 +500,7 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
 
     private static final int DEFAULT_COLUMNS = 3;
 
-    private static final boolean SMOOTH_BORDERS = "smooth"
-        .equalsIgnoreCase(OMPlatform.INSTANCE.getProperty("submonitor.probing.borders"));
+    private static final boolean SMOOTH_BORDERS = "smooth".equalsIgnoreCase(OMPlatform.INSTANCE.getProperty("submonitor.probing.borders"));
 
     private static final Dumper DUMPER = SMOOTH_BORDERS ? Dumper.UTF8 : Dumper.ASCII;
 
@@ -655,8 +653,7 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
           }
           else
           {
-            if (forkTargets.length != 1 || probe.forkTargets.length != 1
-                || !forkTargets[0].equals(probe.forkTargets[0]))
+            if (forkTargets.length != 1 || probe.forkTargets.length != 1 || !forkTargets[0].equals(probe.forkTargets[0]))
             {
               Set<StackTraceElement> set = new HashSet<StackTraceElement>();
               set.addAll(Arrays.asList(forkTargets));
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
index b9f690a13d..4c18f40a3e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
@@ -31,8 +31,7 @@ public abstract class ProgressDistributor
   {
   }
 
-  public final <CONTEXT> void run(ProgressDistributable<CONTEXT>[] distributables, CONTEXT context, OMMonitor monitor)
-      throws RuntimeException, WrappedException
+  public final <CONTEXT> void run(ProgressDistributable<CONTEXT>[] distributables, CONTEXT context, OMMonitor monitor) throws RuntimeException, WrappedException
   {
     double[] distributionCopy;
     synchronized (this)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/SubMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/SubMonitor.java
index 1926c46aa5..629981a92b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/SubMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/SubMonitor.java
@@ -444,8 +444,7 @@ public class SubMonitor implements IProgressMonitorWithBlocking
   private static SubMonitor createProbingSubMonitor(IProgressMonitor monitor, int availableToChildren, boolean full)
   {
     ProbingSubMonitor parent = monitor instanceof ProbingSubMonitor ? (ProbingSubMonitor)monitor : null;
-    return new ProbingSubMonitor(parent, new RootInfo(monitor), MINIMUM_RESOLUTION, availableToChildren, SUPPRESS_NONE,
-        full);
+    return new ProbingSubMonitor(parent, new RootInfo(monitor), MINIMUM_RESOLUTION, availableToChildren, SUPPRESS_NONE, full);
   }
 
   public final SubMonitor detectCancelation()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
index 6ef480cc10..32f6591afb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
@@ -137,7 +137,7 @@ public class PrintTraceHandler implements OMTraceHandler
     final int threadPriority = thread.getPriority();
     final Thread.State threadState = thread.getState();
 
-    return MessageFormat.format(pattern, tracerName, tracerShort, contextName, contextShort, timeStamp, message,
-        threadName, threadID, threadPriority, threadState);
+    return MessageFormat.format(pattern, tracerName, tracerShort, contextName, contextShort, timeStamp, message, threadName, threadID, threadPriority,
+        threadState);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
index 413d86d407..7fc2d9dfa8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
@@ -34,8 +34,7 @@ public class Tracer implements OMTracer
    */
   public static final String PROP_DISABLE_TRACING_OPTIONS = "org.eclipse.net4j.util.om.trace.disable.options";
 
-  private static final boolean isGloballyDisabled = Boolean
-      .valueOf(OMPlatform.INSTANCE.getProperty(PROP_DISABLE_TRACING, Boolean.FALSE.toString()));
+  private static final boolean isGloballyDisabled = Boolean.valueOf(OMPlatform.INSTANCE.getProperty(PROP_DISABLE_TRACING, Boolean.FALSE.toString()));
 
   private OMBundle bundle;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
index fea857b823..1e6dc7f906 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
@@ -19,9 +19,8 @@ import java.lang.ref.WeakReference;
  */
 public class Interner<E>
 {
-  private static final int[] PRIME_CAPACITIES = new int[] { 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411,
-      32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757,
-      268435459, 536870923, 1073741827, 2147483629 };
+  private static final int[] PRIME_CAPACITIES = new int[] { 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411, 32771, 65537, 131101, 262147, 524309,
+      1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459, 536870923, 1073741827, 2147483629 };
 
   private int size;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
index 1610be0f77..4ea080798d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
@@ -94,8 +94,7 @@ public class ChallengeNegotiator extends ChallengeResponseNegotiator
   {
     try
     {
-      return userManager.encrypt(userID, token, getEncryptionAlgorithmName(), getEncryptionSaltBytes(),
-          getEncryptionIterationCount());
+      return userManager.encrypt(userID, token, getEncryptionAlgorithmName(), getEncryptionSaltBytes(), getEncryptionIterationCount());
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
index de5ae8a265..7afecfa3ca 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
@@ -22,8 +22,7 @@ public class ChallengeNegotiatorConfigurer implements IElementProcessor
   {
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof ChallengeNegotiator)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
index c184790b59..082208953f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
@@ -18,8 +18,7 @@ import java.nio.ByteBuffer;
 /**
  * @author Eike Stepper
  */
-public abstract class ChallengeResponseNegotiator extends Negotiator<IChallengeResponse.State, IChallengeResponse.Event>
-    implements IChallengeResponse
+public abstract class ChallengeResponseNegotiator extends Negotiator<IChallengeResponse.State, IChallengeResponse.Event> implements IChallengeResponse
 {
   private String encryptionAlgorithmName = SecurityUtil.PBE_WITH_MD5_AND_DES;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
index 03865839f9..8729dec812 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
@@ -324,21 +324,17 @@ public class DiffieHellman
     /**
      * The 1024 bit Diffie-Hellman modulus values used by SKIP
      */
-    private static final byte skip1024ModulusBytes[] = { (byte)0xF4, (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-        (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91, (byte)0x07,
-        (byte)0x36, (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-        (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E, (byte)0xF6,
-        (byte)0xF3, (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-        (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38, (byte)0xD3,
-        (byte)0x34, (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-        (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF, (byte)0x3C,
-        (byte)0xE1, (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-        (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19, (byte)0xC8,
-        (byte)0x07, (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-        (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3, (byte)0x08,
-        (byte)0x3D, (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-        (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2, (byte)0x5E,
-        (byte)0xC3, (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78, (byte)0xC7 };
+    private static final byte skip1024ModulusBytes[] = { (byte)0xF4, (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB, (byte)0xCD,
+        (byte)0x20, (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38, (byte)0x0D,
+        (byte)0x45, (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E, (byte)0xF6,
+        (byte)0xF3, (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E, (byte)0xBB,
+        (byte)0x55, (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57, (byte)0x43,
+        (byte)0xA3, (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF, (byte)0x3C,
+        (byte)0xE1, (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A, (byte)0x72,
+        (byte)0xD6, (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95, (byte)0x0C,
+        (byte)0xD9, (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3, (byte)0x08,
+        (byte)0x3D, (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B, (byte)0x22,
+        (byte)0x19, (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78, (byte)0xC7 };
 
     /**
      * The SKIP 1024 bit modulus
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdateProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdateProvider.java
index 2aba0866f0..58013cd7ac 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdateProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdateProvider.java
@@ -20,6 +20,5 @@ public interface IPasswordCredentialsUpdateProvider
 {
   public IPasswordCredentialsUpdate getCredentialsUpdate(String userID, CredentialsUpdateOperation operation);
 
-  public IPasswordCredentialsUpdate getCredentialsUpdate(String realm, String userID,
-      CredentialsUpdateOperation operation);
+  public IPasswordCredentialsUpdate getCredentialsUpdate(String realm, String userID, CredentialsUpdateOperation operation);
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java
index 7a58f3325f..9d6ed043ca 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java
@@ -22,6 +22,5 @@ public interface IUserManager
   /**
    * @since 2.0
    */
-  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count)
-      throws SecurityException;
+  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count) throws SecurityException;
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
index a32abd3762..53e0985da0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
@@ -17,8 +17,8 @@ import java.nio.ByteBuffer;
 /**
  * @author Eike Stepper
  */
-public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>>
-    extends FiniteStateMachine<STATE, EVENT, INegotiationContext> implements INegotiator, INegotiationContext.Receiver
+public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>> extends FiniteStateMachine<STATE, EVENT, INegotiationContext>
+    implements INegotiator, INegotiationContext.Receiver
 {
   private transient STATE initialState;
 
@@ -32,8 +32,8 @@ public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>>
 
   private boolean initiator;
 
-  public Negotiator(Class<STATE> stateEnum, Class<EVENT> eventEnum, STATE initialState, STATE successState,
-      STATE failureState, EVENT startEvent, EVENT bufferEvent, boolean initiator)
+  public Negotiator(Class<STATE> stateEnum, Class<EVENT> eventEnum, STATE initialState, STATE successState, STATE failureState, EVENT startEvent,
+      EVENT bufferEvent, boolean initiator)
   {
     super(stateEnum, eventEnum);
     if (initialState == null)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
index edba24a75c..7c7d48138c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
@@ -84,8 +84,7 @@ public class ResponseNegotiator extends ChallengeResponseNegotiator
   {
     try
     {
-      return SecurityUtil.encrypt(token, password, getEncryptionAlgorithmName(), getEncryptionSaltBytes(),
-          getEncryptionIterationCount());
+      return SecurityUtil.encrypt(token, password, getEncryptionAlgorithmName(), getEncryptionSaltBytes(), getEncryptionIterationCount());
     }
     catch (RuntimeException ex)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
index 395caded7b..db9935083d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
@@ -31,8 +31,7 @@ public abstract class ResponseNegotiatorInjector implements IElementProcessor
     return negotiator;
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof INegotiatorAware)
     {
@@ -52,6 +51,5 @@ public abstract class ResponseNegotiatorInjector implements IElementProcessor
     return element;
   }
 
-  protected abstract boolean filterElement(String productGroup, String factoryType, String description,
-      INegotiatorAware negotiatorAware);
+  protected abstract boolean filterElement(String productGroup, String factoryType, String description, INegotiatorAware negotiatorAware);
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
index 8a14ae6fd7..c1d3d9bbde 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
@@ -34,8 +34,7 @@ public final class SecurityUtil
   /**
    * @since 2.0
    */
-  public static final byte[] DEFAULT_SALT = { (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c, (byte)0x7e, (byte)0xc8,
-      (byte)0xee, (byte)0x99 };
+  public static final byte[] DEFAULT_SALT = { (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c, (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99 };
 
   /**
    * @since 2.0
@@ -49,9 +48,8 @@ public final class SecurityUtil
   /**
    * @since 2.0
    */
-  public static byte[] encrypt(byte[] data, char[] password, String algorithmName, byte[] salt, int count)
-      throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException,
-      InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException
+  public static byte[] encrypt(byte[] data, char[] password, String algorithmName, byte[] salt, int count) throws NoSuchAlgorithmException,
+      InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException
   {
     // Create PBE parameter set
     PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, count);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
index 06e2464035..d77d7bb430 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
@@ -77,8 +77,7 @@ public class UserManager extends Lifecycle implements IUserManager, IAuthenticat
   /**
    * @since 2.0
    */
-  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count)
-      throws SecurityException
+  public byte[] encrypt(String userID, byte[] data, String algorithmName, byte[] salt, int count) throws SecurityException
   {
     char[] password;
     synchronized (this)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
index d443b32336..38f64999d2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
@@ -114,11 +114,9 @@ public class UserManagerAuthenticator extends Lifecycle implements IAuthenticato
     try
     {
       byte[] randomToken = createRandomToken();
-      byte[] cryptedTokenClient = SecurityUtil.encrypt(randomToken, password, encryptionAlgorithmName,
-          encryptionSaltBytes, encryptionIterationCount);
+      byte[] cryptedTokenClient = SecurityUtil.encrypt(randomToken, password, encryptionAlgorithmName, encryptionSaltBytes, encryptionIterationCount);
 
-      byte[] cryptedTokenServer = userManager.encrypt(userID, randomToken, encryptionAlgorithmName, encryptionSaltBytes,
-          encryptionIterationCount);
+      byte[] cryptedTokenServer = userManager.encrypt(userID, randomToken, encryptionAlgorithmName, encryptionSaltBytes, encryptionIterationCount);
 
       if (!Arrays.equals(cryptedTokenClient, cryptedTokenServer))
       {
diff --git a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs
index e8d729090c..07533b5536 100644
--- a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs
@@ -377,7 +377,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
index 9f765705e6..e41414356b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
@@ -51,8 +51,8 @@ public class TransportConfig implements ITransportConfig, IExecutorServiceProvid
     this.lifecycle = lifecycle;
   }
 
-  public TransportConfig(ILifecycle lifecycle, ExecutorService receiveExecutor, IBufferProvider bufferProvider,
-      IProtocolProvider protocolProvider, INegotiator negotiator)
+  public TransportConfig(ILifecycle lifecycle, ExecutorService receiveExecutor, IBufferProvider bufferProvider, IProtocolProvider protocolProvider,
+      INegotiator negotiator)
   {
     this(lifecycle);
     this.receiveExecutor = receiveExecutor;
@@ -123,8 +123,7 @@ public class TransportConfig implements ITransportConfig, IExecutorServiceProvid
   @Override
   public String toString()
   {
-    return MessageFormat.format(
-        "TransportConfig[receiveExecutor={0}, bufferProvider={1}, protocolProvider={2}, negotiator={3}]", //$NON-NLS-1$
+    return MessageFormat.format("TransportConfig[receiveExecutor={0}, bufferProvider={1}, protocolProvider={2}, negotiator={3}]", //$NON-NLS-1$
         receiveExecutor, bufferProvider, protocolProvider, negotiator);
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
index 78713079cb..ed1d316934 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
@@ -229,8 +229,7 @@ public class Buffer implements InternalBuffer
           int capacity = byteBuffer.capacity();
           if (payloadSize > capacity)
           {
-            throw new IllegalArgumentException(
-                "New limit " + payloadSize + " is > " + capacity + (isEOS() ? " (EOS)" : ""), ex);
+            throw new IllegalArgumentException("New limit " + payloadSize + " is > " + capacity + (isEOS() ? " (EOS)" : ""), ex);
           }
 
           throw ex;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
index f94c5e90eb..9620bf6270 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
@@ -179,8 +179,7 @@ public final class Net4jUtil
    */
   public static ITransportConfig copyTransportConfig(ILifecycle lifecycle, ITransportConfig source)
   {
-    return new TransportConfig(lifecycle, source.getReceiveExecutor(), source.getBufferProvider(),
-        source.getProtocolProvider(), source.getNegotiator());
+    return new TransportConfig(lifecycle, source.getReceiveExecutor(), source.getBufferProvider(), source.getProtocolProvider(), source.getNegotiator());
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
index 60662eede7..c1406dec38 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
@@ -68,8 +68,7 @@ public class TransportConfigurator
     return container;
   }
 
-  public IAcceptor[] configure(File configFile)
-      throws ParserConfigurationException, SAXException, IOException, CoreException
+  public IAcceptor[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -153,8 +152,7 @@ public class TransportConfigurator
     String description = streamWrapperConfig.getAttribute("description"); //$NON-NLS-1$
     String protocolName = streamWrapperConfig.getAttribute("protocol");//$NON-NLS-1$
 
-    IStreamWrapper streamWrapper = (IStreamWrapper)container.getElement(IStreamWrapper.Factory.PRODUCT_GROUP, type,
-        description);
+    IStreamWrapper streamWrapper = (IStreamWrapper)container.getElement(IStreamWrapper.Factory.PRODUCT_GROUP, type, description);
     if (streamWrapper != null)
     {
       IElementProcessor injector = new AcceptorStreamWrapperInjector(protocolName, acceptor, streamWrapper);
@@ -232,8 +230,7 @@ public class TransportConfigurator
     }
 
     @Override
-    protected boolean shouldInject(IManagedContainer container, String productGroup, String factoryType,
-        String description, SignalProtocol<?> signalProtocol)
+    protected boolean shouldInject(IManagedContainer container, String productGroup, String factoryType, String description, SignalProtocol<?> signalProtocol)
     {
       if (super.shouldInject(container, productGroup, factoryType, description, signalProtocol))
       {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
index a0fa2b180d..d7a2ee6c62 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
@@ -37,8 +37,7 @@ public class TransportInjector implements IElementProcessor
   {
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof InternalAcceptor)
     {
@@ -54,8 +53,7 @@ public class TransportInjector implements IElementProcessor
     return element;
   }
 
-  protected void processAcceptor(IManagedContainer container, String factoryType, String description,
-      InternalAcceptor acceptor)
+  protected void processAcceptor(IManagedContainer container, String factoryType, String description, InternalAcceptor acceptor)
   {
     ITransportConfig config = acceptor.getConfig();
     if (config.getBufferProvider() == null)
@@ -74,8 +72,7 @@ public class TransportInjector implements IElementProcessor
     }
   }
 
-  protected void processConnector(IManagedContainer container, String factoryType, String description,
-      InternalConnector connector)
+  protected void processConnector(IManagedContainer container, String factoryType, String description, InternalConnector connector)
   {
     ITransportConfig config = connector.getConfig();
     if (config.getBufferProvider() == null)
@@ -104,7 +101,6 @@ public class TransportInjector implements IElementProcessor
 
   protected ExecutorService getExecutorService(IManagedContainer container)
   {
-    return (ExecutorService)container.getElement(ExecutorServiceFactory.PRODUCT_GROUP, ExecutorServiceFactory.TYPE,
-        null);
+    return (ExecutorService)container.getElement(ExecutorServiceFactory.PRODUCT_GROUP, ExecutorServiceFactory.TYPE, null);
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
index 857c47c607..a3ecb14e66 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
@@ -40,8 +40,7 @@ public class BufferInputStream extends InputStream implements IBufferHandler
 
   public static final long DEFAULT_MILLIS_INTERRUPT_CHECK = 100;
 
-  private static final boolean DISABLE_TIMEOUT = Boolean
-      .getBoolean("org.eclipse.net4j.buffer.BufferInputStream.disableTimeout");
+  private static final boolean DISABLE_TIMEOUT = Boolean.getBoolean("org.eclipse.net4j.buffer.BufferInputStream.disableTimeout");
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferInputStream.class);
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
index cd12884fcd..90a688290d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
@@ -49,8 +49,7 @@ public class ConnectorCredentialsInjector extends ResponseNegotiatorInjector
    *          The description of the IConnector that the negotiator shall be injected into, or <code>null</code> to
    *          bypass the description check.
    */
-  public ConnectorCredentialsInjector(String connectorDescription, IPasswordCredentialsProvider credentialsProvider,
-      String algorithmName)
+  public ConnectorCredentialsInjector(String connectorDescription, IPasswordCredentialsProvider credentialsProvider, String algorithmName)
   {
     super(createNegotiator(credentialsProvider, algorithmName));
     this.connectorDescription = connectorDescription;
@@ -67,8 +66,7 @@ public class ConnectorCredentialsInjector extends ResponseNegotiatorInjector
   }
 
   @Override
-  protected boolean filterElement(String productGroup, String factoryType, String description,
-      INegotiatorAware negotiatorAware)
+  protected boolean filterElement(String productGroup, String factoryType, String description, INegotiatorAware negotiatorAware)
   {
     if (negotiatorAware instanceof IConnector)
     {
@@ -92,8 +90,7 @@ public class ConnectorCredentialsInjector extends ResponseNegotiatorInjector
     return connectorDescription.equals(description);
   }
 
-  private static ResponseNegotiator createNegotiator(IPasswordCredentialsProvider credentialsProvider,
-      String algorithmName)
+  private static ResponseNegotiator createNegotiator(IPasswordCredentialsProvider credentialsProvider, String algorithmName)
   {
     ResponseNegotiator negotiator = new ResponseNegotiator();
     negotiator.setCredentialsProvider(credentialsProvider);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
index 9a1602b3dc..664940c51b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
@@ -46,8 +46,7 @@ public class ProtocolVersionException extends IllegalStateException
     int actualVersion = Net4jUtil.getProtocolVersion(protocol);
     if (actualVersion != expectedVersion)
     {
-      throw new ProtocolVersionException(
-          "Protocol version " + actualVersion + " does not match expected version " + expectedVersion);
+      throw new ProtocolVersionException("Protocol version " + actualVersion + " does not match expected version " + expectedVersion);
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
index 6d17e527e8..ce0b11f238 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
@@ -31,8 +31,7 @@ class RemoteExceptionRequest extends Request
 
   private Throwable t;
 
-  public RemoteExceptionRequest(SignalProtocol<?> protocol, int correlationID, boolean responding, String message,
-      Throwable t)
+  public RemoteExceptionRequest(SignalProtocol<?> protocol, int correlationID, boolean responding, String message, Throwable t)
   {
     super(protocol, SignalProtocol.SIGNAL_REMOTE_EXCEPTION);
     this.correlationID = correlationID;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index 7dd0aef563..f3ba90b500 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -49,8 +49,7 @@ import java.util.Map;
  *
  * @author Eike Stepper
  */
-public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE>
-    implements ISignalProtocol<INFRA_STRUCTURE>
+public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> implements ISignalProtocol<INFRA_STRUCTURE>
 {
   /**
    * @since 2.0
@@ -607,8 +606,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE>
     @Override
     public String toString()
     {
-      return "TimeoutChangedEvent [oldTimeout=" + oldTimeout + ", newTimeout=" + newTimeout + ", source=" + source
-          + "]";
+      return "TimeoutChangedEvent [oldTimeout=" + oldTimeout + ", newTimeout=" + newTimeout + ", source=" + source + "]";
     }
 
   }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
index ab6757e112..6b5980edce 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
@@ -26,8 +26,7 @@ import org.eclipse.internal.net4j.bundle.OM;
  *
  * @since 4.3
  */
-public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfirmationProvider.Provider>
-    extends IndicationWithMonitoring
+public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfirmationProvider.Provider> extends IndicationWithMonitoring
 {
   private ConfirmationPrompt prompt;
 
@@ -77,8 +76,8 @@ public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfir
         throw new IllegalStateException("No confirmation provider configured"); //$NON-NLS-1$
       }
 
-      Confirmation confirmation = confirmationProvider.confirm(prompt.getSubject(), prompt.getMessage(),
-          prompt.getAcceptableResponses(), prompt.getSuggestedResponse());
+      Confirmation confirmation = confirmationProvider.confirm(prompt.getSubject(), prompt.getMessage(), prompt.getAcceptableResponses(),
+          prompt.getSuggestedResponse());
       if (confirmation == null)
       {
         throw new IllegalStateException("No confirmation provided"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
index 26ef9cadc8..11fcc67616 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
@@ -34,14 +34,12 @@ public class ConfirmationPrompt
 
   private final Confirmation suggestedResponse;
 
-  public ConfirmationPrompt(String subject, String message, Confirmation suggestedResponse,
-      Confirmation acceptableResponse, Confirmation... more)
+  public ConfirmationPrompt(String subject, String message, Confirmation suggestedResponse, Confirmation acceptableResponse, Confirmation... more)
   {
     this(subject, message, suggestedResponse, EnumSet.of(acceptableResponse, more));
   }
 
-  public ConfirmationPrompt(String subject, String message, Confirmation suggestedResponse,
-      Collection<Confirmation> acceptableResponses)
+  public ConfirmationPrompt(String subject, String message, Confirmation suggestedResponse, Collection<Confirmation> acceptableResponses)
   {
     this.subject = subject;
     this.message = message;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
index db8b13434b..a6115db57c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
@@ -345,8 +345,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object>
       {
       }
 
-      public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-          Object element)
+      public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
       {
         if (element instanceof Server)
         {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
index f15759ba9f..95cbb0dfe7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
@@ -20,8 +20,8 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
  *
  * @since 4.3
  */
-public class AuthenticatingSignalProtocol<INFRA_STRUCTURE extends IPasswordCredentialsProvider.Provider>
-    extends SignalProtocol<INFRA_STRUCTURE> implements IPasswordCredentialsProvider.Provider
+public class AuthenticatingSignalProtocol<INFRA_STRUCTURE extends IPasswordCredentialsProvider.Provider> extends SignalProtocol<INFRA_STRUCTURE>
+    implements IPasswordCredentialsProvider.Provider
 {
   public AuthenticatingSignalProtocol(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
index 3b76a8f792..88f7c52d42 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
@@ -45,8 +45,7 @@ public class StreamWrapperInjector implements IElementProcessor
     return streamWrapper;
   }
 
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
+  public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element)
   {
     if (element instanceof SignalProtocol<?>)
     {
@@ -60,8 +59,7 @@ public class StreamWrapperInjector implements IElementProcessor
     return element;
   }
 
-  protected boolean shouldInject(IManagedContainer container, String productGroup, String factoryType,
-      String description, SignalProtocol<?> signalProtocol)
+  protected boolean shouldInject(IManagedContainer container, String productGroup, String factoryType, String description, SignalProtocol<?> signalProtocol)
   {
     if (signalProtocol.getStreamWrapper() == streamWrapper)
     {
@@ -71,8 +69,7 @@ public class StreamWrapperInjector implements IElementProcessor
     return StringUtil.isEmpty(protocolID) || ObjectUtil.equals(signalProtocol.getType(), protocolID);
   }
 
-  protected Object inject(IManagedContainer container, String productGroup, String factoryType, String description,
-      SignalProtocol<?> signalProtocol)
+  protected Object inject(IManagedContainer container, String productGroup, String factoryType, String description, SignalProtocol<?> signalProtocol)
   {
     signalProtocol.addStreamWrapper(streamWrapper);
     return signalProtocol;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
index eb176ed7b3..018fa886eb 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
@@ -326,8 +326,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
 
   protected abstract INegotiationContext createNegotiationContext();
 
-  protected abstract void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol)
-      throws ChannelException;
+  protected abstract void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol) throws ChannelException;
 
   protected abstract void deregisterChannelFromPeer(InternalChannel channel) throws ChannelException;
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
index 6f2bc0b2cd..4be073af11 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
@@ -30,8 +30,7 @@ import java.util.concurrent.ExecutorService;
  * @author Eike Stepper
  * @since 2.0
  */
-public abstract class Protocol<INFRA_STRUCTURE> extends Lifecycle
-    implements IProtocol2<INFRA_STRUCTURE>, IExecutorServiceProvider
+public abstract class Protocol<INFRA_STRUCTURE> extends Lifecycle implements IProtocol2<INFRA_STRUCTURE>, IExecutorServiceProvider
 {
   private String type;
 
diff --git a/plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index 6ed5249fed..021323f736 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class BusinessDayItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_BusinessDay_date_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
-            BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_date_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -96,11 +93,10 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addMenuCardPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_BusinessDay_menuCard_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
-            BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_menuCard_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
   }
 
   /**
@@ -110,14 +106,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addClosedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_BusinessDay_closed_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature",
-                    "_UI_BusinessDay_type"),
-                BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_BusinessDay_closed_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature", "_UI_BusinessDay_type"),
+        BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -233,11 +224,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
 
-    newChildDescriptors.add(
-        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index d551fabc05..6a14a7331c 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 866f1ac584..2fe4c796fb 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderDetailItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addOfferingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_OrderDetail_offering_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
-            BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_offering_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
   }
 
   /**
@@ -93,14 +92,10 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_quantity_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_quantity_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -110,14 +105,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addStatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_state_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_state_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -127,14 +117,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
-                    "_UI_OrderDetail_type"),
-                BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_OrderDetail_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
+        BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -177,8 +162,7 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     OrderDetail orderDetail = (OrderDetail)object;
-    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type")
-        : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
+    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type") : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index 57482a3381..0852403b26 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OrderItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addTablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Order_table_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
-            BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Order_table_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
+        BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +91,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNumberPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Order_number_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
-            BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Order_number_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
+        BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -210,8 +205,7 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS,
-        BusinessFactory.eINSTANCE.createOrderDetail()));
+    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.ORDER__ORDER_DETAILS, BusinessFactory.eINSTANCE.createOrderDetail()));
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index d108c09739..297b2a2095 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * end-user-doc -->
  * @generated
  */
-public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class WaiterItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addTablesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_tables_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_tables_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
   }
 
   /**
@@ -93,11 +91,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addEmployeePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_employee_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_employee_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
   }
 
   /**
@@ -107,12 +103,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addFromPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_from_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_from_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -122,12 +115,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addUntilPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Waiter_until_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
-            BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Waiter_until_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
+        BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.business/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.business/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.gastro.business/META-INF/MANIFEST.MF
index 51cbd6f9a9..6676b6d2af 100644
--- a/plugins/org.gastro.business/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.business/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.business;version="4.0.400",
- org.gastro.business.impl;version="4.0.400",
- org.gastro.business.util;version="4.0.400"
+Export-Package: org.gastro.business;version="4.0.500",
+ org.gastro.business.impl;version="4.0.500",
+ org.gastro.business.util;version="4.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index aaf1e9edde..e58356583b 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -43,8 +43,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
   {
     try
     {
-      BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.gastro.org/business/1.0");
+      BusinessFactory theBusinessFactory = (BusinessFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/business/1.0");
       if (theBusinessFactory != null)
       {
         return theBusinessFactory;
@@ -170,8 +169,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
     OrderState result = OrderState.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException(
-          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index 6ccd6762e2..cf449f317a 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -109,9 +109,8 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     }
 
     // Obtain or create and register package
-    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new BusinessPackageImpl());
+    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BusinessPackageImpl());
 
     isInited = true;
 
@@ -435,8 +434,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE
-        .getEPackage(InventoryPackage.eNS_URI);
+    InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
 
     // Create type parameters
 
@@ -445,64 +443,51 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
-        BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
-        Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_Employee(), theInventoryPackage.getEmployee(), null, "employee", null, 1, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getWaiter_From(), ecorePackage.getEDate(), "from", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getWaiter_Until(), ecorePackage.getEDate(), "until", null, 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(orderStateEEnum, OrderState.class, "OrderState");
diff --git a/plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 84429271f4..74cedd8790 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class DepartmentItemProvider extends StationItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -168,14 +168,11 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES,
-        InventoryFactory.eINSTANCE.createEmployee()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES, InventoryFactory.eINSTANCE.createEmployee()));
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
   }
 
 }
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index 17739155e6..70d4b36288 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class EmployeeItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Employee_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
-            InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Employee_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
+        InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 47263a0c6f..80f2dc4505 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class IngredientItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -77,11 +77,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Ingredient_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
-            InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Ingredient_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
+        InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -91,14 +89,9 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Ingredient_quantity_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature",
-                    "_UI_Ingredient_type"),
-                InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
-                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Ingredient_quantity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature", "_UI_Ingredient_type"),
+        InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -143,8 +136,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
   public String getText(Object object)
   {
     Ingredient ingredient = (Ingredient)object;
-    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type")
-        : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
+    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type") : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index 0f878076c1..c6719bb48a 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@ import java.util.Collection;
  *
  * @generated
  */
-public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
-    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 67bf336330..d0165b9976 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class MenuCardItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_MenuCard_title_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
-            InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_MenuCard_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
+        InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -198,8 +195,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS,
-        InventoryFactory.eINSTANCE.createSection()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.MENU_CARD__SECTIONS, InventoryFactory.eINSTANCE.createSection()));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 0aee60e852..ca2307643a 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class OfferingItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,11 +79,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_product_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_product_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +91,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -108,14 +103,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_Offering_description_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature",
-                    "_UI_Offering_type"),
-                InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
-                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -125,12 +115,9 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Offering_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
-            InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Offering_price_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
+        InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index f676dd3475..cbb9a03ea5 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class ProductItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-            InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Product_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+        InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 99966c527f..72fdd8dcfe 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RecipeItemProvider extends ProductItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Recipe_cost_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
-            InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Recipe_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
+        InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -185,8 +182,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS,
-        InventoryFactory.eINSTANCE.createIngredient()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RECIPE__INGREDIENTS, InventoryFactory.eINSTANCE.createIngredient()));
   }
 
 }
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index 8df3223e09..ea9b267d36 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class RestaurantItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Restaurant_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
-            InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Restaurant_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
+        InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -94,11 +91,9 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addStationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Restaurant_stations_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
-            InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Restaurant_stations_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
+        InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -217,14 +212,11 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS,
-        InventoryFactory.eINSTANCE.createDepartment()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__DEPARTMENTS, InventoryFactory.eINSTANCE.createDepartment()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS,
-        InventoryFactory.eINSTANCE.createMenuCard()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS, InventoryFactory.eINSTANCE.createMenuCard()));
 
-    newChildDescriptors.add(
-        createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 1bfbce1a21..c48d3351dd 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class SectionItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -79,12 +79,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Section_title_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
-            InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Section_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
+        InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -94,12 +91,9 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addTextPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Section_text_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
-            InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Section_text_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
+        InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -215,8 +209,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS,
-        InventoryFactory.eINSTANCE.createOffering()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.SECTION__OFFERINGS, InventoryFactory.eINSTANCE.createOffering()));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index aa36005f76..6eb02eb33d 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StationItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,12 +76,9 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
    */
   protected void addStationIDPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Station_stationID_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
-            InventoryPackage.Literals.STATION__STATION_ID, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Station_stationID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
+        InventoryPackage.Literals.STATION__STATION_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index 30d4d27fcc..9f3e5fc7df 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -78,12 +78,9 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Stock_name_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
-            InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-            null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Stock_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
+        InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -198,8 +195,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS,
-        InventoryFactory.eINSTANCE.createStockProduct()));
+    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.STOCK__PRODUCTS, InventoryFactory.eINSTANCE.createStockProduct()));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index 2a8f4ff5c8..594c454d98 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class StockProductItemProvider extends ProductItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,14 +76,9 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(
-            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                getResourceLocator(), getString("_UI_StockProduct_cost_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature",
-                    "_UI_StockProduct_type"),
-                InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false,
-                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_cost_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -93,13 +88,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addAvailablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_StockProduct_available_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature",
-                "_UI_StockProduct_type"),
-            InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_available_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -109,13 +101,10 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
    */
   protected void addOrderLimitPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
-                "_UI_StockProduct_type"),
-            InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
-            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_StockProduct_orderLimit_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature", "_UI_StockProduct_type"),
+        InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index efec05d89c..043ae6cd9c 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  *
  * @generated
  */
-public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class TableItemProvider extends StationItemProvider
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,12 +74,9 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
    */
   protected void addSeatsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Table_seats_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
-            InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-            null, null));
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Table_seats_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
+        InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
index ac9d42808e..ec1df18c13 100644
--- a/plugins/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
index 3463c7e000..97c6eb6ee6 100644
--- a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory;singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.inventory;version="4.0.400",
- org.gastro.inventory.impl;version="4.0.400",
- org.gastro.inventory.util;version="4.0.400"
+Export-Package: org.gastro.inventory;version="4.0.500",
+ org.gastro.inventory.impl;version="4.0.500",
+ org.gastro.inventory.util;version="4.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 26f888e90d..bab3335017 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -49,8 +49,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
   {
     try
     {
-      InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.gastro.org/inventory/1.0");
+      InventoryFactory theInventoryFactory = (InventoryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.gastro.org/inventory/1.0");
       if (theInventoryFactory != null)
       {
         return theInventoryFactory;
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index fdd5ff8c6f..2466c1b3a6 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -178,9 +178,8 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
     }
 
     // Obtain or create and register package
-    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new InventoryPackageImpl());
+    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl
+        ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InventoryPackageImpl());
 
     isInited = true;
 
@@ -865,139 +864,112 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
     // Initialize classes and features; add operations and parameters
     initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
-        Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
-        Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(productEClass, ecorePackage.getEFloat(), "getCost", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStockProduct_OrderLimit(), ecorePackage.getEInt(), "orderLimit", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
-        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-    initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+    initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
-        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
-        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        IS_DERIVED, IS_ORDERED);
-
-    initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1, Restaurant.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+    initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1, Department.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
-        Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
-        Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(stationEClass, Station.class, "Station", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStation_StationID(), ecorePackage.getEString(), "stationID", null, 0, 1, Station.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
-        Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1, Section.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSection_Text(), ecorePackage.getEString(), "text", null, 0, 1, Section.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/plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 205b6faf64..4fed648bab 100644
--- a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.400.qualifier
+Bundle-Version: 4.0.500.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.400";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.500";x-internal:=true
diff --git a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
index 0dbf576886..38b5a5413a 100644
--- a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
+++ b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
@@ -130,8 +130,7 @@ public class OrdersView extends ViewPart
             {
               public Object execute(OrderDetail orderDetail)
               {
-                orderDetail
-                    .setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
+                orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
                 return null;
               }
             });
diff --git a/plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.server/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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
diff --git a/plugins/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs b/plugins/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ 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.lineSplit=160
 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