[Releng] Increase max line length to 160

28 files changed, 237 insertions, 422 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 96285c175b..cf53f83509 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -380,8 +380,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
 
     if (resource != null)
     {
-      throw new IllegalArgumentException(
-          "Only intended to be called by CDOTransactionImpl.removeObject(CDOID, CDOObject");
+      throw new IllegalArgumentException("Only intended to be called by CDOTransactionImpl.removeObject(CDOID, CDOObject");
     }
 
     super.eSetDirectResource(null);
@@ -767,8 +766,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
    * @since 2.0
    */
   @Override
-  public final NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain msgs)
+  public final NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID, NotificationChain msgs)
   {
     boolean isResource = this instanceof CDOResource;
     boolean isRootResource = isResource && ((CDOResource)this).isRoot();
@@ -803,8 +801,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     }
 
     CDOView oldView = viewAndState.view;
-    CDOView newView = newResource != null && newResource instanceof CDOResource ? ((CDOResource)newResource).cdoView()
-        : null;
+    CDOView newView = newResource != null && newResource instanceof CDOResource ? ((CDOResource)newResource).cdoView() : null;
 
     boolean moved = oldView != null && oldView == newView;
     if (!moved && oldResource != null && oldResource != newResource && !isRootResource)
@@ -829,8 +826,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     {
       if (oldContainer != null && oldContainerFeatureID >= 0 && oldContainerFeatureID != newContainerFeatureID)
       {
-        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, oldContainerFeatureID,
-            oldContainer, null);
+        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, oldContainerFeatureID, oldContainer, null);
         if (msgs == null)
         {
           msgs = notification;
@@ -1235,8 +1231,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
    * Adjust the reference ONLY if the opposite reference used CDOID. This is true ONLY if the state of <cdo>this</code>
    * was not {@link CDOState#NEW}.
    */
-  private static void adjustOppositeReference(InternalCDOObject instance, InternalEObject opposite,
-      EReference oppositeReference)
+  private static void adjustOppositeReference(InternalCDOObject instance, InternalEObject opposite, EReference oppositeReference)
   {
     if (opposite != null)
     {
@@ -1285,16 +1280,14 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
   /**
    * @since 3.0
    */
-  public static void instanceToRevisionFeature(InternalCDOView view, InternalCDOObject object,
-      EStructuralFeature feature, Object setting)
+  public static void instanceToRevisionFeature(InternalCDOView view, InternalCDOObject object, EStructuralFeature feature, Object setting)
   {
     if (TRACER.isEnabled())
     {
       TRACER.format("Populating feature {0}", feature); //$NON-NLS-1$
     }
 
-    PersistenceFilter filter = ((InternalCDOClassInfo)CDOModelUtil.getClassInfo(feature.getEContainingClass()))
-        .getPersistenceFilter(feature);
+    PersistenceFilter filter = ((InternalCDOClassInfo)CDOModelUtil.getClassInfo(feature.getEContainingClass())).getPersistenceFilter(feature);
     if (filter != null)
     {
       if (TRACER.isEnabled())
@@ -1332,8 +1325,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
   /**
    * @since 2.0
    */
-  public static void revisionToInstanceFeature(InternalCDOObject instance, InternalCDORevision revision,
-      EStructuralFeature eFeature)
+  public static void revisionToInstanceFeature(InternalCDOObject instance, InternalCDORevision revision, EStructuralFeature eFeature)
   {
     if (TRACER.isEnabled())
     {
@@ -1642,8 +1634,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
     public CDOStoreEcoreEMap(EStructuralFeature eStructuralFeature)
     {
       super((EClass)eStructuralFeature.getEType(), BasicEMap.Entry.class, null);
-      delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(CDOObjectImpl.this,
-          eStructuralFeature)
+      delegateEList = new EStoreEObjectImpl.BasicEStoreEList<BasicEMap.Entry<Object, Object>>(CDOObjectImpl.this, eStructuralFeature)
       {
         private static final long serialVersionUID = 1L;
 
@@ -1661,8 +1652,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
         }
 
         @Override
-        protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject,
-            BasicEMap.Entry<Object, Object> oldObject)
+        protected void didSet(int index, BasicEMap.Entry<Object, Object> newObject, BasicEMap.Entry<Object, Object> oldObject)
         {
           didRemove(index, oldObject);
           didAdd(index, newObject);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
index 47da7389b0..04bedec85f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java
@@ -42,69 +42,59 @@ public class CDODeltaNotificationImpl extends ENotificationImpl implements CDODe
 {
   private CDORevisionDelta revisionDelta;
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue, Object newValue)
   {
     super(getEObject(notifier), eventType, feature, oldValue, newValue);
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue, int position)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, Object oldValue, Object newValue, int position)
   {
     super(getEObject(notifier), eventType, feature, oldValue, newValue, position);
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      boolean oldBooleanValue, boolean newBooleanValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, boolean oldBooleanValue, boolean newBooleanValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldBooleanValue, newBooleanValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      byte oldByteValue, byte newByteValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, byte oldByteValue, byte newByteValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldByteValue, newByteValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      char oldCharValue, char newCharValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, char oldCharValue, char newCharValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldCharValue, newCharValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      double oldDoubleValue, double newDoubleValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, double oldDoubleValue, double newDoubleValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldDoubleValue, newDoubleValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      float oldFloatValue, float newFloatValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, float oldFloatValue, float newFloatValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldFloatValue, newFloatValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, int oldIntValue,
-      int newIntValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, int oldIntValue, int newIntValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldIntValue, newIntValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      long oldLongValue, long newLongValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, long oldLongValue, long newLongValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldLongValue, newLongValue);
     this.feature = feature;
   }
 
-  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature,
-      short oldShortValue, short newShortValue)
+  public CDODeltaNotificationImpl(InternalEObject notifier, int eventType, EStructuralFeature feature, short oldShortValue, short newShortValue)
   {
     super(getEObject(notifier), eventType, feature.getFeatureID(), oldShortValue, newShortValue);
     this.feature = feature;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
index d3323b16cf..0a1f780280 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
@@ -51,8 +51,7 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
     super(object);
 
     instance.eAdapters().add(this);
-    ((org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList)instance.eAdapters())
-        .addListener(new AdapterListListener());
+    ((org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList)instance.eAdapters()).addListener(new AdapterListListener());
   }
 
   public void setTarget(Notifier newTarget)
@@ -330,8 +329,7 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
    * @author Martin Fluegge
    * @since 3.0
    */
-  protected class AdapterListListener
-      implements org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
+  protected class AdapterListListener implements org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
   {
     /**
      * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
index d5dc92396e..4d6bdeae30 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
@@ -605,8 +605,8 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
         TRACER.format("State of Object (" + this + "/" + instance + ") is : " + viewAndState.state); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       }
 
-      if (viewAndState.state == CDOState.CLEAN || viewAndState.state == CDOState.PROXY
-          || viewAndState.state == CDOState.NEW || viewAndState.state == CDOState.DIRTY)
+      if (viewAndState.state == CDOState.CLEAN || viewAndState.state == CDOState.PROXY || viewAndState.state == CDOState.NEW
+          || viewAndState.state == CDOState.DIRTY)
       {
         InternalCDORevision revision = cdoRevision();
         int size = revision.size(feature);
@@ -865,8 +865,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
    *          that will be used later to resolve the proxy. <code>null</code> indicates that proxy creation will be
    *          avoided!
    */
-  protected InternalEObject getEObjectFromPotentialID(InternalCDOView view, EStructuralFeature feature,
-      Object potentialID)
+  protected InternalEObject getEObjectFromPotentialID(InternalCDOView view, EStructuralFeature feature, Object potentialID)
   {
     CDOLegacyWrapper wrapper;
     if (potentialID instanceof CDOID && (wrapper = getRegisteredWrapper((CDOID)potentialID)) != null)
@@ -1178,8 +1177,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
 
   }
 
-  private void adjustPersistentOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject,
-      EReference oppositeReference)
+  private void adjustPersistentOppositeReference(InternalCDOObject cdoObject, EObject oppositeObject, EReference oppositeReference)
   {
     InternalCDOObject oppositeCDOObject = (InternalCDOObject)CDOUtil.getCDOObject(oppositeObject);
     if (oppositeCDOObject != null)
@@ -1212,8 +1210,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
     }
   }
 
-  private void adjustTransientOppositeReference(InternalEObject instance, InternalEObject object,
-      EReference oppositeReference)
+  private void adjustTransientOppositeReference(InternalEObject instance, InternalEObject object, EReference oppositeReference)
   {
     boolean wasDeliver = object.eDeliver(); // Disable notifications
     if (wasDeliver)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
index 2dddf8cd89..b04c249ca3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDONotificationBuilder.java
@@ -82,8 +82,8 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
   /**
    * @since 3.0
    */
-  public synchronized NotificationChain buildNotification(InternalEObject object, InternalCDORevision oldRevision,
-      CDORevisionDelta revisionDelta, Set<CDOObject> detachedObjects)
+  public synchronized NotificationChain buildNotification(InternalEObject object, InternalCDORevision oldRevision, CDORevisionDelta revisionDelta,
+      Set<CDOObject> detachedObjects)
   {
     notification = new NotificationChainImpl();
 
@@ -119,16 +119,14 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
       }
     }
 
-    add(new CDODeltaNotificationImpl(object, Notification.MOVE, feature, Integer.valueOf(oldPosition), oldValue,
-        newPosition));
+    add(new CDODeltaNotificationImpl(object, Notification.MOVE, feature, Integer.valueOf(oldPosition), oldValue, newPosition));
   }
 
   @Override
   public void visit(CDOAddFeatureDelta delta)
   {
     EStructuralFeature feature = delta.getFeature();
-    add(new CDODeltaNotificationImpl(object, Notification.ADD, feature, getOldValue(feature), delta.getValue(),
-        delta.getIndex()));
+    add(new CDODeltaNotificationImpl(object, Notification.ADD, feature, getOldValue(feature), delta.getValue(), delta.getIndex()));
   }
 
   @Override
@@ -253,8 +251,7 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
 
     }
 
-    add(new CDODeltaNotificationImpl(object, Notification.SET, EcorePackage.eINSTANCE.eContainmentFeature(), oldValue,
-        delta.getContainerID()));
+    add(new CDODeltaNotificationImpl(object, Notification.SET, EcorePackage.eINSTANCE.eContainmentFeature(), oldValue, delta.getContainerID()));
   }
 
   private CDOObject findObjectByID(CDOID id)
@@ -294,8 +291,7 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
     return oldRevision.getValue(feature);
   }
 
-  private CDODeltaNotificationImpl createNotification(int eventType, EStructuralFeature feature, Object oldValue,
-      Object newValue, int position)
+  private CDODeltaNotificationImpl createNotification(int eventType, EStructuralFeature feature, Object oldValue, Object newValue, int position)
   {
     EClassifier eType = feature.getEType();
 
@@ -343,42 +339,34 @@ public class CDONotificationBuilder extends CDOFeatureDeltaVisitorImpl
     return new CDODeltaNotificationImpl(object, eventType, feature, oldValue, newValue, position);
   }
 
-  private CDODeltaNotificationImpl createPrimitiveNotification(int eventType, EStructuralFeature feature,
-      Class<?> instanceClass, Object oldValue, Object newValue)
+  private CDODeltaNotificationImpl createPrimitiveNotification(int eventType, EStructuralFeature feature, Class<?> instanceClass, Object oldValue,
+      Object newValue)
   {
     switch (ReflectUtil.PrimitiveType.forClass(instanceClass))
     {
     case BOOLEAN:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Boolean)oldValue).booleanValue(),
-          ((Boolean)newValue).booleanValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Boolean)oldValue).booleanValue(), ((Boolean)newValue).booleanValue());
 
     case BYTE:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).byteValue(),
