summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-01-05 04:17:56 (EST)
committerEike Stepper2008-01-05 04:17:56 (EST)
commit0ef6d7a921161bbcb048845899ae7bda0faa65ea (patch)
tree96c0412f4a10a89a58156e6d725c3a1b07dc6f60
parent127d2a418b37adb3e0651870683280012ca118c2 (diff)
downloadcdo-0ef6d7a921161bbcb048845899ae7bda0faa65ea.zip
cdo-0ef6d7a921161bbcb048845899ae7bda0faa65ea.tar.gz
cdo-0ef6d7a921161bbcb048845899ae7bda0faa65ea.tar.bz2
Cleanup
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java6
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java
index 20bafa1..0f57770 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreAccessor.java
@@ -134,7 +134,7 @@ public class MEMStoreAccessor extends StoreAccessor
@Override
public void writeRevisionDelta(CDORevisionDeltaImpl delta)
{
- CDORevisionImpl revision2 = (CDORevisionImpl)getStore().getRevision(delta.getId());
+ CDORevisionImpl revision2 = (CDORevisionImpl)getStore().getRevision(delta.getID());
if (delta.getOriginVersion() != revision2.getVersion())
{
throw new CDODuplicateRevisionException(revision2);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
index d5c2b36..97cbe59 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
@@ -337,7 +337,7 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
}
else
{
- CDORevisionImpl oldRevision = getRevisionByVersion(revisionDelta.getId(), CDORevision.UNCHUNKED, revisionDelta
+ CDORevisionImpl oldRevision = getRevisionByVersion(revisionDelta.getID(), CDORevision.UNCHUNKED, revisionDelta
.getOriginVersion(), true);
if (oldRevision == null)
{
@@ -350,7 +350,7 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
}
// Look if we already have it in our cache revision
- CDORevisionImpl currentVersion = getRevisionByVersion(revisionDelta.getId(), 0, revisionDelta.getDirtyVersion(),
+ CDORevisionImpl currentVersion = getRevisionByVersion(revisionDelta.getID(), 0, revisionDelta.getDirtyVersion(),
false);
if (currentVersion != null)
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 eac028a..c30cdec 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
@@ -239,7 +239,7 @@ public class CommitTransactionIndication extends CDOServerIndication
for (int i = 0; i < size; i++)
{
deltas[i] = new CDORevisionDeltaImpl(in, transactionPackageManager);
- dirtyIDs[i] = deltas[i].getId();
+ dirtyIDs[i] = deltas[i].getID();
}
return deltas;
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 74cf323..00a5a93 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
@@ -340,10 +340,10 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
public void registerRevisionDelta(CDORevisionDelta delta)
{
- CDORevisionDelta changeSet = revisionDeltas.get(delta.getId());
- if (changeSet == null)
+ CDORevisionDelta revisionDelta = revisionDeltas.get(delta.getID());
+ if (revisionDelta == null)
{
- revisionDeltas.put(delta.getId(), changeSet);
+ revisionDeltas.put(delta.getID(), revisionDelta);
}
}