summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-06 03:57:58 (EDT)
committerEike Stepper2007-07-06 03:57:58 (EDT)
commit255245fe7bb959a89774088573063fe6b6383f73 (patch)
tree61872fb36beb5025b7b661914f947e58dd7587c7
parentcb890827c5dbceaa66036b9b3c8e882ed385ef78 (diff)
downloadcdo-255245fe7bb959a89774088573063fe6b6383f73.zip
cdo-255245fe7bb959a89774088573063fe6b6383f73.tar.gz
cdo-255245fe7bb959a89774088573063fe6b6383f73.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
index 758b133..89442bb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
@@ -36,7 +36,7 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C
}
@Override
- protected CDORevisionImpl loadActual(CDOID id)
+ protected CDORevisionImpl loadRevision(CDOID id)
{
try
{
@@ -50,7 +50,7 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C
}
@Override
- protected CDORevisionImpl loadHistorical(CDOID id, long timeStamp)
+ protected CDORevisionImpl loadRevision(CDOID id, long timeStamp)
{
try
{
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 de96ee9..53c4192 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
@@ -133,10 +133,10 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
CDORevisionResolver revisionManager = session.getRevisionManager();
if (isReadWrite())
{
- return (CDORevisionImpl)revisionManager.getActualRevision(id);
+ return (CDORevisionImpl)revisionManager.getRevision(id);
}
- return (CDORevisionImpl)revisionManager.getHistoricalRevision(id, timeStamp);
+ return (CDORevisionImpl)revisionManager.getRevision(id, timeStamp);
}
public CDOResource createResource(String path)