summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-17 07:07:02 (EDT)
committerEike Stepper2007-07-17 07:07:02 (EDT)
commit69678ef3e6ae619fcfa28726c52eff44407f5c70 (patch)
tree3dfa042cfcd18b86b0b4e4b774c7a969aea530ba
parent10bdf11fb0e0480dd9f74ea2330e1c17d435b8bb (diff)
downloadcdo-69678ef3e6ae619fcfa28726c52eff44407f5c70.zip
cdo-69678ef3e6ae619fcfa28726c52eff44407f5c70.tar.gz
cdo-69678ef3e6ae619fcfa28726c52eff44407f5c70.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java9
4 files changed, 20 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
index b284916..25ceecc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
@@ -53,7 +53,7 @@ public interface CDOView extends INotifier
public CDOObject newInstance(EClass eClass);
- public CDORevision resolve(CDOID id);
+ public CDORevision getRevision(CDOID id);
public boolean isDirty();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
index 89442bb..46575a1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
@@ -43,6 +43,10 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C
LoadObjectRequest signal = new LoadObjectRequest(session.getChannel(), id);
return signal.send();
}
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
catch (Exception ex)
{
throw new TransportException(ex);
@@ -57,6 +61,10 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C
LoadObjectRequest signal = new LoadObjectRequest(session.getChannel(), id, timeStamp);
return signal.send();
}
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
catch (Exception ex)
{
throw new TransportException(ex);
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 f42c245..53c0f11 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
@@ -453,7 +453,7 @@ public final class CDOStateMachine
{
CDOID id = object.cdoID();
CDOViewImpl view = object.cdoView();
- CDORevisionImpl revision = view.resolve(id);
+ CDORevisionImpl revision = view.getRevision(id);
object.setRevision(revision);
object.setState(CDOState.CLEAN);
@@ -499,6 +499,10 @@ public final class CDOStateMachine
{
return signal.send();
}
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
catch (Exception ex)
{
throw new TransportException(ex);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 6eec484..0cc8856 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -36,7 +36,6 @@ import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -182,6 +181,10 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
return resource;
}
+ catch (RuntimeException ex)
+ {
+ throw ex;
+ }
catch (Exception ex)
{
throw new TransportException(ex);
@@ -199,7 +202,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
return newInstance(eClass);
}
- public CDORevisionImpl resolve(CDOID id)
+ public CDORevisionImpl getRevision(CDOID id)
{
CDORevisionResolver revisionManager = session.getRevisionManager();
if (isReadWrite())
@@ -500,7 +503,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
TRACER.format("Creating object from view: ID={0}", id);
}
- CDORevisionImpl revision = resolve(id);
+ CDORevisionImpl revision = getRevision(id);
CDOClass cdoClass = revision.getCDOClass();
CDOID resourceID = revision.getResourceID();