-          ((Number)newValue).byteValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).byteValue(), ((Number)newValue).byteValue());
 
     case CHAR:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Character)oldValue).charValue(),
-          ((Character)newValue).charValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Character)oldValue).charValue(), ((Character)newValue).charValue());
 
     case SHORT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).shortValue(),
-          ((Number)newValue).shortValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).shortValue(), ((Number)newValue).shortValue());
 
     case INT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).intValue(),
-          ((Number)newValue).intValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).intValue(), ((Number)newValue).intValue());
 
     case LONG:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).longValue(),
-          ((Number)newValue).longValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).longValue(), ((Number)newValue).longValue());
 
     case FLOAT:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).floatValue(),
-          ((Number)newValue).floatValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).floatValue(), ((Number)newValue).floatValue());
 
     case DOUBLE:
-      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).doubleValue(),
-          ((Number)newValue).doubleValue());
+      return new CDODeltaNotificationImpl(object, eventType, feature, ((Number)oldValue).doubleValue(), ((Number)newValue).doubleValue());
 
     case VOID:
       throw new IllegalArgumentException("Feature of void type not supported: " + feature); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
index 4bd6f0c288..60e6170637 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOObjectWrapperBase.java
@@ -228,8 +228,7 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
     return instance.eBasicRemoveFromContainer(notifications);
   }
 
-  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain notifications)
+  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID, NotificationChain notifications)
   {
     return instance.eBasicSetContainer(newContainer, newContainerFeatureID, notifications);
   }
@@ -347,14 +346,12 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
     return instance.eInternalResource();
   }
 
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass, NotificationChain notifications)
   {
     return instance.eInverseAdd(otherEnd, featureID, baseClass, notifications);
   }
 
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass, NotificationChain notifications)
   {
     return instance.eInverseRemove(otherEnd, featureID, baseClass, notifications);
   }
@@ -372,10 +369,8 @@ public abstract class CDOObjectWrapperBase implements CDOObject, InternalEObject
   public boolean eIsSet(int featureID)
   {
     // Features that need special handling
-    if (featureID == EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE
-        || featureID == EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME
-        || featureID == EcorePackage.ECLASS__EGENERIC_SUPER_TYPES
-        || featureID == EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS)
+    if (featureID == EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE || featureID == EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME
+        || featureID == EcorePackage.ECLASS__EGENERIC_SUPER_TYPES || featureID == EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS)
     {
       return isSetInstanceValue(instance, instance.eClass().getEStructuralFeature(featureID));
     }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
index 1e4cdb9cdf..270a7664ad 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOAuthenticatorImpl.java
@@ -94,8 +94,7 @@ public class CDOAuthenticatorImpl implements org.eclipse.emf.cdo.common.protocol
   {
     try
     {
-      return SecurityUtil.encrypt(token, password, encryptionAlgorithmName, encryptionSaltBytes,
-          encryptionIterationCount);
+      return SecurityUtil.encrypt(token, password, encryptionAlgorithmName, encryptionSaltBytes, encryptionIterationCount);
     }
     catch (RuntimeException ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
index c205764635..15c2d23ded 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOCollectionLoadingPolicyImpl.java
@@ -78,8 +78,7 @@ public class CDOCollectionLoadingPolicyImpl implements CDOCollectionLoadingPolic
     return doResolveProxy(rev, feature, accessIndex, serverIndex, chunkSize);
   }
 
-  private Object doResolveProxy(CDORevision rev, EStructuralFeature feature, int accessIndex, int serverIndex,
-      int chunkSize)
+  private Object doResolveProxy(CDORevision rev, EStructuralFeature feature, int accessIndex, int serverIndex, int chunkSize)
   {
     // Get proxy values
     InternalCDORevision revision = (InternalCDORevision)rev;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
index 22776fc045..7313988d36 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
@@ -45,8 +45,7 @@ public abstract class CDOSessionFactory extends Factory
       String query = uri.getQuery();
       if (StringUtil.isEmpty(query))
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
       }
 
       Map<String, String> parameters = CDOURIUtil.getParameters(query);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index ba43d6eaaf..553b9098a0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -159,8 +159,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * @author Eike Stepper
  */
-public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
-    implements InternalCDOSession, IExecutorServiceProvider
+public abstract class CDOSessionImpl extends CDOTransactionContainerImpl implements InternalCDOSession, IExecutorServiceProvider
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, CDOSessionImpl.class);
 
@@ -671,8 +670,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     });
   }
 
-  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch,
-      List<InternalCDOView> branchViews, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
+  public void processRefreshSessionResult(RefreshSessionResult result, CDOBranch branch, List<InternalCDOView> branchViews,
+      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
   {
     Map<CDOID, InternalCDORevision> oldRevisions = viewedRevisions.get(branch);
 
@@ -712,8 +711,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     }
   }
 
-  private void collectViewedRevisions(Map<CDOBranch, List<InternalCDOView>> views,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
+  private void collectViewedRevisions(Map<CDOBranch, List<InternalCDOView>> views, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions)
   {
     for (InternalCDOView view : getViews())
     {
@@ -1100,8 +1098,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
   }
 
   @Deprecated
-  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache,
-      byte securityImpact, Map<CDOID, CDOPermission> newPermissions)
+  public void invalidate(CDOCommitInfo commitInfo, InternalCDOTransaction sender, boolean clearResourcePathCache, byte securityImpact,
+      Map<CDOID, CDOPermission> newPermissions)
   {
     throw new UnsupportedOperationException();
   }
@@ -1191,14 +1189,12 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     return CDORevisionUtil.createChangeSetData(ids, sourceInfo, targetInfo);
   }
 
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase,
-      boolean computeChangeSets)
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint sourceBase, boolean computeChangeSets)
   {
     return getMergeData(target, source, null, sourceBase, computeChangeSets);
   }
 
-  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase,
-      CDOBranchPoint sourceBase, boolean computeChangeSets)
+  public MergeData getMergeData(CDOBranchPoint target, CDOBranchPoint source, CDOBranchPoint targetBase, CDOBranchPoint sourceBase, boolean computeChangeSets)
   {
     boolean auto;
     if (sourceBase == CDOBranchUtil.AUTO_BRANCH_POINT)
@@ -1265,8 +1261,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       sourceChanges = createChangeSet(result.getSourceIDs(), sourceBaseInfo, sourceInfo);
     }
 
-    return new MergeData(target, targetInfo, targetBase, targetBaseInfo, result.getTargetIDs(), targetChanges, source,
-        sourceInfo, sourceBase, sourceBaseInfo, result.getSourceIDs(), sourceChanges, result.getResultBase());
+    return new MergeData(target, targetInfo, targetBase, targetBaseInfo, result.getTargetIDs(), targetChanges, source, sourceInfo, sourceBase, sourceBaseInfo,
+        result.getSourceIDs(), sourceChanges, result.getResultBase());
   }
 
   @Deprecated
