summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-01-03 03:41:52 (EST)
committerEike Stepper2008-01-03 03:41:52 (EST)
commit4219b7c8ebd7bd314ed6cd08f7d1e8a119af614d (patch)
treeed9c464d69c1ded7030bc0b1e2c2e0f244dcfd9c
parent5fc6cef2c2cacf0c6d7969f1e8eb8a00ece00dd8 (diff)
downloadcdo-4219b7c8ebd7bd314ed6cd08f7d1e8a119af614d.zip
cdo-4219b7c8ebd7bd314ed6cd08f7d1e8a119af614d.tar.gz
cdo-4219b7c8ebd7bd314ed6cd08f7d1e8a119af614d.tar.bz2
Reformatted
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java12
1 files changed, 9 insertions, 3 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 367f804c..8e77e58 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
@@ -141,7 +141,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
data.resource = resource;
data.view = view;
- // TRANSIENT --> PREPARED_ATTACH
+ // Phase 1: TRANSIENT --> PREPARED_ATTACH
if (TRACER.isEnabled())
{
TRACER.format("ATTACH: {0} --> {1}", object, view);
@@ -149,7 +149,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
process(object, CDOEvent.ATTACH, data);
- // PREPARED_ATTACH --> NEW
+ // Phase 2: PREPARED_ATTACH --> NEW
if (TRACER.isEnabled())
{
TRACER.format("FINALIZE_ATTACH: {0} --> {1}", object, view);
@@ -595,5 +595,11 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
*/
enum CDOEvent
{
- ATTACH, DETACH, READ, WRITE, INVALIDATE, RELOAD, COMMIT, ROLLBACK, FINALIZE_ATTACH
+ ATTACH, DETACH, READ, WRITE, INVALIDATE, RELOAD, COMMIT, ROLLBACK,
+
+ /**
+ * An internal event that is only triggered by the state machine itself to express the two phase nature of attaching
+ * an object tree to a view in {@link CDOStateMachine#attach(InternalCDOObject, CDOResource, CDOViewImpl) attach()}.
+ */
+ FINALIZE_ATTACH
}