summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-01-05 03:57:54 (EST)
committerEike Stepper2008-01-05 03:57:54 (EST)
commit127d2a418b37adb3e0651870683280012ca118c2 (patch)
treedbca674d9693b912ae4aabe1bf91eb14949f4cb3
parent31e9df55d1e76b6f15bd8fb4a78b06312cedcd1e (diff)
downloadcdo-127d2a418b37adb3e0651870683280012ca118c2.zip
cdo-127d2a418b37adb3e0651870683280012ca118c2.tar.gz
cdo-127d2a418b37adb3e0651870683280012ca118c2.tar.bz2
Cleanup
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 8e77e58..5e531ed 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -179,14 +179,14 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
write(object, null);
}
- public void write(InternalCDOObject object, CDOFeatureDelta featureChange)
+ public void write(InternalCDOObject object, CDOFeatureDelta featureDelta)
{
if (TRACER.isEnabled())
{
trace(object, CDOEvent.WRITE);
}
- process(object, CDOEvent.WRITE, featureChange);
+ process(object, CDOEvent.WRITE, featureDelta);
}
public void reload(InternalCDOObject... objects)
@@ -437,7 +437,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
*/
private final class WriteTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, Object>
{
- public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Object featureChange)
+ public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Object featureDelta)
{
// Copy revision
CDORevisionImpl revision = new CDORevisionImpl((CDORevisionImpl)object.cdoRevision());
@@ -446,7 +446,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
CDOViewImpl view = (CDOViewImpl)object.cdoView();
CDOTransactionImpl transaction = view.toTransaction();
- transaction.registerDirty(object, (CDOFeatureDelta)featureChange);
+ transaction.registerDirty(object, (CDOFeatureDelta)featureDelta);
changeState(object, CDOState.DIRTY);
}
}
@@ -456,11 +456,11 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
*/
private final class RewriteTransition implements ITransition<CDOState, CDOEvent, InternalCDOObject, Object>
{
- public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Object featureChange)
+ public void execute(InternalCDOObject object, CDOState state, CDOEvent event, Object featureDelta)
{
CDOViewImpl view = (CDOViewImpl)object.cdoView();
CDOTransactionImpl transaction = view.toTransaction();
- transaction.registerFeatureDelta(object, (CDOFeatureDelta)featureChange);
+ transaction.registerFeatureDelta(object, (CDOFeatureDelta)featureDelta);
}
}