@@ -1330,8 +1326,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       if (revision.getBranch() != branch)
       {
         CDOID id = revision.getID();
-        CDORevision firstRevision = revisionManager.getCache().getRevisionByVersion(id,
-            branch.getVersion(CDOBranchVersion.FIRST_VERSION));
+        CDORevision firstRevision = revisionManager.getCache().getRevisionByVersion(id, branch.getVersion(CDOBranchVersion.FIRST_VERSION));
         if (firstRevision != null)
         {
           long revised = firstRevision.getTimeStamp() - 1L;
@@ -1343,8 +1338,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     }
   }
 
-  private CDOChangeSet createChangeSet(Set<CDOID> ids, CDORevisionAvailabilityInfo startInfo,
-      CDORevisionAvailabilityInfo endInfo)
+  private CDOChangeSet createChangeSet(Set<CDOID> ids, CDORevisionAvailabilityInfo startInfo, CDORevisionAvailabilityInfo endInfo)
   {
     CDOChangeSetData data = CDORevisionUtil.createChangeSetData(ids, startInfo, endInfo);
     return CDORevisionUtil.createChangeSet(startInfo.getBranchPoint(), endInfo.getBranchPoint(), data);
@@ -1506,8 +1500,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
           IListener[] listeners = getListeners();
           if (listeners != null)
           {
-            fireEvent(new PassiveUpdateEventImpl(!passiveUpdateEnabled, passiveUpdateEnabled, passiveUpdateMode,
-                passiveUpdateMode), listeners);
+            fireEvent(new PassiveUpdateEventImpl(!passiveUpdateEnabled, passiveUpdateEnabled, passiveUpdateMode, passiveUpdateMode), listeners);
           }
         }
       }
@@ -1533,9 +1526,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
           IListener[] listeners = getListeners();
           if (listeners != null)
           {
-            fireEvent(
-                new PassiveUpdateEventImpl(passiveUpdateEnabled, passiveUpdateEnabled, oldMode, passiveUpdateMode),
-                listeners);
+            fireEvent(new PassiveUpdateEventImpl(passiveUpdateEnabled, passiveUpdateEnabled, oldMode, passiveUpdateMode), listeners);
           }
         }
       }
@@ -1713,8 +1704,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     /**
      * @author Eike Stepper
      */
-    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent
-        implements GeneratedPackageEmulationEvent
+    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent implements GeneratedPackageEmulationEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -1739,8 +1729,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       private PassiveUpdateMode newMode;
 
-      public PassiveUpdateEventImpl(boolean oldEnabled, boolean newEnabled, PassiveUpdateMode oldMode,
-          PassiveUpdateMode newMode)
+      public PassiveUpdateEventImpl(boolean oldEnabled, boolean newEnabled, PassiveUpdateMode oldMode, PassiveUpdateMode newMode)
       {
         super(OptionsImpl.this);
         this.oldEnabled = oldEnabled;
@@ -1906,10 +1895,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       if (DEBUG)
       {
-        IOUtil.OUT()
-            .println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] "
-                + invalidation.getPreviousTimeStamp() % 10000 + " --> " + invalidation.getTimeStamp() % 10000
-                + "    reorderQueue=" + reorderQueue + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
+        IOUtil.OUT().println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + invalidation.getPreviousTimeStamp() % 10000 + " --> "
+            + invalidation.getTimeStamp() % 10000 + "    reorderQueue=" + reorderQueue + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
       }
 
       scheduleInvalidations();
@@ -2002,8 +1989,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
       if (Invalidator.DEBUG)
       {
-        IOUtil.OUT().println(
-            CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + timeStamp % 10000 + "    INVALIDATE");
+        IOUtil.OUT().println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + timeStamp % 10000 + "    INVALIDATE");
       }
 
       try
@@ -2044,8 +2030,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
         for (InternalCDOView view : views)
         {
-          invalidateView(commitInfo, view, sender, oldRevisions, invalidationData.isClearResourcePathCache(),
-              lockChangeInfo);
+          invalidateView(commitInfo, view, sender, oldRevisions, invalidationData.isClearResourcePathCache(), lockChangeInfo);
         }
       }
       catch (RuntimeException ex)
@@ -2142,8 +2127,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
         {
           CDORevisionDelta revisionDelta = (CDORevisionDelta)key;
 
-          InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, revisionDelta,
-              CDORevision.UNCHUNKED, false);
+          InternalCDORevision oldRevision = revisionManager.getRevisionByVersion(id, revisionDelta, CDORevision.UNCHUNKED, false);
           if (oldRevision != null)
           {
             addOldValuesToDelta(oldRevision, revisionDelta);
@@ -2213,8 +2197,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
       revisionManager.addRevision(newRevision);
     }
 
-    private void invalidateView(CDOCommitInfo commitInfo, InternalCDOView view, InternalCDOTransaction sender,
-        Map<CDOID, InternalCDORevision> oldRevisions, boolean clearResourcePathCache, CDOLockChangeInfo lockChangeInfo)
+    private void invalidateView(CDOCommitInfo commitInfo, InternalCDOView view, InternalCDOTransaction sender, Map<CDOID, InternalCDORevision> oldRevisions,
+        boolean clearResourcePathCache, CDOLockChangeInfo lockChangeInfo)
     {
       try
       {
@@ -2268,8 +2252,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
 
     private Map<CDORevision, CDOPermission> oldPermissions;
 
-    public InvalidationEvent(InternalCDOTransaction sender, CDOCommitInfo commitInfo, byte securityImpact,
-        Map<CDORevision, CDOPermission> oldPermissions)
+    public InvalidationEvent(InternalCDOTransaction sender, CDOCommitInfo commitInfo, byte securityImpact, Map<CDORevision, CDOPermission> oldPermissions)
     {
       super(CDOSessionImpl.this);
       this.sender = sender;
@@ -2343,8 +2326,7 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl
     public CDOCommitInfo getMergedCommitInfo()
     {
       CDOBranchPoint mergeSource = getMergeSource();
-      return mergeSource == null ? null
-          : commitInfoManager.getCommitInfo(mergeSource.getBranch(), mergeSource.getTimeStamp(), false);
+      return mergeSource == null ? null : commitInfoManager.getCommitInfo(mergeSource.getBranch(), mergeSource.getTimeStamp(), false);
     }
 
     public boolean isEmpty()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
index 10a8834966..5cc979e828 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
@@ -197,8 +197,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
+  public void switchTarget(int viewID, CDOBranchPoint branchPoint, List<InternalCDOObject> invalidObjects, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, OMMonitor monitor)
   {
     int attempt = 0;
     for (;;)
@@ -269,8 +269,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
-      CDORevisionHandler handler)
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
   {
     int attempt = 0;
     for (;;)
@@ -288,8 +287,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData,
+      Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -311,8 +310,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
+  public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, CDOCommitData commitData,
+      Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
@@ -659,8 +658,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex,
-      int fromIndex, int toIndex)
+  public Object loadChunk(InternalCDORevision revision, EStructuralFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex)
   {
     int attempt = 0;
     for (;;)
@@ -676,8 +674,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk,
-      int prefetchDepth)
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
   {
     int attempt = 0;
     for (;;)
@@ -726,8 +723,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch,
-      LockType lockType, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch, LockType lockType, long timeout)
+      throws InterruptedException
   {
     throw new UnsupportedOperationException();
   }
@@ -735,8 +732,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   /**
    * @since 4.1
    */
-  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch,
-      LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult lockObjects2(List<CDORevisionKey> revisionKeys, int viewID, CDOBranch viewedBranch, LockType lockType, boolean recursive,
+      long timeout) throws InterruptedException
 
   {
     int attempt = 0;
@@ -753,8 +750,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys,
-      CDOBranch viewedBranch, LockType lockType, boolean recursive, long timeout) throws InterruptedException
+  public LockObjectsResult delegateLockObjects(String lockAreaID, List<CDORevisionKey> revisionKeys, CDOBranch viewedBranch, LockType lockType,
+      boolean recursive, long timeout) throws InterruptedException
   {
     int attempt = 0;
     for (;;)
@@ -770,8 +767,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult delegateUnlockObjects(String lockAreaID, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     int attempt = 0;
     for (;;)
@@ -855,8 +851,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public RefreshSessionResult refresh(long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
+  public RefreshSessionResult refresh(long lastUpdateTime, Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates)
   {
     int attempt = 0;
@@ -879,8 +874,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     throw new UnsupportedOperationException();
   }
 
-  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType,
-      boolean recursive)
+  public UnlockObjectsResult unlockObjects2(CDOView view, Collection<CDOID> objectIDs, LockType lockType, boolean recursive)
   {
     int attempt = 0;
     for (;;)
@@ -995,8 +989,8 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
   }
 
   @Deprecated
-  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo,
-      CDORevisionAvailabilityInfo targetBaseInfo, CDORevisionAvailabilityInfo sourceBaseInfo)
+  public Set<CDOID> loadMergeData(CDORevisionAvailabilityInfo targetInfo, CDORevisionAvailabilityInfo sourceInfo, CDORevisionAvailabilityInfo targetBaseInfo,
+      CDORevisionAvailabilityInfo sourceBaseInfo)
   {
     throw new UnsupportedOperationException();
   }
@@ -1068,8 +1062,7 @@ public class DelegatingSessionProtocol extends Lifecycle implements CDOSessionPr
     }
   }
 
-  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler,
-      OMMonitor monitor)
+  public boolean requestUnit(int viewID, CDOID rootID, UnitOpcode opcode, CDORevisionHandler revisionHandler, OMMonitor monitor)
   {
     int attempt = 0;
     for (;;)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
index e292fc67da..3882fe8a16 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOHandlingConflictResolver.java
@@ -57,8 +57,7 @@ public class CDOHandlingConflictResolver extends CDOMergingConflictResolver impl
     super(merger);
   }
 
-  public CDOHandlingConflictResolver(ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications,
-      ConflictHandler conflictHandler)
+  public CDOHandlingConflictResolver(ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications, ConflictHandler conflictHandler)
   {
     super(resolutionPreference, ensureRemoteNotifications);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
index 6dfaf285b6..b6f5af508c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
@@ -373,8 +373,8 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
     }
   }
 
