diff options
author | Eike Stepper | 2009-11-10 06:07:38 +0000 |
---|---|---|
committer | Eike Stepper | 2009-11-10 06:07:38 +0000 |
commit | 589e0917233ec0973178170f64e30de6d37e06d9 (patch) | |
tree | f88dd9918fa6408915b65cff1785b2cfd3d4acd9 /plugins/org.eclipse.emf.cdo/src | |
parent | 678cf126dc6f7eb82aecd178376c748c489d0f0a (diff) | |
download | cdo-589e0917233ec0973178170f64e30de6d37e06d9.tar.gz cdo-589e0917233ec0973178170f64e30de6d37e06d9.tar.xz cdo-589e0917233ec0973178170f64e30de6d37e06d9.zip |
consolidated CDOSessionImpl.reviseRevisions()
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java | 12 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java index 60a3fd1b52..12a727f267 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java @@ -580,7 +580,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter { if (passiveUpdate) { - updateRevisionForRemoteChanges(timeStamp, dirtyOIDs, detachedObjects, excludedView); + reviseRevisions(timeStamp, dirtyOIDs, detachedObjects, excludedView); } final Set<CDOIDAndVersion> finalDirtyOIDs = Collections.unmodifiableSet(dirtyOIDs); @@ -682,14 +682,8 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter fireInvalidationEvent(timeStamp, newPackageUnits, dirtyOIDs, detachedObjects, excludedView); } - public void handleUpdateRevision(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, - Collection<CDOID> detachedObjects) - { - updateRevisionForRemoteChanges(timeStamp, dirtyOIDs, detachedObjects, null); - } - - private void updateRevisionForRemoteChanges(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, - Collection<CDOID> detachedObjects, InternalCDOView excludedView) + public void reviseRevisions(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, Collection<CDOID> detachedObjects, + InternalCDOView excludedView) { InternalCDORevisionManager revisionManager = getRevisionManager(); if (excludedView == null || timeStamp == CDORevision.UNSPECIFIED_DATE) diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java index d07a7b782c..bb2fd427e6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java @@ -106,7 +106,9 @@ public interface InternalCDOSession extends CDOSession, PackageProcessor, Packag /** * In some cases we need to sync without propagating event. Lock is a good example. + * + * @since 3.0 */ - public void handleUpdateRevision(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, - Collection<CDOID> detachedObjects); + public void reviseRevisions(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, Collection<CDOID> detachedObjects, + InternalCDOView excludedView); } |