aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManagerImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManagerImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceManager.java4
6 files changed, 15 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManagerImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManagerImpl.java
index 2ca0b1083a..d80a06fb1d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManagerImpl.java
@@ -42,24 +42,24 @@ public class ResourceManagerImpl implements ResourceManager
return repository;
}
- public CDOID getActualResourceID(String path)
+ public CDOID getResourceID(String path)
{
CDOID id = pathToIDMap.get(path);
if (id == null)
{
- id = loadActualID(path);
+ id = loadID(path);
registerResource(id, path);
}
return id;
}
- public String getActualResourcePath(CDOID id)
+ public String getResourcePath(CDOID id)
{
String path = idToPathMap.get(id);
if (path == null)
{
- path = loadActualPath(id);
+ path = loadPath(id);
registerResource(id, path);
}
@@ -80,13 +80,13 @@ public class ResourceManagerImpl implements ResourceManager
}
}
- private CDOID loadActualID(String path)
+ private CDOID loadID(String path)
{
// TODO Implement method ResourceManagerImpl.loadID()
throw new UnsupportedOperationException("Not yet implemented");
}
- private String loadActualPath(CDOID id)
+ private String loadPath(CDOID id)
{
// TODO Implement method ResourceManagerImpl.loadPath()
throw new UnsupportedOperationException("Not yet implemented");
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManagerImpl.java
index 0ffb65a88b..25fae0dd29 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManagerImpl.java
@@ -45,16 +45,16 @@ public class RevisionManagerImpl extends CDORevisionResolverImpl implements Revi
}
@Override
- protected CDORevisionImpl loadActual(CDOID id)
+ protected CDORevisionImpl loadRevision(CDOID id)
{
- // TODO Implement method RevisionManagerImpl.loadActual()
+ // TODO Implement method RevisionManagerImpl.loadRevision()
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
- protected CDORevisionImpl loadHistorical(CDOID id, long timeStamp)
+ protected CDORevisionImpl loadRevision(CDOID id, long timeStamp)
{
- // TODO Implement method RevisionManagerImpl.loadHistorical()
+ // TODO Implement method RevisionManagerImpl.loadRevision()
throw new UnsupportedOperationException("Not yet implemented");
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
index 26672b1fe0..5f8447c7c8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
@@ -64,7 +64,7 @@ public class LoadObjectIndication extends CDOServerIndication
protected void responding(ExtendedDataOutputStream out) throws IOException
{
RevisionManagerImpl rm = getRevisionManager();
- CDORevisionImpl revision = timeStamp != null ? rm.getHistoricalRevision(id, timeStamp) : rm.getActualRevision(id);
+ CDORevisionImpl revision = timeStamp != null ? rm.getRevision(id, timeStamp) : rm.getRevision(id);
revision.write(out, null);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
index 8164a3709e..615940d523 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
@@ -49,7 +49,7 @@ public class ResourceIDIndication extends CDOServerIndication
try
{
- id = getResourceManager().getActualResourceID(path);
+ id = getResourceManager().getResourceID(path);
}
catch (Exception ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
index 8b1ee59dd0..ff716d8332 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
@@ -45,7 +45,7 @@ public class ResourcePathIndication extends CDOServerIndication
PROTOCOL.format("Read ID: {0}", id);
}
- path = getResourceManager().getActualResourcePath(id);
+ path = getResourceManager().getResourcePath(id);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceManager.java
index 653227f92e..e0cef522cc 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ResourceManager.java
@@ -20,7 +20,7 @@ public interface ResourceManager
{
public RepositoryImpl getRepository();
- public CDOID getActualResourceID(String path);
+ public CDOID getResourceID(String path);
- public String getActualResourcePath(CDOID id);
+ public String getResourcePath(CDOID id);
}