[Releng] Reformat everything with M6 formatter

52 files changed, 154 insertions, 175 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
index 186883b680..782caee0c1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
@@ -68,7 +68,7 @@ import java.util.Set;
  * @author Simon McDuff
  * @since 3.0
  */
-public class LockingManager extends RWOLockManager<Object, IView> implements InternalLockManager
+public class LockingManager extends RWOLockManager<Object, IView>implements InternalLockManager
 {
   private InternalRepository repository;
 
@@ -185,8 +185,8 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Deprecated
-  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock, long timeout)
-      throws InterruptedException
+  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock,
+      long timeout) throws InterruptedException
   {
     lock2(explicit, type, view, objectsToLock, false, timeout);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
index 1553bc0504..eefddfd596 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.spi.server.InternalView;
  * @author Simon McDuff
  * @since 2.0
  */
-public class QueryResult extends AbstractQueryResult<Object> implements InternalQueryResult
+public class QueryResult extends AbstractQueryResult<Object>implements InternalQueryResult
 {
   public QueryResult(InternalView view, CDOQueryInfo queryInfo, int queryID)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index 712c5a3a1e..28111aae08 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -144,7 +144,7 @@ import java.util.concurrent.Semaphore;
  * @author Eike Stepper
  * @since 2.0
  */
-public class Repository extends Container<Object> implements InternalRepository
+public class Repository extends Container<Object>implements InternalRepository
 {
   private static final int UNCHUNKED = CDORevision.UNCHUNKED;
 
@@ -527,8 +527,8 @@ public class Repository extends Container<Object> implements InternalRepository
         {
           CDOBranchVersion targetBranchVersion = pointerInfo.getTargetBranchVersion();
           InternalCDORevision target = loadRevisionByVersion(id, targetBranchVersion, referenceChunk);
-          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id, pointerInfo
-              .getAvailableBranchVersion().getBranch(), CDORevision.UNSPECIFIED_DATE, target);
+          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id,
+              pointerInfo.getAvailableBranchVersion().getBranch(), CDORevision.UNSPECIFIED_DATE, target);
 
           info.setResult(target);
           info.setSynthetic(pointer);
@@ -1296,19 +1296,15 @@ public class Repository extends Container<Object> implements InternalRepository
     long creationTimeStamp = getCreationTime();
     if (timeStamp < creationTimeStamp)
     {
-      throw new IllegalArgumentException(
-          MessageFormat
-              .format(
-                  "timeStamp ({0}) < repository creation time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp))); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format("timeStamp ({0}) < repository creation time ({1})", //$NON-NLS-1$
+          CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp)));
     }
 
     long currentTimeStamp = getTimeStamp();
     if (timeStamp > currentTimeStamp)
     {
-      throw new IllegalArgumentException(
-          MessageFormat
-              .format(
-                  "timeStamp ({0}) > current time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp))); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format("timeStamp ({0}) > current time ({1})", //$NON-NLS-1$
+          CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp)));
     }
   }
 
@@ -1778,8 +1774,8 @@ public class Repository extends Container<Object> implements InternalRepository
 
         if (rev == null)
         {
-          throw new IllegalArgumentException(String.format("Object %s not found in branch %s (possibly detached)", id,
-              viewedBranch));
+          throw new IllegalArgumentException(
+              String.format("Object %s not found in branch %s (possibly detached)", id, viewedBranch));
         }
 
         if (!revKey.equals(rev))
@@ -2167,10 +2163,10 @@ public class Repository extends Container<Object> implements InternalRepository
       throw new IllegalStateException("Store can not handle client assigned IDs: " + store);
     }
 