-  private CDOChangeSetData createChangeSetData(Map<CDOID, CDOObject> newObjects,
-      Map<CDOID, CDORevisionDelta> revisionDeltas, Map<CDOID, CDOObject> detachedObjects)
+  private CDOChangeSetData createChangeSetData(Map<CDOID, CDOObject> newObjects, Map<CDOID, CDORevisionDelta> revisionDeltas,
+      Map<CDOID, CDOObject> detachedObjects)
   {
     List<CDOIDAndVersion> newList = new ArrayList<CDOIDAndVersion>(newObjects.size());
     for (CDOObject object : newObjects.values())
@@ -450,8 +450,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
         }
 
         Map<CDOID, CDOObject> newObjects = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           newObjects.putAll(savepoint.getNewObjects());
 
@@ -519,8 +518,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
 
         // We need to combined the result for all delta in different Savepoint
         Map<CDOID, CDORevisionDelta> allRevisionDeltas = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           for (CDORevisionDelta revisionDelta : savepoint.getRevisionDeltas2().values())
           {
@@ -576,8 +574,7 @@ public class CDOSavepointImpl extends CDOUserSavepointImpl implements InternalCD
         }
 
         Map<CDOID, CDOObject> detachedObjects = CDOIDUtil.createMap();
-        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint
-            .getNextSavepoint())
+        for (InternalCDOSavepoint savepoint = getFirstSavePoint(); savepoint != null; savepoint = savepoint.getNextSavepoint())
         {
           for (Entry<CDOID, CDOObject> entry : savepoint.getDetachedObjects().entrySet())
           {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
index de7f8331a7..a62f2d5427 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
@@ -60,8 +60,7 @@ public class CDOSingleTransactionStrategyImpl implements CDOTransactionStrategy
     InternalCDOSession session = transaction.getSession();
     CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
 
-    CommitTransactionResult result = sessionProtocol.commitTransaction(commitContext,
-        EclipseMonitor.convert(progressMonitor));
+    CommitTransactionResult result = sessionProtocol.commitTransaction(commitContext, EclipseMonitor.convert(progressMonitor));
 
     commitContext.postCommit(result);
 
@@ -109,8 +108,7 @@ public class CDOSingleTransactionStrategyImpl implements CDOTransactionStrategy
     String userID = session.getUserID();
 
     InternalCDOCommitInfoManager commitInfoManager = session.getCommitInfoManager();
-    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-        commitData);
+    return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
   }
 
   public void rollback(InternalCDOTransaction transaction, InternalCDOUserSavepoint savepoint)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index a018653509..01992801c8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -559,8 +559,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return merge(source, sourceBase, null, merger);
   }
 
-  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase,
-      CDOMerger merger)
+  public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOBranchPoint targetBase, CDOMerger merger)
   {
     synchronized (getViewMonitor())
     {
@@ -641,14 +640,14 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Deprecated
-  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData,
-      CDORevisionProvider targetBaseProvider, CDORevisionProvider targetProvider, CDOBranchPoint source)
+  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData, CDORevisionProvider targetBaseProvider,
+      CDORevisionProvider targetProvider, CDOBranchPoint source)
   {
     throw new UnsupportedOperationException();
   }
 
