Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-09-24 06:56:31 +0000
committerEike Stepper2010-09-24 06:56:31 +0000
commit44505cdb73356747da32c16b2b1357a3f3faccfc (patch)
tree43b0e9e736e64f6a932a11866407ab7861d9ca46
parentd23b1bf3cd0bd5e7515289ee1b9cdba0a1348d52 (diff)
downloadcdo-44505cdb73356747da32c16b2b1357a3f3faccfc.tar.gz
cdo-44505cdb73356747da32c16b2b1357a3f3faccfc.tar.xz
cdo-44505cdb73356747da32c16b2b1357a3f3faccfc.zip
[273562] Make EObjects available at the server-side
https://bugs.eclipse.org/bugs/show_bug.cgi?id=273562
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index cf18aea240..55918d9e24 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -316,8 +316,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
TRACER.format("Populating revision for {0}", this); //$NON-NLS-1$
}
- InternalCDOView view = cdoView();
- revision.setContainerID(eContainer == null ? CDOID.NULL : cdoView().convertObjectToID(eContainer, true));
+ revision.setContainerID(eContainer == null ? CDOID.NULL : view.convertObjectToID(eContainer, true));
revision.setContainingFeatureID(eContainerFeatureID);
Resource directResource = eDirectResource();
@@ -436,7 +435,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
super.didAdd(index, newObject);
if (!FSMUtil.isTransient(CDOObjectImpl.this))
{
- cdoView().handleAddAdapter(CDOObjectImpl.this, newObject);
+ view.handleAddAdapter(CDOObjectImpl.this, newObject);
}
}
@@ -446,7 +445,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
super.didRemove(index, oldObject);
if (!FSMUtil.isTransient(CDOObjectImpl.this))
{
- cdoView().handleRemoveAdapter(CDOObjectImpl.this, oldObject);
+ view.handleRemoveAdapter(CDOObjectImpl.this, oldObject);
}
}
};
@@ -1022,7 +1021,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
private CDOStore cdoStore()
{
- return cdoView().getStore();
+ return view.getStore();
}
private void resetSettings()
@@ -1172,7 +1171,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
public boolean isLocked()
{
- return cdoView().isObjectLocked(CDOObjectImpl.this, getType(), false);
+ return view.isObjectLocked(CDOObjectImpl.this, getType(), false);
}
/**
@@ -1180,14 +1179,14 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
*/
public boolean isLockedByOthers()
{
- return cdoView().isObjectLocked(CDOObjectImpl.this, getType(), true);
+ return view.isObjectLocked(CDOObjectImpl.this, getType(), true);
}
public void lock()
{
try
{
- cdoView().lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), CDOLock.WAIT);
+ view.lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), CDOLock.WAIT);
}
catch (InterruptedException ex)
{
@@ -1209,7 +1208,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
{
try
{
- cdoView().lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), CDOLock.NO_WAIT);
+ view.lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), CDOLock.NO_WAIT);
return true;
}
catch (TimeoutRuntimeException ex)
@@ -1226,7 +1225,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
{
try
{
- cdoView().lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), unit.toMillis(time));
+ view.lockObjects(Collections.singletonList(CDOObjectImpl.this), getType(), unit.toMillis(time));
return true;
}
catch (TimeoutRuntimeException ex)
@@ -1237,7 +1236,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
public void unlock()
{
- cdoView().unlockObjects(Collections.singletonList(CDOObjectImpl.this), getType());
+ view.unlockObjects(Collections.singletonList(CDOObjectImpl.this), getType());
}
@Override

Back to the top