-    store.setRevisionTemporality(supportingAudits ? IStore.RevisionTemporality.AUDITING
-        : IStore.RevisionTemporality.NONE);
-    store.setRevisionParallelism(supportingBranches ? IStore.RevisionParallelism.BRANCHING
-        : IStore.RevisionParallelism.NONE);
+    store.setRevisionTemporality(
+        supportingAudits ? IStore.RevisionTemporality.AUDITING : IStore.RevisionTemporality.NONE);
+    store.setRevisionParallelism(
+        supportingBranches ? IStore.RevisionParallelism.BRANCHING : IStore.RevisionParallelism.NONE);
     revisionManager.setSupportingAudits(supportingAudits);
     revisionManager.setSupportingBranches(supportingBranches);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
index cb1f58ba9f..0550b76cf4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
@@ -977,7 +977,8 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
       throw new UnsupportedOperationException();
     }
 
-    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex, int serverIndex)
+    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex,
+        int serverIndex)
     {
       throw new UnsupportedOperationException();
     }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index e045edaf14..c9f95eb6e2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author Eike Stepper
  */
-public class Session extends Container<IView> implements InternalSession
+public class Session extends Container<IView>implements InternalSession
 {
   private InternalSessionManager manager;
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 42957e4e44..48132235c3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author Eike Stepper
  */
-public class SessionManager extends Container<ISession> implements InternalSessionManager
+public class SessionManager extends Container<ISession>implements InternalSessionManager
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, SessionManager.class);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
index 3c31053c0c..505d59d2f1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
@@ -902,8 +902,8 @@ public class TransactionCommitContext implements InternalCommitContext
       }
     };
 
-    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection,
-        changedObjectsCollection, detachedObjectsCollection);
+    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection, changedObjectsCollection,
+        detachedObjectsCollection);
   }
 
   protected void adjustForCommit()
@@ -1019,8 +1019,8 @@ public class TransactionCommitContext implements InternalCommitContext
             CDORevision revision = transaction.getRevision(id);
             if (revision == null || revision instanceof DetachedCDORevision)
             {
-              throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY, "Attempt by "
-                  + transaction + " to introduce a stale reference");
+              throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY,
+                  "Attempt by " + transaction + " to introduce a stale reference");
             }
           }
         }
@@ -1154,8 +1154,8 @@ public class TransactionCommitContext implements InternalCommitContext
     if (oldRevision == null)
     {
       // If the object is logically locked (see lockObjects) but has a wrong (newer) version, someone else modified it
-      throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_COMMIT_CONFLICT, "Attempt by " + transaction
-          + " to modify historical revision: " + delta);
+      throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_COMMIT_CONFLICT,
+          "Attempt by " + transaction + " to modify historical revision: " + delta);
     }
 
     // Make sure all chunks are loaded
@@ -1198,8 +1198,8 @@ public class TransactionCommitContext implements InternalCommitContext
         InternalCDORevision revision = dirtyObjects[i];
         if (!isTheRootReachable(revision, objectsThatReachTheRoot, new HashSet<CDOID>()))
         {
-          throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_CONTAINMENT_CYCLE, "Attempt by "
-              + transaction + " to introduce a containment cycle");
+          throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_CONTAINMENT_CYCLE,
+              "Attempt by " + transaction + " to introduce a containment cycle");
         }
       }
     }
@@ -1244,8 +1244,8 @@ public class TransactionCommitContext implements InternalCommitContext
       xRefs = context.getXRefs(accessor);
       if (!xRefs.isEmpty())
       {
-        throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY, "Attempt by "
-            + transaction + " to introduce a stale reference");
+        throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY,
+            "Attempt by " + transaction + " to introduce a stale reference");
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
index 83ae0478e5..f961d51bf8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
@@ -48,7 +48,7 @@ public class View extends Lifecycle implements InternalView, CDOCommonView.Optio
   private final int viewID;
 
   private final int sessionID; // Needed here so we can compute the hashCode even after session becomes null due to
-                               // deactivation!
+  // deactivation!
 
   private CDOBranchPoint branchPoint;
 