-  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider resultBaseProvider,
-      CDORevisionProvider targetProvider, CDOBranchPoint source, boolean keepVersions) throws ChangeSetOutdatedException
+  public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider resultBaseProvider, CDORevisionProvider targetProvider,
+      CDOBranchPoint source, boolean keepVersions) throws ChangeSetOutdatedException
   {
     synchronized (getViewMonitor())
     {
@@ -659,8 +658,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         ApplyChangeSetResult result = new ApplyChangeSetResult();
 
         // Merges from local offline branches may require additional ID mappings: localID -> tempID
-        if (source != null && source.getBranch().isLocal() && getSession().getRepositoryInfo()
-            .getIDGenerationLocation() == CDOCommonRepository.IDGenerationLocation.STORE)
+        if (source != null && source.getBranch().isLocal()
+            && getSession().getRepositoryInfo().getIDGenerationLocation() == CDOCommonRepository.IDGenerationLocation.STORE)
         {
           applyLocalIDMapping(changeSetData, result);
         }
@@ -671,12 +670,11 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         applyNewObjects(changeSetData.getNewObjects(), resultData.getNewObjects());
 
         // Detached objects
-        Set<CDOObject> detachedSet = applyDetachedObjects(changeSetData.getDetachedObjects(),
-            resultData.getDetachedObjects());
+        Set<CDOObject> detachedSet = applyDetachedObjects(changeSetData.getDetachedObjects(), resultData.getDetachedObjects());
 
         // Changed objects
-        Map<CDOID, InternalCDORevision> oldRevisions = applyChangedObjects(changeSetData.getChangedObjects(),
-            resultBaseProvider, targetProvider, keepVersions, resultData.getChangedObjects());
+        Map<CDOID, InternalCDORevision> oldRevisions = applyChangedObjects(changeSetData.getChangedObjects(), resultBaseProvider, targetProvider, keepVersions,
+            resultData.getChangedObjects());
 
         // Delta notifications
         Collection<CDORevisionDelta> notificationDeltas = lastSavepoint.getRevisionDeltas2().values();
@@ -792,9 +790,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return detachedSet;
   }
 
-  private Map<CDOID, InternalCDORevision> applyChangedObjects(List<CDORevisionKey> changedObjects,
-      CDORevisionProvider resultBaseProvider, CDORevisionProvider targetProvider, boolean keepVersions,
-      List<CDORevisionKey> result) throws ChangeSetOutdatedException
+  private Map<CDOID, InternalCDORevision> applyChangedObjects(List<CDORevisionKey> changedObjects, CDORevisionProvider resultBaseProvider,
+      CDORevisionProvider targetProvider, boolean keepVersions, List<CDORevisionKey> result) throws ChangeSetOutdatedException
   {
     Map<CDOID, InternalCDORevision> oldRevisions = CDOIDUtil.createMap();
 
@@ -884,8 +881,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
    * Synchronized through InvalidationRunnable.run()
    */
   @Override
-  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> deltas)
+  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> deltas)
   {
     synchronized (getViewMonitor())
     {
@@ -925,8 +921,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
         try
         {
-          Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> remaining = new HashMap<CDOObject, Pair<CDORevision, CDORevisionDelta>>(
-              conflicts);
+          Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> remaining = new HashMap<CDOObject, Pair<CDORevision, CDORevisionDelta>>(conflicts);
           for (CDOConflictResolver resolver : resolvers)
           {
             if (resolver instanceof CDOConflictResolver2)
@@ -1599,8 +1594,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return info;
   }
 
-  private CDOCommitInfo commitSynced(IProgressMonitor progressMonitor)
-      throws DanglingIntegrityException, CommitException
+  private CDOCommitInfo commitSynced(IProgressMonitor progressMonitor) throws DanglingIntegrityException, CommitException
   {
     synchronized (getViewMonitor())
     {
@@ -1643,8 +1637,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
           {
             // The commit may have succeeded on the server, but after that network problems or timeouts have hit us.
             // Let's see if we can recover...
-            CDOCommitInfo info = session.getSessionProtocol().resetTransaction(getViewID(),
-                commitToken.getCommitNumber());
+            CDOCommitInfo info = session.getSessionProtocol().resetTransaction(getViewID(), commitToken.getCommitNumber());
             if (info != null)
             {
               lastCommitTime = info.getTimeStamp();
@@ -1751,8 +1744,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     Set<InternalCDOObject> newObjects = new HashSet<InternalCDOObject>();
 
     // Start from the last savepoint and come back up to the active
-    for (InternalCDOSavepoint itrSavepoint = lastSavepoint; itrSavepoint != null; itrSavepoint = itrSavepoint
-        .getPreviousSavepoint())
+    for (InternalCDOSavepoint itrSavepoint = lastSavepoint; itrSavepoint != null; itrSavepoint = itrSavepoint.getPreviousSavepoint())
     {
       Set<Object> toBeDetached = new HashSet<Object>();
 
@@ -1953,8 +1945,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
 
     CDOObjectMerger merger = new CDOObjectMerger();
-    for (InternalCDOSavepoint itrSavepoint = firstSavepoint; itrSavepoint != savepoint; itrSavepoint = itrSavepoint
-        .getNextSavepoint())
+    for (InternalCDOSavepoint itrSavepoint = firstSavepoint; itrSavepoint != savepoint; itrSavepoint = itrSavepoint.getNextSavepoint())
     {
       for (CDORevisionDelta delta : itrSavepoint.getRevisionDeltas2().values())
       {
@@ -2094,8 +2085,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         if (lastSavepoint == firstSavepoint && options().isAutoReleaseLocksEnabled())
         {
           CDORepositoryInfo repositoryInfo = getSession().getRepositoryInfo();
-          if (isDurableView() && repositoryInfo.getState() == CDOCommonRepository.State.ONLINE
-              || repositoryInfo.getType() == CDOCommonRepository.Type.MASTER)
+          if (isDurableView() && repositoryInfo.getState() == CDOCommonRepository.State.ONLINE || repositoryInfo.getType() == CDOCommonRepository.Type.MASTER)
           {
             // Unlock all objects
             unlockObjects(null, null);
@@ -2288,8 +2278,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private CDOOriginSizeProvider getOriginSizeProvider(InternalCDOObject object, CDOFeatureDelta featureDelta,
-      InternalCDORevision cleanRevision)
+  private CDOOriginSizeProvider getOriginSizeProvider(InternalCDOObject object, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
   {
     EStructuralFeature feature = featureDelta.getFeature();
     if (feature.isMany())
@@ -2338,8 +2327,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta,
-      InternalCDORevision cleanRevision)
+  public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
   {
     synchronized (getViewMonitor())
     {
@@ -2503,8 +2491,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private static List<EPackage> analyzeNewPackages(Collection<EPackage> usedTopLevelPackages,
-      CDOPackageRegistry packageRegistry)
+  private static List<EPackage> analyzeNewPackages(Collection<EPackage> usedTopLevelPackages, CDOPackageRegistry packageRegistry)
   {
     // Determine which of the corresponding EPackages are new
     List<EPackage> newPackages = new ArrayList<EPackage>();
@@ -2586,18 +2573,14 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   {
     InternalCDOSavepoint newSavepoint = createSavepoint(null);
     copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());
-    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(),
-        newSavepoint.getDirtyObjects());
-    copyUncommitted(lastSavepoint.getAllRevisionDeltas(), commitContext.getRevisionDeltas(),
-        newSavepoint.getRevisionDeltas2());
-    copyUncommitted(lastSavepoint.getAllDetachedObjects(), commitContext.getDetachedObjects(),
-        newSavepoint.getDetachedObjects());
+    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(), newSavepoint.getDirtyObjects());
+    copyUncommitted(lastSavepoint.getAllRevisionDeltas(), commitContext.getRevisionDeltas(), newSavepoint.getRevisionDeltas2());
+    copyUncommitted(lastSavepoint.getAllDetachedObjects(), commitContext.getDetachedObjects(), newSavepoint.getDetachedObjects());
     lastSavepoint = newSavepoint;
     firstSavepoint = lastSavepoint;
   }
 
-  private <T> void copyUncommitted(Map<CDOID, T> oldSavepointMap, Map<CDOID, T> commitContextMap,
-      Map<CDOID, T> newSavepointMap)
+  private <T> void copyUncommitted(Map<CDOID, T> oldSavepointMap, Map<CDOID, T> commitContextMap, Map<CDOID, T> newSavepointMap)
   {
     for (Entry<CDOID, T> entry : oldSavepointMap.entrySet())
     {
@@ -2823,8 +2806,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
   }
 
-  private void importNewRevisions(CDODataInput in, List<InternalCDORevision> revisions, Map<CDOID, CDOID> idMappings)
-      throws IOException
+  private void importNewRevisions(CDODataInput in, List<InternalCDORevision> revisions, Map<CDOID, CDOID> idMappings) throws IOException
   {
     int size = in.readInt();
     for (int i = 0; i < size; i++)
@@ -2962,8 +2944,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, final String name,
-      final boolean exactMatch)
+  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, final String name, final boolean exactMatch)
   {
     if (!isDirty())
     {
@@ -3051,8 +3032,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       return new AbstractCloseableIterator<CDOResourceNode>()
       {
-        private Iterator<CDOResourceNode> addedNodesIterator = finalAddedNodes == null ? null
-            : finalAddedNodes.iterator();
+        private Iterator<CDOResourceNode> addedNodesIterator = finalAddedNodes == null ? null : finalAddedNodes.iterator();
 
         @Override
         protected Object computeNextElement()
@@ -3242,8 +3222,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     if (!isDirty())
     {
@@ -3317,8 +3296,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return AbstractCloseableIterator.emptyCloseable();
   }
 
-  private List<CDOObjectReference> queryXRefsLocal(Set<CDOID> localIDs, Set<CDOID> targetIDs,
-      Set<EReference> relevantReferences)
+  private List<CDOObjectReference> queryXRefsLocal(Set<CDOID> localIDs, Set<CDOID> targetIDs, Set<EReference> relevantReferences)
   {
     List<CDOObjectReference> refs = null;
 
@@ -3344,8 +3322,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       for (EReference reference : revision.getClassInfo().getAllPersistentReferences())
       {
-        if (!reference.isContainer() && !reference.isContainment()
-            && (relevantReferences == null || relevantReferences.contains(reference)))
+        if (!reference.isContainer() && !reference.isContainment() && (relevantReferences == null || relevantReferences.contains(reference)))
         {
           if (reference.isMany())
           {
@@ -3370,8 +3347,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return refs;
   }
 
-  private List<CDOObjectReference> addXRefLocal(List<CDOObjectReference> refs, Set<CDOID> targetIDs, CDOObject object,
-      EReference reference, int index, Object value)
+  private List<CDOObjectReference> addXRefLocal(List<CDOObjectReference> refs, Set<CDOID> targetIDs, CDOObject object, EReference reference, int index,
+      Object value)
   {
     if (value != null)
     {
@@ -3726,8 +3703,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
   private EContentsEList.FeatureIterator<EObject> getChangeableCrossReferences(EObject object)
   {
-    EClassImpl.FeatureSubsetSupplier features = (EClassImpl.FeatureSubsetSupplier)object.eClass()
-        .getEAllStructuralFeatures();
+    EClassImpl.FeatureSubsetSupplier features = (EClassImpl.FeatureSubsetSupplier)object.eClass().getEAllStructuralFeatures();
 
     EStructuralFeature[] crossReferences = features.crossReferences();
     if (crossReferences != null)
@@ -3754,8 +3730,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
 
       if (!changeableReferences.isEmpty())
       {
-        EStructuralFeature[] collectedStructuralFeatures = changeableReferences
-            .toArray(new EStructuralFeature[changeableReferences.size()]);
+        EStructuralFeature[] collectedStructuralFeatures = changeableReferences.toArray(new EStructuralFeature[changeableReferences.size()]);
         return new EContentsEList.ResolvingFeatureIteratorImpl<EObject>(object, collectedStructuralFeatures);
       }
     }
@@ -3935,8 +3910,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Override
-  protected InternalCDOLockState createUpdatedLockStateForNewObject(CDOObject object, IRWLockManager.LockType lockType,
-      boolean on)
+  protected InternalCDOLockState createUpdatedLockStateForNewObject(CDOObject object, IRWLockManager.LockType lockType, boolean on)
   {
     CheckUtil.checkState(FSMUtil.isNew(object), "Object is not in NEW state");
     CheckUtil.checkArg(lockType, "lockType");
@@ -4048,8 +4022,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     SyntheticCDORevision[] synthetics = new SyntheticCDORevision[1];
     InternalCDORevisionManager revisionManager = transaction.getSession().getRevisionManager();
 
-    InternalCDORevision result = revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED,
-        CDORevision.DEPTH_NONE, true, synthetics);
+    InternalCDORevision result = revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
 
     if (result != null)
     {
@@ -4598,8 +4571,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
       CDOBranchPoint mergeSource = getCommitMergeSource();
 
       InternalCDOCommitInfoManager commitInfoManager = session.getCommitInfoManager();
-      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource,
-          commitData);
+      return commitInfoManager.createCommitInfo(branch, timeStamp, previousTimeStamp, userID, comment, mergeSource, commitData);
     }
 
     private CDOLockChangeInfo makeUnlockChangeInfo(CommitTransactionResult result)
@@ -5275,8 +5247,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     /**
      * @author Eike Stepper
      */
-    private final class AutoReleaseLocksExemptionsEventImpl extends OptionsEvent
-        implements AutoReleaseLocksExemptionsEvent
+    private final class AutoReleaseLocksExemptionsEventImpl extends OptionsEvent implements AutoReleaseLocksExemptionsEvent
     {
       private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
index a693fd8322..dfe3ad28cd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUndoDetectorImpl.java
@@ -35,8 +35,7 @@ import java.util.List;
  */
 public class CDOUndoDetectorImpl implements CDOUndoDetector
 {
-  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision,
-      CDOFeatureDelta featureDelta)
+  public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision, CDOFeatureDelta featureDelta)
   {
     EStructuralFeature feature = featureDelta.getFeature();
     InternalCDORevision cleanInternalRevision = (InternalCDORevision)cleanRevision;
@@ -102,8 +101,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
     throw new UnsupportedOperationException();
   }
 
-  protected boolean detectUndoContainer(CDOTransaction transaction, InternalCDORevision cleanRevision,
-      InternalCDORevision currentRevision)
+  protected boolean detectUndoContainer(CDOTransaction transaction, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
   {
     CDOID cleanResourceID = cleanRevision.getResourceID();
     CDOID currentResourceID = currentRevision.getResourceID();
@@ -131,8 +129,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
     return true;
   }
 
-  protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision,
-      InternalCDORevision currentRevision)
+  protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
   {
     return feature.isMany() && !cleanRevision.isUnchunked() && !currentRevision.isUnchunked();
   }
@@ -166,8 +163,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
    */
   public static final class NoFeatures implements CDOUndoDetector
   {
-    public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision,
-        CDOFeatureDelta featureDelta)
+    public boolean detectUndo(CDOTransaction transaction, CDORevision cleanRevision, CDORevision currentRevision, CDOFeatureDelta featureDelta)
     {
       return false;
     }
@@ -179,8 +175,7 @@ public class CDOUndoDetectorImpl implements CDOUndoDetector
   public static final class SingleValuedFeatures extends CDOUndoDetectorImpl
   {
     @Override
-    protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision,
-        InternalCDORevision currentRevision)
+    protected boolean ignore(EStructuralFeature feature, InternalCDORevision cleanRevision, InternalCDORevision currentRevision)
     {
       if (feature.isMany())
       {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
index faebec4b36..a56f0afaf3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOUserSavepointImpl.java
@@ -71,8 +71,7 @@ public abstract class CDOUserSavepointImpl implements InternalCDOUserSavepoint
   public boolean isValid()
   {
     InternalCDOUserSavepoint lastSavepoint = getTransaction().getLastSavepoint();
-    for (InternalCDOUserSavepoint savepoint = lastSavepoint; savepoint != null; savepoint = savepoint
-        .getPreviousSavepoint())
+    for (InternalCDOUserSavepoint savepoint = lastSavepoint; savepoint != null; savepoint = savepoint.getPreviousSavepoint())
     {
       if (savepoint == this)
       {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index c13d84c78f..d98216f59f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -206,8 +206,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
     return activeContexts.get(transaction);
   }
 
-  private void send(Collection<InternalCDOXACommitContext> xaContexts, final IProgressMonitor progressMonitor)
-      throws InterruptedException, ExecutionException
+  private void send(Collection<InternalCDOXACommitContext> xaContexts, final IProgressMonitor progressMonitor) throws InterruptedException, ExecutionException
   {
     int xaContextSize = xaContexts.size();
     if (progressMonitor != null)
@@ -233,8 +232,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
 
       do
       {
-        for (Iterator<Entry<Future<Object>, InternalCDOXACommitContext>> it = futures.entrySet().iterator(); it
-            .hasNext();)
+        for (Iterator<Entry<Future<Object>, InternalCDOXACommitContext>> it = futures.entrySet().iterator(); it.hasNext();)
         {
           Entry<Future<Object>, InternalCDOXACommitContext> entry = it.next();
           Future<Object> future = entry.getKey();
@@ -359,8 +357,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
 
       try
       {
-        send(activeContexts.values(),
-            progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase) : null);
+        send(activeContexts.values(), progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase) : null);
       }
       catch (InterruptedException ex1)
       {
@@ -602,8 +599,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       }
     }
 
-    public CDOCommitInfo commit(InternalCDOTransaction transactionCommit, IProgressMonitor progressMonitor)
-        throws Exception
+    public CDOCommitInfo commit(InternalCDOTransaction transactionCommit, IProgressMonitor progressMonitor) throws Exception
     {
       checkAccess();
       return xaTransaction.commit(progressMonitor);
@@ -669,8 +665,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       if (xaContext.getTransaction().isDirty())
       {
         CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase2(xaContext,
-            EclipseMonitor.convert(progressMonitor));
+        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase2(xaContext, EclipseMonitor.convert(progressMonitor));
         check_result(result);
       }
 
@@ -701,8 +696,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
       if (xaContext.getTransaction().isDirty())
       {
         CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase3(xaContext,
-            EclipseMonitor.convert(progressMonitor));
+        CommitTransactionResult result = sessionProtocol.commitXATransactionPhase3(xaContext, EclipseMonitor.convert(progressMonitor));
         check_result(result);
       }
 
@@ -732,8 +726,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
     public void handle(InternalCDOXACommitContext xaContext, IProgressMonitor progressMonitor) throws Exception
     {
       CDOSessionProtocol sessionProtocol = xaContext.getTransaction().getSession().getSessionProtocol();
-      CommitTransactionResult result = sessionProtocol.commitXATransactionCancel(xaContext,
-          EclipseMonitor.convert(progressMonitor));
+      CommitTransactionResult result = sessionProtocol.commitXATransactionCancel(xaContext, EclipseMonitor.convert(progressMonitor));
       check_result(result);
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
index 7934b97b23..8e896aacf8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
@@ -226,8 +226,7 @@ public class CommitIntegrityCheck
     // else: Transient object -- ignore
   }
 
-  private void checkFeatureDelta(CDOFeatureDelta featureDelta, boolean hasPersistentOpposite, CDOObject dirtyObject)
-      throws CommitIntegrityException
+  private void checkFeatureDelta(CDOFeatureDelta featureDelta, boolean hasPersistentOpposite, CDOObject dirtyObject) throws CommitIntegrityException
   {
     EReference ref = (EReference)featureDelta.getFeature();
     boolean containmentOrWithOpposite = ref.isContainment() || hasPersistentOpposite;
@@ -398,8 +397,7 @@ public class CommitIntegrityCheck
           boolean hasPersistentOpposite = classInfo.hasPersistentOpposite(reference);
           for (Object refTarget : list)
           {
-            checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite,
-                msgFrag);
+            checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite, msgFrag);
           }
         }
       }
@@ -409,15 +407,14 @@ public class CommitIntegrityCheck
         if (refTarget != null)
         {
           boolean hasPersistentOpposite = classInfo.hasPersistentOpposite(reference);
-          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite,
-              msgFrag);
+          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite, msgFrag);
         }
       }
     }
   }
 
-  private void checkBidiRefTargetOrNewNonBidiTargetIncluded(CDOObject referencer, EReference eRef, Object refTarget,
-      boolean hasPersistentOpposite, String msgFrag) throws CommitIntegrityException
+  private void checkBidiRefTargetOrNewNonBidiTargetIncluded(CDOObject referencer, EReference eRef, Object refTarget, boolean hasPersistentOpposite,
+      String msgFrag) throws CommitIntegrityException
   {
     if (hasPersistentOpposite)
     {
@@ -468,8 +465,7 @@ public class CommitIntegrityCheck
     }
   }
 
-  private void checkBidiRefTargetIncluded(Object refTarget, CDOObject referencer, String refName, String msgFrag)
-      throws CommitIntegrityException
+  private void checkBidiRefTargetIncluded(Object refTarget, CDOObject referencer, String refName, String msgFrag) throws CommitIntegrityException
   {
     CheckUtil.checkArg(refTarget, "refTarget");
     CDOID refTargetID = null;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
index 5832ffa868..cd4bc2e40a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java
@@ -108,8 +108,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleEStructuralFeatures(List<EStructuralFeature> structuralFeatures, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleEStructuralFeatures(List<EStructuralFeature> structuralFeatures, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (structuralFeatures != null)
     {
@@ -146,8 +145,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleEGenericTypes(EList<EGenericType> genericTypes, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleEGenericTypes(EList<EGenericType> genericTypes, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (genericTypes != null)
     {
@@ -171,8 +169,7 @@ public class CompletePackageClosure extends PackageClosure
     }
   }
 
-  protected void handleETypeParameters(EList<ETypeParameter> typeParameters, Set<EPackage> visitedPackages,
-      Set<Object> visited)
+  protected void handleETypeParameters(EList<ETypeParameter> typeParameters, Set<EPackage> visitedPackages, Set<Object> visited)
   {
     if (typeParameters != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 3cbb733145..c502eaae3d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -143,8 +143,7 @@ import java.util.concurrent.locks.Lock;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory>
-    implements InternalCDOView, DoNotDescend
+public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory> implements InternalCDOView, DoNotDescend
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, AbstractCDOView.class);
 
@@ -1436,8 +1435,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public final CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name,
-      boolean exactMatch)
+  public final CloseableIterator<CDOResourceNode> queryResourcesAsync(CDOResourceFolder folder, String name, boolean exactMatch)
   {
     synchronized (getViewMonitor())
     {
@@ -1454,8 +1452,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, String name,
-      boolean exactMatch)
+  protected CloseableIterator<CDOResourceNode> queryResourcesUnsynced(CDOResourceFolder folder, String name, boolean exactMatch)
   {
     CDOQuery resourceQuery = createResourcesQuery(folder, name, exactMatch);
     return resourceQuery.getResultAsync(CDOResourceNode.class);
@@ -1589,8 +1586,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  public final CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  public final CloseableIterator<CDOObjectReference> queryXRefsAsync(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     synchronized (getViewMonitor())
     {
@@ -1607,8 +1603,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     }
   }
 
-  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects,
-      EReference... sourceReferences)
+  protected CloseableIterator<CDOObjectReference> queryXRefsUnsynced(Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     CDOQuery query = createXRefsQuery(true, null, targetObjects, sourceReferences);
     if (query.getQueryString() != null)
@@ -1619,8 +1614,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     return AbstractCloseableIterator.emptyCloseable();
   }
 
-  protected final CDOQuery createXRefsQuery(boolean excludeNewObjects, Set<CDOID> targetIDs,
-      Set<CDOObject> targetObjects, EReference... sourceReferences)
+  protected final CDOQuery createXRefsQuery(boolean excludeNewObjects, Set<CDOID> targetIDs, Set<CDOObject> targetObjects, EReference... sourceReferences)
   {
     StringBuilder builder = null;
 
@@ -1637,8 +1631,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       {
         if (excludeNewObjects)
         {
-          throw new IllegalArgumentException(
-              "Cross referencing for uncommitted new objects is not supported: " + target);
+          throw new IllegalArgumentException("Cross referencing for uncommitted new objects is not supported: " + target);
         }
       }
       else
@@ -1871,8 +1864,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
         {
           if (!view.getSession().getRepositoryInfo().getUUID().equals(getSession().getRepositoryInfo().getUUID()))
           {
-            throw new IllegalArgumentException(
-                MessageFormat.format(Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
+            throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
           }
 
           CDOID id = object.cdoID();
@@ -2028,8 +2020,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       String oldName = existingResource.getName();
       existingResource.setName(oldName + ".renamed");
 
-      OM.LOG.warn("URI clash: resource being instantiated had same URI as a resource already present "
-          + "locally; local resource was renamed from " + oldName + " to " + existingResource.getName());
+      OM.LOG.warn("URI clash: resource being instantiated had same URI as a resource already present " + "locally; local resource was renamed from " + oldName
+          + " to " + existingResource.getName());
     }
 
     return getResource(path, true);
@@ -2194,8 +2186,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
           }
           else
           {
-            InternalCDOObject object = (InternalCDOObject)EcoreUtil
-                .getAdapter(((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
+            InternalCDOObject object = (InternalCDOObject)EcoreUtil.getAdapter(((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
             if (object != null)
             {
               CDOID id = getID(object, onlyPersistedID);
@@ -2248,8 +2239,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
             return object.cdoID();
           }
 
-          throw new IllegalArgumentException(
-              "Object " + object + " is managed by a view with different target: " + view);
+          throw new IllegalArgumentException("Object " + object + " is managed by a view with different target: " + view);
         }
 
         return null;
@@ -2549,8 +2539,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       Set<CDOObject> detachedObjects, //
       Map<CDOID, InternalCDORevision> oldRevisions)
   {
-    boolean hasConflictResolvers = this instanceof CDOTransaction
-        && ((CDOTransaction)this).options().getConflictResolvers().length != 0;
+    boolean hasConflictResolvers = this instanceof CDOTransaction && ((CDOTransaction)this).options().getConflictResolvers().length != 0;
     Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts = null;
 
     // Bug 363355: manage detached objects before changed objects to avoid issue on eContainer
@@ -2647,8 +2636,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
   /**
    * Overridden by {@link CDOTransactionImpl#handleConflicts(long, Map, List)}.
    */
-  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts,
-      List<CDORevisionDelta> deltas)
+  protected void handleConflicts(long lastUpdateTime, Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> deltas)
   {
     // Do nothing
   }
@@ -2940,8 +2928,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
 
     if (eClass == EresourcePackage.Literals.CDO_RESOURCE_FOLDER)
     {
-      CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta
-          .getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES);
+      CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta.getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES);
       if (canHaveResourcePathImpact(featureDelta))
       {
         return true;
@@ -2952,8 +2939,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     {
       if (rootResourceID == delta.getID())
       {
-        CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta
-            .getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS);
+        CDOListFeatureDelta featureDelta = (CDOListFeatureDelta)delta.getFeatureDelta(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS);
         if (canHaveResourcePathImpact(featureDelta))
         {
           return true;
@@ -3110,8 +3096,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       switch (eventType)
       {
       case Notification.ADD:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getNewValue(),
-            IContainerDelta.Kind.ADDED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getNewValue(), IContainerDelta.Kind.ADDED);
         break;
 
       case Notification.ADD_MANY:
@@ -3119,8 +3104,7 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
         break;
 
       case Notification.REMOVE:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getOldValue(),
-            IContainerDelta.Kind.REMOVED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getOldValue(), IContainerDelta.Kind.REMOVED);
         break;
 
       case Notification.REMOVE_MANY:
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
index 08ed21e644..5f41b1c41e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOObjectHistoryImpl.java
@@ -115,8 +115,7 @@ public class CDOObjectHistoryImpl extends CDOCommitHistoryImpl implements CDOObj
             break;
           }
 
-          CDORevision revision = revisionManager.getRevision(object.cdoID(), base, CDORevision.UNCHUNKED,
-              CDORevision.DEPTH_NONE, true);
+          CDORevision revision = revisionManager.getRevision(object.cdoID(), base, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true);
           if (revision == null)
           {
             // Reached branch where the object does not exist anymore.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
index 9c5910875a..0847b3ef59 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
@@ -39,8 +39,8 @@ public class CDORevisionPrefetchingPolicyImpl implements CDORevisionPrefetchingP
     this.chunkSize = chunkSize;
   }
 
-  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject eObject,
-      EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID)
+  public List<CDOID> loadAhead(CDORevisionManager revisionManager, CDOBranchPoint branchPoint, EObject eObject, EStructuralFeature feature, CDOList list,
+      int accessIndex, CDOID accessID)
   {
     if (chunkSize > 1 && !revisionManager.containsRevision(accessID, branchPoint))
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
index 75fe71646e..8f1c1c56c3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
@@ -242,8 +242,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * Phase 1: TRANSIENT --> PREPARED
    */
-  private void prepare(InternalCDOObject object,
-      Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
+  private void prepare(InternalCDOObject object, Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
   {
     if (TRACER.isEnabled())
     {
@@ -802,11 +801,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @see AttachTransition
    * @author Eike Stepper
    */
-  private final class PrepareTransition implements
-      ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
+  private final class PrepareTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
     {
       InternalCDOTransaction transaction = transactionAndContents.getElement1();
       List<InternalCDOObject> contents = transactionAndContents.getElement2();
@@ -876,9 +873,8 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
 
         if (packageObject instanceof EPackage && packageObject != eClass.getEPackage())
         {
-          throw new IllegalStateException(MessageFormat.format(
-              "Global EPackage {0} for EClass {1} is different from EPackage found in CDOPackageRegistry", packageURI,
-              eClass));
+          throw new IllegalStateException(
+              MessageFormat.format("Global EPackage {0} for EClass {1} is different from EPackage found in CDOPackageRegistry", packageURI, eClass));
         }
       }
     }
@@ -916,8 +912,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    *
    * @author Caspar De Groot
    */
-  private final class ReattachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
+  private final class ReattachTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, InternalCDOTransaction transaction)
     {
@@ -1016,11 +1011,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private static final class DetachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
+  private static final class DetachTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        List<InternalCDOObject> objectsToDetach)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, List<InternalCDOObject> objectsToDetach)
     {
       InternalCDOTransaction transaction = (InternalCDOTransaction)object.cdoView();
       objectsToDetach.add(object);
@@ -1046,8 +1039,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  final private class CommitTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
+  final private class CommitTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
   {
     public CommitTransition(boolean useDeltas)
     {
@@ -1081,8 +1073,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private final class RollbackTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
+  private final class RollbackTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, InternalCDOTransaction transaction)
     {
@@ -1104,11 +1095,9 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   /**
    * @author Eike Stepper
    */
-  private static abstract class AbstractWriteTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
+  private static abstract class AbstractWriteTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
   {
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        FeatureDeltaAndResult featureDeltaAndResult)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, FeatureDeltaAndResult featureDeltaAndResult)
     {
       InternalCDORevision revision = object.cdoRevision();
       if (!revision.isWritable())
@@ -1122,8 +1111,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
       featureDeltaAndResult.setResult(result);
     }
 
-    protected abstract Object execute(InternalCDOObject object, InternalCDOTransaction transaction,
-        CDOFeatureDelta featureDelta, InternalCDORevision revision);
+    protected abstract Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision);
   }
 
   /**
@@ -1132,8 +1120,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   private final class WriteNewTransition extends AbstractWriteTransition
   {
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision revision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision)
     {
       Object result = null;
       if (featureDelta != null)
@@ -1159,8 +1146,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
     }
 
     @Override
-    public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
-        FeatureDeltaAndResult featureDeltaAndResult)
+    public void execute(InternalCDOObject object, CDOState state, CDOEvent event, FeatureDeltaAndResult featureDeltaAndResult)
     {
       if (load)
       {
@@ -1171,8 +1157,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
     }
 
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision cleanRevision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision cleanRevision)
     {
       InternalCDORevision revision = cleanRevision.copy();
 
@@ -1206,8 +1191,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
   private final class RewriteTransition extends AbstractWriteTransition
   {
     @Override
-    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta,
-        InternalCDORevision revision)
+    protected Object execute(InternalCDOObject object, InternalCDOTransaction transaction, CDOFeatureDelta featureDelta, InternalCDORevision revision)
     {
       Map<InternalCDOObject, InternalCDORevision> cleanRevisions = transaction.getCleanRevisions();
       InternalCDORevision cleanRevision = cleanRevisions.get(object);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
index 93541dd8da..69d1df257e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
@@ -514,8 +514,7 @@ public final class CDOStoreImpl implements CDOStore
   /**
    * @category WRITE
    */
-  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer,
-      int newContainerFeatureID)
+  public void setContainer(InternalEObject eObject, CDOResource newResource, InternalEObject newEContainer, int newContainerFeatureID)
   {
     synchronized (view.getViewMonitor())
     {
@@ -822,8 +821,7 @@ public final class CDOStoreImpl implements CDOStore
   /**
    * @since 2.0
    */
-  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index,
-      Object value)
+  public Object convertToEMF(EObject eObject, InternalCDORevision revision, EStructuralFeature feature, int index, Object value)
   {
     if (value != null)
     {
@@ -890,8 +888,7 @@ public final class CDOStoreImpl implements CDOStore
     return value;
   }
 
-  private Object convertIDToObject(InternalCDOView view, EObject eObject, EStructuralFeature feature, int index,
-      Object value)
+  private Object convertIDToObject(InternalCDOView view, EObject eObject, EStructuralFeature feature, int index, Object value)
   {
     try
     {
@@ -933,8 +930,7 @@ public final class CDOStoreImpl implements CDOStore
     return object;
   }
 
-  private Object getOldListValue(InternalEObject eObject, InternalCDOObject cdoObject, EStructuralFeature feature,
-      int index)
+  private Object getOldListValue(InternalEObject eObject, InternalCDOObject cdoObject, EStructuralFeature feature, int index)
   {
     if (!feature.isMany())
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 99a21df448..8815ab077e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -273,8 +273,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
         }
 
         CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
-        sessionProtocol.switchTarget(viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects,
-            EclipseMonitor.convert(progressMonitor));
+        sessionProtocol.switchTarget(viewID, branchPoint, invalidObjects, allChangedObjects, allDetachedObjects, EclipseMonitor.convert(progressMonitor));
 
         basicSetBranchPoint(branchPoint);
 
@@ -340,14 +339,12 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout) throws InterruptedException
   {
     lockObjects(objects, lockType, timeout, false);
   }
 
-  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive)
-      throws InterruptedException
+  public void lockObjects(Collection<? extends CDOObject> objects, LockType lockType, long timeout, boolean recursive) throws InterruptedException
   {
     checkActive();
     checkState(getTimeStamp() == UNSPECIFIED_DATE, "Locking not supported for historial views");
@@ -417,15 +414,14 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
           {
             if (!session.options().isPassiveUpdateEnabled())
             {
-              throw new AssertionError(
-                  "Lock result requires client to wait, but client does not have passiveUpdates enabled");
+              throw new AssertionError("Lock result requires client to wait, but client does not have passiveUpdates enabled");
             }
 
             long requiredTimestamp = result.getRequiredTimestamp();
             if (!waitForUpdate(requiredTimestamp, 10000L))
             {
-              throw new AssertionError("Lock result requires client to wait for commit " + requiredTimestamp
-                  + ", but client did not receive invalidations after " + lastUpdateTime);
+              throw new AssertionError(
+                  "Lock result requires client to wait for commit " + requiredTimestamp + ", but client did not receive invalidations after " + lastUpdateTime);
             }
 
             InternalCDOSession session = this.session;
@@ -439,8 +435,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
               CDORevision revision = object.cdoRevision(true);
               if (!requiredKey.equals(revision))
               {
-                InternalCDORevision requiredRevision = revisionManager.getRevisionByVersion(id, requiredKey,
-                    CDORevision.UNCHUNKED, true);
+                InternalCDORevision requiredRevision = revisionManager.getRevisionByVersion(id, requiredKey, CDORevision.UNCHUNKED, true);
                 InternalCDORevisionDelta revisionDelta = requiredRevision.compare(revision);
                 CDOStateMachine.INSTANCE.invalidate(object, revisionDelta);
               }
@@ -533,8 +528,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * Notifies other views of lock changes performed in this view
    */
-  protected void notifyOtherViewsAboutLockChanges(Operation op, LockType type, long timestamp,
-      CDOLockState[] lockStates)
+  protected void notifyOtherViewsAboutLockChanges(Operation op, LockType type, long timestamp, CDOLockState[] lockStates)
   {
     if (lockStates.length > 0)
     {
@@ -548,8 +542,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     }
   }
 
-  protected final CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp,
-      CDOLockState[] newLockStates)
+  protected final CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp, CDOLockState[] newLockStates)
   {
     return CDOLockUtil.createLockChangeInfo(timestamp, this, getBranch(), op, type, newLockStates);
   }
@@ -1148,16 +1141,15 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
   {
     throw new UnsupportedOperationException();
   }
 
   @Deprecated
-  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
-      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async,
-      boolean clearResourcePathCache)
+  public void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
+      Map<CDOID, InternalCDORevision> oldRevisions, boolean async, boolean clearResourcePathCache)
   {
     throw new UnsupportedOperationException();
   }
@@ -1235,8 +1227,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
         handleConflicts(lastUpdateTime, conflicts, deltas);
 
         sendInvalidationNotifications(revisionDeltas.keySet(), detachedObjects);
-        fireInvalidationEvent(lastUpdateTime, Collections.unmodifiableMap(revisionDeltas),
-            Collections.unmodifiableSet(detachedObjects));
+        fireInvalidationEvent(lastUpdateTime, Collections.unmodifiableMap(revisionDeltas), Collections.unmodifiableSet(detachedObjects));
 
         // Then send the notifications. The deltas could have been modified by the conflict resolvers.
         if (!deltas.isEmpty() || !detachedObjects.isEmpty())
@@ -1319,8 +1310,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  private void fireInvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas,
-      Set<CDOObject> detachedObjects)
+  private void fireInvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas, Set<CDOObject> detachedObjects)
   {
     if (!revisionDeltas.isEmpty() || !detachedObjects.isEmpty())
     {
@@ -1335,8 +1325,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
   /**
    * @since 2.0
    */
-  public void sendDeltaNotifications(Collection<CDORevisionDelta> deltas, Set<CDOObject> detachedObjects,
-      Map<CDOID, InternalCDORevision> oldRevisions)
+  public void sendDeltaNotifications(Collection<CDORevisionDelta> deltas, Set<CDOObject> detachedObjects, Map<CDOID, InternalCDORevision> oldRevisions)
   {
     synchronized (getViewMonitor())
     {
@@ -2147,16 +2136,14 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
             CDOUnit containingUnit = getOpenUnit(root);
             if (containingUnit != null)
             {
-              throw new CDOException(
-                  "Attempt to nest the new unit " + root + " in the existing unit " + containingUnit);
+              throw new CDOException("Attempt to nest the new unit " + root + " in the existing unit " + containingUnit);
             }
 
             for (CDOUnit existingUnit : unitPerRoot.values())
             {
               if (EcoreUtil.isAncestor(root, existingUnit.getRoot()))
               {
-                throw new CDOException(
-                    "Attempt to nest the existing unit " + existingUnit + " in the new unit " + root);
+                throw new CDOException("Attempt to nest the existing unit " + existingUnit + " in the new unit " + root);
               }
             }
           }
@@ -2192,8 +2179,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
           }
 
           CDOSessionProtocol sessionProtocol = session.getSessionProtocol();
-          boolean success = sessionProtocol.requestUnit(viewID, rootID, opcode, revisionHandler,
-              EclipseMonitor.safe(monitor));
+          boolean success = sessionProtocol.requestUnit(viewID, rootID, opcode, revisionHandler, EclipseMonitor.safe(monitor));
 
           if (success)
           {
@@ -2822,8 +2808,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
 
     private Set<CDOObject> detachedObjects;
 
-    public InvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas,
-        Set<CDOObject> detachedObjects)
+    public InvalidationEvent(long timeStamp, Map<CDOObject, CDORevisionDelta> revisionDeltas, Set<CDOObject> detachedObjects)
     {
       this.timeStamp = timeStamp;
       this.revisionDeltas = revisionDeltas;
@@ -2859,8 +2844,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     @Override
     protected String formatAdditionalParameters()
     {
-      return "timeStamp=" + timeStamp + ", revisionDeltas=" + revisionDeltas + ", detachedObjects=" + detachedObjects
-          + "]";
+      return "timeStamp=" + timeStamp + ", revisionDeltas=" + revisionDeltas + ", detachedObjects=" + detachedObjects + "]";
     }
   }
 
@@ -2987,8 +2971,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
 
     private LockStatePrefetcher lockStatePrefetcher;
 
-    private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy = CDOUtil
-        .createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
+    private CDORevisionPrefetchingPolicy revisionPrefetchingPolicy = CDOUtil.createRevisionPrefetchingPolicy(NO_REVISION_PREFETCHING);
 
     private CDOFeatureAnalyzer featureAnalyzer = CDOFeatureAnalyzer.NOOP;
 
@@ -3665,8 +3648,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     /**
      * @author Eike Stepper
      */
-    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent
-        implements ChangeSubscriptionPoliciesEvent
+    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent implements ChangeSubscriptionPoliciesEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -3771,8 +3753,7 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
     /**
      * @author Eike Stepper
      */
-    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent
-        implements RevisionPrefetchingPolicyEvent
+    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent implements RevisionPrefetchingPolicyEvent
     {
       private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
index 6664ed73ee..f43cbce1e6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
@@ -115,8 +115,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
     return null;
   }
 
-  private InternalCDOView provideView(URI uri, ResourceSet resourceSet, CDOViewSet viewSet,
-      CDOViewProvider viewProvider)
+  private InternalCDOView provideView(URI uri, ResourceSet resourceSet, CDOViewSet viewSet, CDOViewProvider viewProvider)
   {
     if (viewSet != null && viewProvider instanceof CDOViewProvider2)
     {
@@ -312,8 +311,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
 
       if (StringUtil.isEmpty(element.getAttribute("class"))) //$NON-NLS-1$
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
       }
     }
 
@@ -369,8 +367,7 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
       String value = element.getAttribute("regex");
       if (StringUtil.isEmpty(value))
       {
-        throw new IllegalArgumentException(
-            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
       }
 
       return value;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
index 259984a544..7444528b4d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
@@ -97,8 +97,7 @@ public class ViewProperties extends Properties<CDOView>
     });
 
     add(new Property<CDOView>("rootResourcePermission", //$NON-NLS-1$
-        "Root Resource Permission", "The permission the current user has for the root resource of this view.",
-        CATEGORY_VIEW)
+        "Root Resource Permission", "The permission the current user has for the root resource of this view.", CATEGORY_VIEW)
     {
       @Override
       protected Object eval(CDOView view)