[234041] Prepare graduation

https://bugs.eclipse.org/bugs/show_bug.cgi?id=234041

6 files changed, 122 insertions, 124 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 a1d06f9673..333ffd666d 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
@@ -569,7 +569,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
     {
       // Delegate to CDOStore
       getStore().setContainer(this, newContainer, newContainerFeatureID);
-      
+
       if (newContainer instanceof Resource.Internal)
       {
         eSetDirectResource((Resource.Internal)newContainer);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java
index c3f6b7343c..26f33cf0c3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSavePointImpl.java
@@ -8,9 +8,9 @@
  * Contributors: 
  *    Simon McDuff - initial API and implementation 
  *         
- **************************************************************************/ 
-package org.eclipse.emf.internal.cdo; 
- 
+ **************************************************************************/
+package org.eclipse.emf.internal.cdo;
+
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.CDOSavePoint;
 import org.eclipse.emf.cdo.CDOTransaction;
@@ -23,102 +23,100 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
- 
-/** 
- * @author Simon McDuff 
- */ 
-public class CDOSavePointImpl implements CDOSavePoint 
-{ 
-  private CDOTransactionImpl transaction = null; 
-   
-  private Map<CDOID, CDOResource> newResources = new HashMap<CDOID, CDOResource>(); 
- 
-  private Map<CDOID, CDOObject> newObjects = new HashMap<CDOID, CDOObject>(); 
- 
-  private Map<CDOID, CDORevisionImpl> baseNewObjects = new HashMap<CDOID, CDORevisionImpl>(); 
- 
-  private Map<CDOID, CDOObject> dirtyObjects = new HashMap<CDOID, CDOObject>(); 
- 
-  private ConcurrentMap<CDOID, CDORevisionDelta> revisionDeltas = new ConcurrentHashMap<CDOID, CDORevisionDelta>(); 
- 
-  private CDOSavePointImpl previousSavePoint = null; 
-   
+
+/**
+ * @author Simon McDuff
+ */
+public class CDOSavePointImpl implements CDOSavePoint
+{
+  private CDOTransactionImpl transaction = null;
+
+  private Map<CDOID, CDOResource> newResources = new HashMap<CDOID, CDOResource>();
+
+  private Map<CDOID, CDOObject> newObjects = new HashMap<CDOID, CDOObject>();
+
+  private Map<CDOID, CDORevisionImpl> baseNewObjects = new HashMap<CDOID, CDORevisionImpl>();
+
+  private Map<CDOID, CDOObject> dirtyObjects = new HashMap<CDOID, CDOObject>();
+
+  private ConcurrentMap<CDOID, CDORevisionDelta> revisionDeltas = new ConcurrentHashMap<CDOID, CDORevisionDelta>();
+
+  private CDOSavePointImpl previousSavePoint = null;
+
   private CDOSavePointImpl nextSavePoint = null;
-  
-  private boolean isDirty = false; 
-  
-  public CDOSavePointImpl(CDOTransactionImpl transaction, CDOSavePointImpl lastSavePoint) 
-  { 
-    this.transaction = transaction; 
+
+  private boolean isDirty = false;
+
+  public CDOSavePointImpl(CDOTransactionImpl transaction, CDOSavePointImpl lastSavePoint)
+  {
+    this.transaction = transaction;
     this.isDirty = transaction.isDirty();
-    this.previousSavePoint = lastSavePoint;  
-    if (this.previousSavePoint != null) 
-      this.previousSavePoint.setNextSavePoint(this); 
-  } 
- 
-  public void clear() 
-  { 
-    newResources.clear(); 
-    newObjects.clear(); 
-    dirtyObjects.clear(); 
-    revisionDeltas.clear(); 
-    baseNewObjects.clear(); 
-  } 
-  
+    this.previousSavePoint = lastSavePoint;
+    if (this.previousSavePoint != null) this.previousSavePoint.setNextSavePoint(this);
+  }
+
+  public void clear()
+  {
+    newResources.clear();
+    newObjects.clear();
+    dirtyObjects.clear();
+    revisionDeltas.clear();
+    baseNewObjects.clear();
+  }
+
   public boolean isDirty()
   {
     return isDirty;
   }
 
-  public Map<CDOID, CDOResource> getNewResources() 
-  { 
-    return newResources; 
-  } 
- 
-  public Map<CDOID, CDOObject> getNewObjects() 
-  { 
-    return newObjects; 
-  } 
- 
-  public Map<CDOID, CDOObject> getDirtyObjects() 
-  { 
-    return dirtyObjects; 
-  } 
- 
-  public ConcurrentMap<CDOID, CDORevisionDelta> getRevisionDeltas() 
-  { 
-    return revisionDeltas; 
-  } 
- 
-   
-  public Map<CDOID, CDORevisionImpl> getBaseNewObjects() 
-  { 
-    return baseNewObjects; 
-  } 
-   
-  public CDOSavePointImpl getPreviousSavePoint() 
-  { 
-    return previousSavePoint; 
-  } 
- 
-  public CDOSavePointImpl getNextSavePoint() 
-  { 
-    return nextSavePoint; 
-  } 
-   
-  public void setPreviousSavePoint(CDOSavePointImpl previousSavePoint) 
-  { 
-    this.previousSavePoint = previousSavePoint; 
-  } 
- 
-  public void setNextSavePoint(CDOSavePointImpl nextSavePoint) 
-  { 
-    this.nextSavePoint = nextSavePoint; 
-  } 
- 
-  public CDOTransaction getTransaction() 
-  { 
-    return transaction; 
-  } 
- 
-} 
+  public Map<CDOID, CDOResource> getNewResources()
+  {
+    return newResources;
+  }
+
+  public Map<CDOID, CDOObject> getNewObjects()
+  {
+    return newObjects;
+  }
+
+  public Map<CDOID, CDOObject> getDirtyObjects()
+  {
+    return dirtyObjects;
+  }
+
+  public ConcurrentMap<CDOID, CDORevisionDelta> getRevisionDeltas()
+  {
+    return revisionDeltas;
+  }
+
+  public Map<CDOID, CDORevisionImpl> getBaseNewObjects()
+  {
+    return baseNewObjects;
+  }
+
+  public CDOSavePointImpl getPreviousSavePoint()
+  {
+    return previousSavePoint;
+  }
+
+  public CDOSavePointImpl getNextSavePoint()
+  {
+    return nextSavePoint;
+  }
+
+  public void setPreviousSavePoint(CDOSavePointImpl previousSavePoint)
+  {
+    this.previousSavePoint = previousSavePoint;
+  }
+
+  public void setNextSavePoint(CDOSavePointImpl nextSavePoint)
+  {
+    this.nextSavePoint = nextSavePoint;
+  }
+
+  public CDOTransaction getTransaction()
+  {
+    return transaction;
+  }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 91047c7e19..40aa6a8128 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -165,12 +165,12 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
   {
     return cdoidObjectFactory.createCDOIDObject(in);
   }
-  
+
   public CDOIDObject createCDOIDObject(String in)
   {
     return cdoidObjectFactory.createCDOIDObject(in);
   }
-  
+
   public boolean isDisableLegacyObjects()
   {
     return disableLegacyObjects;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index de9aa6013b..9e48cd4928 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -12,7 +12,6 @@
  **************************************************************************/
 package org.eclipse.emf.internal.cdo;
 
-import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.CDORevisionManager;
 import org.eclipse.emf.cdo.CDOSession;
 import org.eclipse.emf.cdo.CDOState;
@@ -504,7 +503,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
     {
       CDOViewImpl view = (CDOViewImpl)object.cdoView();
       CDOTransactionImpl transaction = view.toTransaction();
-      transaction.registerFeatureDelta(object, (CDOFeatureDelta)featureDelta);      
+      transaction.registerFeatureDelta(object, (CDOFeatureDelta)featureDelta);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index 7e0652a79c..b498c60cb9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -264,14 +264,14 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
   public void rollback(boolean remote)
   {
     rollback(firstSavePoint, remote);
-  
+
     cleanUp();
   }
 
-  private Set<CDOID> rollbackTo(CDOSavePoint savePoint,  boolean remote)
+  private Set<CDOID> rollbackTo(CDOSavePoint savePoint, boolean remote)
   {
-    Set<CDOID> newObjectsDelta = new HashSet<CDOID>(); 
-    
+    Set<CDOID> newObjectsDelta = new HashSet<CDOID>();
+
     boolean isActiveSavePoint = false;
 
     // Start from the last savepoint and come back up to the active
@@ -303,11 +303,11 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
           for (CDOObject newObject : newObjects.values())
           {
             ((InternalCDOObject)newObject).cdoInternalSetState(CDOState.TRANSIENT);
-            
+
             removeObject(newObject.cdoID());
 
             // TODO Should call detach transition : not there yet
-            // TODO How to remove it from Resource?            
+            // TODO How to remove it from Resource?
             // CDOStateMachine.INSTANCE.detach(newObject);
           }
         }
@@ -334,10 +334,10 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
       }
       if (savePoint == itrSavePoint) isActiveSavePoint = true;
     }
-    
+
     return newObjectsDelta;
   }
-  
+
   private void loadSavePoint(CDOSavePoint savePoint, Set<CDOID> newObjectsDelta)
   {
     Map<CDOID, CDOObject> dirtyObjects = getDirtyObjects();
@@ -346,7 +346,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
     Map<CDOID, CDOResource> newResources = getNewResources();
 
     Map<CDOID, CDORevisionImpl> newBaseRevision = getBaseNewObjects();
-    
+
     // Reload the objects (NEW) with their base.
     for (CDOID newObject : newObjectsDelta)
     {
@@ -384,7 +384,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
     }
     dirty = ((CDOSavePointImpl)savePoint).isDirty();
   }
-  
+
   public void rollback(CDOSavePoint savePoint, boolean remote)
   {
     if (savePoint == null || savePoint.getTransaction() != this)
@@ -461,7 +461,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
     }
 
     lastSavePoint = new CDOSavePointImpl(this, lastSavePoint);
-    
+
     return lastSavePoint;
   }
 
@@ -496,7 +496,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
   public void registerFeatureDelta(InternalCDOObject object, CDOFeatureDelta featureDelta)
   {
     boolean needToSaveFeatureDelta = true;
-    
+
     if (object.cdoState() == CDOState.NEW)
     {
       // Register Delta for new objects only if objectA doesn't belong to this savepoint
@@ -506,35 +506,36 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
       }
       else
       {
-        Map<CDOID, ? extends CDOObject> map = object instanceof CDOResource ? this.getLastSavePoint()
-            .getNewResources() : this.getLastSavePoint().getNewObjects();
-  
-        needToSaveFeatureDelta = !map.containsKey(object.cdoID()); 
+        Map<CDOID, ? extends CDOObject> map = object instanceof CDOResource ? this.getLastSavePoint().getNewResources()
+            : this.getLastSavePoint().getNewObjects();
+
+        needToSaveFeatureDelta = !map.containsKey(object.cdoID());
       }
     }
-      
+
     if (needToSaveFeatureDelta)
     {
       CDORevisionDelta revisionDelta = (CDORevisionDelta)lastSavePoint.getRevisionDeltas().get(object.cdoID());
-  
+
       if (revisionDelta == null)
       {
         revisionDelta = (CDORevisionDelta)CDORevisionDeltaUtil.create(object.cdoRevision());
         lastSavePoint.getRevisionDeltas().put(object.cdoID(), revisionDelta);
       }
- 
+
       ((InternalCDORevisionDelta)revisionDelta).addFeatureDelta(featureDelta);
     }
-    
+
     for (CDOTransactionHandler handler : getHandlers())
     {
       handler.modifyingObject(this, object, featureDelta);
     }
   }
-  
+
   protected void fireEventRegisterDelta(InternalCDOObject object, CDOFeatureDelta featureDelta)
   {
   }
+
   public void registerRevisionDelta(CDORevisionDelta revisionDelta)
   {
     lastSavePoint.getRevisionDeltas().putIfAbsent(revisionDelta.getID(), revisionDelta);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 2b4081bef5..86e3e13010 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -562,9 +562,9 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
   /**
    * Turns registered objects into proxies and synchronously delivers invalidation events to registered event listeners.
    * <p>
-   * <b>Implementation note:</b> This implementation guarantees that exceptions from listener code don't propagate up
-   * to the caller of this method. Runtime exceptions from the implementation of the {@link CDOStateMachine} are
-   * propagated to the caller of this method but this should not happen in the absence of implementation errors.
+   * <b>Implementation note:</b> This implementation guarantees that exceptions from listener code don't propagate up to
+   * the caller of this method. Runtime exceptions from the implementation of the {@link CDOStateMachine} are propagated
+   * to the caller of this method but this should not happen in the absence of implementation errors.
    * 
    * @param timeStamp
    *          The time stamp of the server transaction if this event was sent as a result of a successfully committed