[325189] Make CDOCommonView and CommitContext a CDORevisionProvider

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

4 files changed, 17 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
index 9b09c38c0d..a1bc284723 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
@@ -334,11 +334,11 @@ public class XRefTest extends AbstractCDOTest
   // resource.getContents().add(purchaseOrder4);
   // transaction1.commit();
   //
-  // CDOID referenceID = ((CDOObject)supplier1).cdoID();
-  // CDOID queryID1 = ((CDOObject)purchaseOrder1).cdoID();
-  // CDOID queryID2 = ((CDOObject)purchaseOrder2).cdoID();
-  // CDOID queryID3 = ((CDOObject)purchaseOrder3).cdoID();
-  // CDOID queryID4 = ((CDOObject)purchaseOrder4).cdoID();
+  // CDOID referenceID = CDOUtil.getCDOObject(supplier1).cdoID();
+  // CDOID queryID1 = CDOUtil.getCDOObject(purchaseOrder1).cdoID();
+  // CDOID queryID2 = CDOUtil.getCDOObject(purchaseOrder2).cdoID();
+  // CDOID queryID3 = CDOUtil.getCDOObject(purchaseOrder3).cdoID();
+  // CDOID queryID4 = CDOUtil.getCDOObject(purchaseOrder4).cdoID();
   //
   // session1.close();
   //
@@ -427,7 +427,7 @@ public class XRefTest extends AbstractCDOTest
   // resource.getContents().add(purchaseOrder4);
   // transaction1.commit();
   //
-  // CDOID querycdoID = ((CDOObject)supplier1).cdoID();
+  // CDOID querycdoID = CDOUtil.getCDOObject(supplier1).cdoID();
   //
   // session1.close();
   //
@@ -471,7 +471,7 @@ public class XRefTest extends AbstractCDOTest
   //
   // for (EStructuralFeature.Setting setting : settings)
   // {
-  // CDOObject crossReferencedEObject = (CDOObject)setting.get(true);
+  // CDOObject crossReferencedEObject = CDOUtil.getCDOObject(setting.get(true));
   // assertTrue(CDOIDUtil.equals(crossReferencedEObject.cdoID(), querycdoID));
   // }
   // }
@@ -506,7 +506,7 @@ public class XRefTest extends AbstractCDOTest
   // resource.getContents().add(purchaseOrder4);
   // transaction1.commit();
   //
-  // CDOID querycdoID = ((CDOObject)supplier1).cdoID();
+  // CDOID querycdoID = CDOUtil.getCDOObject(supplier1).cdoID();
   //
   // session1.close();
   //
@@ -520,7 +520,7 @@ public class XRefTest extends AbstractCDOTest
   //
   // for (EStructuralFeature.Setting setting : settings)
   // {
-  // CDOObject crossReferencedEObject = (CDOObject)setting.get(true);
+  // CDOObject crossReferencedEObject = CDOUtil.getCDOObject(setting.get(true));
   // assertTrue(CDOIDUtil.equals(crossReferencedEObject.cdoID(), querycdoID));
   // }
   // }
@@ -543,7 +543,7 @@ public class XRefTest extends AbstractCDOTest
   // resource.getContents().add(supplier1);
   // transaction1.commit();
   //
-  // CDOID queryID = ((CDOObject)supplier1).cdoID();
+  // CDOID queryID = CDOUtil.getCDOObject(supplier1).cdoID();
   //
   // session1.close();
   //
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java
index 33dd94ca0a..f3f0405b4c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java
@@ -55,7 +55,6 @@ public class Bugzilla_316145_Test extends AbstractCDOTest
     transaction.commit();
 
     id = CDOUtil.getCDOObject(company).cdoID();
-    // id = ((CDOObject)resource).cdoID();
 
     session.close();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319552_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319552_Test.java
index ecc421722a..7cf17a3f95 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319552_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319552_Test.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.bugzilla;
 
-import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.CDOCommonSession.Options.PassiveUpdateMode;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
@@ -18,6 +17,7 @@ import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractSyncingTest;
 import org.eclipse.emf.cdo.tests.model1.Company;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.util.CDOUtil;
 
 /**
  * "Attempt to modify historical revision" on raw replication.
@@ -61,7 +61,7 @@ public class Bugzilla_319552_Test extends AbstractSyncingTest
     waitForOffline(clone);
 
     // do some online changes to increase the revision.
-    Company masterCompany = (Company)masterTransaction.getObject(((CDOObject)company).cdoID());
+    Company masterCompany = (Company)masterTransaction.getObject(CDOUtil.getCDOObject(company).cdoID());
 
     masterCompany.setName("revision2");
     masterTransaction.commit();
@@ -84,6 +84,7 @@ public class Bugzilla_319552_Test extends AbstractSyncingTest
     company.getName();
 
     // check revision versions.
-    assertEquals(((CDOObject)masterCompany).cdoRevision().getVersion(), ((CDOObject)company).cdoRevision().getVersion());
+    assertEquals(CDOUtil.getCDOObject(masterCompany).cdoRevision().getVersion(), CDOUtil.getCDOObject(company)
+        .cdoRevision().getVersion());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
index d51be0b43c..a3984679e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.emf.cdo.tests.bugzilla;
 
-import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
@@ -19,6 +18,7 @@ import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
 import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
 
 import org.eclipse.emf.spi.cdo.DefaultCDOMerger;
@@ -87,6 +87,7 @@ public class Bugzilla_324635_Test extends AbstractCDOTest
 
     // check revision versions.
     s1Tr1.waitForUpdate(s1Tr2.getLastCommitTime());
-    assertEquals(((CDOObject)container).cdoRevision().getVersion(), ((CDOObject)container2).cdoRevision().getVersion());
+    assertEquals(CDOUtil.getCDOObject(container).cdoRevision().getVersion(), CDOUtil.getCDOObject(container2)
+        .cdoRevision().getVersion());
   }
 }