@@ -168,8 +168,8 @@ public class View extends Lifecycle implements InternalView, CDOCommonView.Optio
 
   private List<CDORevision> getRevisions(List<CDOID> ids)
   {
-    return repository.getRevisionManager().getRevisions(ids, branchPoint, CDORevision.UNCHUNKED,
-        CDORevision.DEPTH_NONE, true);
+    return repository.getRevisionManager().getRevisions(ids, branchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE,
+        true);
   }
 
   public void setBranchPoint(CDOBranchPoint branchPoint)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
index 06e3878564..88e23fe52a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
@@ -70,8 +70,8 @@ public class XRefsQueryHandler implements IQueryHandler
 
       CDOBranchPoint branchPoint = context;
       CDOBranch branch = branchPoint.getBranch();
-      while (!branch.isMainBranch()
-          && (info.getMaxResults() == CDOQueryInfo.UNLIMITED_RESULTS || context.getResultCount() < info.getMaxResults()))
+      while (!branch.isMainBranch() && (info.getMaxResults() == CDOQueryInfo.UNLIMITED_RESULTS
+          || context.getResultCount() < info.getMaxResults()))
       {
         branchPoint = branch.getBase();
         branch = branchPoint.getBranch();
@@ -103,7 +103,7 @@ public class XRefsQueryHandler implements IQueryHandler
       // System.out.println(" ---> " + entry.getKey().getName());
       // for (EReference eReference : entry.getValue())
       // {
-      // System.out.println("      ---> " + eReference.getName());
+      // System.out.println(" ---> " + eReference.getName());
       // }
       // }
       //
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 85eaac6f83..464b7df32b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
index 9c36851137..69fa8dfde4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
@@ -70,7 +70,7 @@ public class EmbeddedClientSession extends CDOSessionImpl implements CDOSession
   /**
    * Changing the user's password in an embedded client session is not supported:
    * it must be done interactively with the user in a client session.
-   * 
+   *
    * @since 4.3
    */
   public void changeCredentials()
@@ -81,7 +81,7 @@ public class EmbeddedClientSession extends CDOSessionImpl implements CDOSession
   /**
    * Resetting a user's password in an embedded client session is not supported:
    * it must be done interactively in a client session.
-   * 
+   *
    * @since 4.3
    */
   public void resetCredentials(String userID)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
index fe260e22d4..6051c9dc99 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
@@ -459,8 +459,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
       CDOCommitData commitData = context.getCommitData();
 
       int transactionID = transaction.getViewID();
-      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession().getView(
-          transactionID);
+      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession()
+          .getView(transactionID);
       serverCommitContext = serverTransaction.createCommitContext();
       serverCommitContext.preWrite();
       serverCommitContext.setAutoReleaseLocksEnabled(transaction.options().isAutoReleaseLocksEnabled());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
index 06aabd86ba..53b50ebcb1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
@@ -132,8 +132,9 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
    */
   public MEMStore(int listLimit)
   {
-    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set(RevisionTemporality.NONE,
-        RevisionTemporality.AUDITING), set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
+    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA),
+        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
+        set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
     setRevisionTemporality(RevisionTemporality.AUDITING);
     setRevisionParallelism(RevisionParallelism.BRANCHING);
     this.listLimit = listLimit;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
index d1ec43ba6e..56c96b7ff5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
index b83a164728..2d76d07a5c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
index f403c74303..9c14fb820a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
@@ -73,8 +73,8 @@ public class OfflineClone extends SynchronizableRepository
     {
       StoreThreadLocal.setSession(getReplicatorSession());
       InternalCDOBranchManager branchManager = getBranchManager();
-      return branchManager.createBranch(NEW_LOCAL_BRANCH,
-          "Offline-" + baseTimeStamp, (InternalCDOBranch)baseBranch, baseTimeStamp); //$NON-NLS-1$
+      return branchManager.createBranch(NEW_LOCAL_BRANCH, "Offline-" + baseTimeStamp, (InternalCDOBranch)baseBranch, //$NON-NLS-1$
+          baseTimeStamp);
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
index 033ac8fe4f..92d6bc7cba 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
@@ -723,8 +723,8 @@ public abstract class SynchronizableRepository extends Repository.Default implem
       throw new IllegalStateException("Durable locking is not enabled for view " + view);
     }
 
-    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(),
-        type, recursive, timeout);
+    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(), type,
+        recursive, timeout);
 
     if (masterLockingResult.isSuccessful() && masterLockingResult.isWaitForUpdate())
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
index 4e5b34c36a..2b91c206ec 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
@@ -1229,7 +1229,8 @@ public class CDOServerBrowser extends Worker
       out.print("</table>\r\n");
     }
 
