[265435] Replace CDOModelElements by EModelElements

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

4 files changed, 12 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
index 772de54925..45ac5ba615 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
@@ -69,7 +69,7 @@ public class Transaction extends View implements ITransaction
    * 
    * @since 2.0
    */
-  public InternalCommitContext createCommitContext(final long timeStamp)
+  public InternalCommitContext testCreateCommitContext(final long timeStamp)
   {
     checkOpen();
     return new TransactionCommitContextImpl(this)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
index 1c02bde4b2..7007fb5227 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
@@ -334,10 +334,14 @@ public class TransactionCommitContextImpl implements IStoreAccessor.CommitContex
 
   private void adjustTimeStamps()
   {
-    for (CDORevision newObject : newObjects)
+    for (InternalCDOPackageUnit newPackageUnit : newPackageUnits)
+    {
+      newPackageUnit.setTimeStamp(timeStamp);
+    }
+
+    for (InternalCDORevision newObject : newObjects)
     {
-      InternalCDORevision revision = (InternalCDORevision)newObject;
-      revision.setCreated(timeStamp);
+      newObject.setCreated(timeStamp);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java
index e351daacd5..67265791e9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java
@@ -30,7 +30,7 @@ public class CommitTransactionCancelIndication extends CommitTransactionIndicati
   @Override
   protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
   {
-    indicationTransaction(in);
+    indicatingTransaction(in);
   }
 
   @Override
@@ -58,7 +58,7 @@ public class CommitTransactionCancelIndication extends CommitTransactionIndicati
   }
 
   @Override
-  protected void indicationTransaction(CDODataInput in) throws Exception
+  protected void indicatingTransaction(CDODataInput in) throws Exception
   {
     int viewID = in.readInt();
     commitContext = getRepository().getCommitManager().get(getTransaction(viewID));
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index 055fd2f496..6f7ec83753 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -228,7 +228,7 @@ public class CommitTransactionIndication extends IndicationWithMonitoring
     }
   }
 
-  protected void indicationTransaction(CDODataInput in) throws Exception
+  protected void indicatingTransaction(CDODataInput in) throws Exception
   {
     int viewID = in.readInt();
     commitContext = getTransaction(viewID).createCommitContext();
@@ -237,7 +237,7 @@ public class CommitTransactionIndication extends IndicationWithMonitoring
   protected void indicatingCommit(CDODataInput in, OMMonitor monitor) throws Exception
   {
     // Create transaction context
-    indicationTransaction(in);
+    indicatingTransaction(in);
     commitContext.preCommit();
 
     boolean autoReleaseLocksEnabled = in.readBoolean();