[Releng] Increase max line length to 160

author: Eike Stepper 2016-10-18 15:30:55 +0000
committer: Eike Stepper 2016-10-18 15:30:55 +0000
commit: d271b313d58d5eef02ed687c151a42dfd0c0f0ed (patch)
tree: 57ca0c57f33f0780f6092613bab565d35f7986af /plugins/org.eclipse.emf.cdo.common/src
parent: 6809f0af826be94b174d4e1a45d75e686813d267 (diff)
download: cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.gz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.xz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.zip
53 files changed, 181 insertions, 305 deletions
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())
         {
author	Eike Stepper	2016-10-18 15:30:55 +0000
committer	Eike Stepper	2016-10-18 15:30:55 +0000
commit	d271b313d58d5eef02ed687c151a42dfd0c0f0ed (patch)
tree	57ca0c57f33f0780f6092613bab565d35f7986af /plugins/org.eclipse.emf.cdo.common/src
parent	6809f0af826be94b174d4e1a45d75e686813d267 (diff)
download	cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.gz cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.xz cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.zip