-    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser, String param)
+    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser,
+        String param)
     {
       String hex = HexUtil.bytesToHex(id);
       boolean selected = hex.equals(param);
@@ -1366,9 +1367,8 @@ public class CDOServerBrowser extends Worker
       for (CDOIDAndVersion key : commitInfo.getNewObjects())
       {
         CDORevision newObject = (CDORevision)key;
-        out.print("<li>"
-            + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision",
-                CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
+        out.print("<li>" + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision",
+            CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
       }
 
       out.print("</ul>\r\n");
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
index dec715ce73..a0edd49d00 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
@@ -377,7 +377,7 @@ public abstract class CDOServerExporter<OUT>
    *
    * @author Eike Stepper
    */
-  public static class XML extends CDOServerExporter<XMLOutput> implements XMLConstants
+  public static class XML extends CDOServerExporter<XMLOutput>implements XMLConstants
   {
     public XML(IRepository repository)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index 93f0b17b06..9544182221 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -269,7 +269,8 @@ public final class CDOServerUtil
   /**
    * @since 4.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
+      Map<String, String> props)
   {
     return createFailoverParticipant(name, store, props, null);
   }
@@ -296,8 +297,8 @@ public final class CDOServerUtil
     return RepositoryFactory.get(container, name);
   }
 
-  public static Element getRepositoryConfig(String repositoryName) throws ParserConfigurationException, SAXException,
-      IOException
+  public static Element getRepositoryConfig(String repositoryName)
+      throws ParserConfigurationException, SAXException, IOException
   {
     File configFile = OMPlatform.INSTANCE.getConfigFile("cdo-server.xml"); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
index fcb660c9be..470b6f08b2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Caspar De Groot - initial API and implementation
  */
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.lock.IDurableLockingManager;
  * Manages all persistent aspects of durable CDO views and provides for vetoable
  * {@link #addDurableViewHandler(ILockingManager.DurableViewHandler) interception} of the durable view resumption
  * process.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  */
@@ -32,7 +32,7 @@ public interface ILockingManager extends IDurableLockingManager
   /**
    * A call-back interface primarily intended to allow implementers to prevent the view from being opened by throwing an
    * exception. See {@link ILockingManager#addDurableViewHandler(DurableViewHandler)}.
-   * 
+   *
    * @author Caspar De Groot
    * @since 4.1
    */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
index b7c23c21e0..b0c43cc594 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server;
 
 /**
  * A simple in-memory store.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
index e078687d95..65a7a17aa6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 /**
  * Represents the execution state of a {@link CDOQuery query} in the server towards a {@link IQueryHandler query
  * handler}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
@@ -34,7 +34,7 @@ public interface IQueryContext extends CDOBranchPoint
 
   /**
    * Adds the given object to the results of the associated query.
-   * 
+   *
    * @param object
    *          Support many primitives, CDOID and CDORevision. CDORevision are converted in CDOID and only CDOID are
    *          transfered to the client.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
index 7e2a4df087..d35c4df318 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 
 /**
  * A query language handler that is capable of executing a {@link CDOQuery query}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -25,7 +25,7 @@ public interface IQueryHandler
    * Executes the {@link CDOQuery query} represented by the specified {@link CDOQueryInfo query info} by
    * {@link IQueryContext#addResult(Object) passing} the query results to the query execution engine represented by the
    * specified {@link IQueryContext execution context}.
-   * 
+   *
    * @since 3.0
    */
   public void executeQuery(CDOQueryInfo info, IQueryContext context);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
index 7cad582687..ce322b4e6a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 /**
  * Provides the consumer with {@link IQueryHandler query handlers} that are capable of executing {@link CDOQuery
  * queries} represented by specific {@link CDOQueryInfo query infos}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @apiviz.uses {@link IQueryHandler} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
index 34db6f611d..c9a081c6ae 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
@@ -259,9 +259,9 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
      * An exception that a {@link WriteAccessHandler} may throw to indicate that a
      * {@linkplain WriteAccessHandler#handleTransactionBeforeCommitting(ITransaction, org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext, OMMonitor) transaction commit}
      * was rejected because one or more semantic validation checks reported errors.
-     * 
+     *
      * @author Christian W. Damus (CEA LIST)
-     * 
+     *
      * @since 4.3
      */
     public static final class TransactionValidationException extends RuntimeException
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
index eb09a703c4..5c4b102f5d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server;
 
 /**
  * Provides the consumer with CDO {@link IRepository repositories} specified by their name.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IRepository} - - provides
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
index d94ec3e653..17e10e3704 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
@@ -26,7 +26,7 @@ import java.util.Set;
 /**
  * Represents the physical data storage back-end of a CDO {@link IRepository repository}, such as a database or a file
  * system folder.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  * @apiviz.has {@link IStore.ChangeFormat}
@@ -83,42 +83,42 @@ public interface IStore
 
   /**
    * Returns <code>true</code>if this store was activated for the first time, <code>false</code> otherwise.
-   * 
+   *
    * @since 4.0
    */
   public boolean isFirstStart();
 
   /**
    * Returns the store creation time.
-   * 
+   *
    * @since 2.0
    */
   public long getCreationTime();
 
   /**
    * Returns the id of the last branch that has been created in this store.
-   * 
+   *
    * @since 3.0
    */
   public int getLastBranchID();
 
   /**
    * Returns the id of the last local branch that has been created in this store.
-   * 
+   *
    * @since 3.0
    */
   public int getLastLocalBranchID();
 
   /**
    * Returns the time stamp of the last successful commit operation.
-   * 
+   *
    * @since 3.0
    */
   public long getLastCommitTime();
 
   /**
    * Returns the time stamp of the last successful commit operation to a non-local {@link CDOBranch branch}.
-   * 
+   *
    * @since 3.0
    */
   public long getLastNonLocalCommitTime();
@@ -126,7 +126,7 @@ public interface IStore
   /**
    * Returns a map filled with the property entries for the requested property <code>names</code> if names is not
    * <code>null</code> and not {@link Collection#isEmpty() empty}, all existing property entries otherwise.
-   * 
+   *
    * @since 4.0
    */
   public Map<String, String> getPersistentProperties(Set<String> names);
@@ -143,7 +143,7 @@ public interface IStore
 
   /**
    * Returns a reader that can be used to read from this store in the context of the given session.
-   * 
+   *
    * @param session
    *          The session that should be used as a context for read access or <code>null</code>. The store implementor
    *          is free to interpret and use the session in a manner suitable for him or ignore it at all. It is meant
@@ -160,7 +160,7 @@ public interface IStore
   /**
    * Returns a writer that can be used to write to this store in the context of the given view. The given view is always
    * marked as a transaction.
-   * 
+   *
    * @param transaction
    *          The view that must be used as a context for write access. The store implementor is free to interpret and
    *          use the view in a manner suitable for him or ignore it at all. It is meant only as a hint. Implementor can
@@ -179,7 +179,7 @@ public interface IStore
 
   /**
    * Enumerates the possible data formats a {@link IStore store} can accept for commit operations.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -198,7 +198,7 @@ public interface IStore
 
   /**
    * Enumerates the possible history recording options a {@link IStore store} can accept.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -217,7 +217,7 @@ public interface IStore
 
   /**
    * Enumerates the possible branching options a {@link IStore store} can accept.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -237,7 +237,7 @@ public interface IStore
   /**
    * A marker interface for {@link IStore stores} that can handle {@link CDOID IDs} assigned by a
    * {@link IDGenerationLocation#CLIENT client}, typically {@link ObjectType#UUID UUIDs}.
-   * 
+   *
    * @author Eike Stepper
    * @since 4.1
    * @apiviz.exclude
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
index 20eceee43e..5f745765b9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Reads {@link Chunk chunks} of
  * {@link org.eclipse.emf.cdo.session.CDOSession.Options#setCollectionLoadingPolicy(CDOCollectionLoadingPolicy)
  * partially loaded} lists from a physical data storage backend.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IStoreChunkReader.Chunk} - - reads
  */
@@ -55,7 +55,7 @@ public interface IStoreChunkReader
   /**
    * Represents a {@link List#subList(int, int) sublist} of consecutive elements that are subject to <i>partial
    * collection loading</i>.
-   * 
+   *
    * @author Eike Stepper
    */
   public static class Chunk
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
index 024ff1d9f1..7e74aa45c6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * Creates {@link IStore stores}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IStore} - - creates
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
index 96d035d1d0..8be22976d4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 /**
  * The server-side representation of a client {@link CDOTransaction transaction}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
index 547139563c..bc6912a5ea 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOView;
 
 /**
  * The server-side representation of a client {@link CDOView view}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
index 5a6dae0d81..3bd7a078d8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.session.CDOSession;
 /**
  * An unchecked exception being thrown when opening a {@link CDOSession session} to a named {@link IRepository
  * repository} that cannot be found.
- * 
+ *
  * @author Eike Stepper
  */
 public class RepositoryNotFoundException extends CDOException
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
index e7faed1fc7..b278f7f689 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server.embedded;
 
 /**
  * Deprecated, not yet supported.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
index 64ff466c2d..50106c1488 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.server.IRepository;
 
 /**
  * Deprecated, not yet supported.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
index 70725a0883..a5e52fba14 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
  * Server concepts for dealing with embedded sessions.
  */
 package org.eclipse.emf.cdo.server.embedded;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
index d375fb5240..f72b4f6a26 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * A simple in-memory {@link IStore store}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
index 24b510491c..28dca1344f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.internal.server.mem.MEMStore;
 
 /**
  * Creates {@link IMEMStore} instances.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -26,7 +26,7 @@ public final class MEMStoreUtil
 
   /**
    * Creates a {@link IMEMStore} instance.
-   * 
+   *
    * @since 4.0
    */
   public static IMEMStore createMEMStore()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
index d360bb5b40..fcaaad373b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
  * Server concepts for dealing with in-memory stores.
  */
 package org.eclipse.emf.cdo.server.mem;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
index f8236f8db8..6a09c91532 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
@@ -1,17 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
  * Server concepts for dealing with repositories and stores.
- * 
+ *
  * @apiviz.exclude .*\.CDOServerBrowser.*
  * @apiviz.exclude .*\.CommitInfoLoader
  * @apiviz.exclude .*\.BranchLoader
@@ -20,4 +16,3 @@
  * @apiviz.exclude .*Exception
  */
 package org.eclipse.emf.cdo.server;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
index 07db389c4c..a06696b6f3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
@@ -44,16 +44,16 @@ public final class AuthenticationUtil
    */
   public static <V> Callable<V> authenticatingOperation(IAuthenticationProtocol authenticationProtocol,
       final Callable<V> operation)
-      {
+  {
     return new AuthenticatingOperation<V>(authenticationProtocol)
-        {
+    {
       @Override
       protected V doCall() throws Exception
       {
         return operation.call();
       }
-        };
-      }
+    };
+  }
 
   /**
    * Encapsulation of an administrative operation requiring (potentially) client
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
index 2e5d08f845..ddc9593cae 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
index 0c3245a08f..93291f8ab8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
@@ -17,7 +17,7 @@ import java.io.Reader;
  * on the XML configurations of dynamically-managed repositories.  These may be instantiated multiple
  * times, will only be given repository configurations (not Net4j acceptors etc.) and are stopped if and
  * when their associated repositories are deleted.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  * @since 4.3
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
index 2c077f96af..a92a163687 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
@@ -49,20 +49,20 @@ public interface InternalCommitContext extends IStoreAccessor.CommitContext, CDO
         }
       }, //
 
-      new ProgressDistributable.Default<InternalCommitContext>()
+  new ProgressDistributable.Default<InternalCommitContext>()
+  {
+    public void runLoop(int index, InternalCommitContext commitContext, OMMonitor monitor) throws Exception
+    {
+      if (commitContext.getRollbackMessage() == null)
       {
-        public void runLoop(int index, InternalCommitContext commitContext, OMMonitor monitor) throws Exception
-        {
-          if (commitContext.getRollbackMessage() == null)
-          {
-            commitContext.commit(monitor.fork());
-          }
-          else
-          {
-            monitor.worked();
-          }
-        }
-      });
+        commitContext.commit(monitor.fork());
+      }
+      else
+      {
+        monitor.worked();
+      }
+    }
+  });
 
   public InternalTransaction getTransaction();
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
index 1fede4bc47..64c4094b63 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * The type of the to-be-locked objects is either {@link CDOIDAndBranch} or {@link CDOID}, depending on whether
  * branching is supported by the repository or not.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
@@ -74,7 +74,7 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
 
   /**
    * Attempts to release for a given locktype, view and objects.
-   * 
+   *
    * @throws IllegalMonitorStateException
    *           Unlocking objects without lock.
    * @since 4.0
@@ -90,7 +90,7 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
 
   /**
    * Attempts to release all locks(read and write) for a given view.
-   * 
+   *
    * @since 4.0
    */
   @Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
index 4584ac1e07..f59e5490e2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
@@ -65,7 +65,7 @@ import java.util.concurrent.Semaphore;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalRepository extends IRepository, PackageProcessor, PackageLoader, BranchLoader3,
-    RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
+RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
 {
   public void setName(String name);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
index f977da9674..68b1816e3b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.spi.common.CDOReplicationContext;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalSynchronizableRepository extends ISynchronizableRepository, InternalRepository,
-    CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
+CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
 {
   public InternalRepositorySynchronizer getSynchronizer();
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
index 05d40b315b..9efc648363 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
@@ -97,8 +97,8 @@ public class RepositoryConfigurator
     return storeFactories;
   }
 
-  public IRepository[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  public IRepository[] configure(File configFile)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -111,8 +111,8 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  public IRepository[] configure(Reader configReader) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  public IRepository[] configure(Reader configReader)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -125,8 +125,8 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  protected IRepository[] configure(Document document) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  protected IRepository[] configure(Document document)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     List<IRepository> repositories = new ArrayList<IRepository>();
     NodeList elements = document.getElementsByTagName("repository"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
index 09a2078681..ab3ff0408b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
@@ -174,8 +174,8 @@ public abstract class StoreAccessor extends StoreAccessorBase
   /**
    * @since 3.0
    */
-  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch,
-      long created, OMMonitor monitor);
+  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
+      OMMonitor monitor);
 
   /**
    * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
index 28a7253f5b..4092fd42ec 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
@@ -341,8 +341,8 @@ public abstract class StoreAccessorBase extends Lifecycle implements IStoreAcces
     {
       if (rev.getTimeStamp() != timeStamp)
       {
-        throw new IllegalArgumentException("Invalid revision time stamp: "
-            + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
+        throw new IllegalArgumentException(
+            "Invalid revision time stamp: " + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
       }
 
       if (rev instanceof DetachedCDORevision)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
index fc4d11605c..6ea1216e6f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.CheckUtil;
 
 /**
  * Static methods that may help with classes related to repository synchronization.
- * 
+ *
  * @author Eike Stepper
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
index 6b9f1cd8bf..b927854c75 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
  * Server service provider interfaces and useful base implementations.
- * 
+ *
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.spi.server;
-