Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-06-16 15:40:19 +0000
committerSimon McDuff2008-06-16 15:40:19 +0000
commit0c6a0c87fcd353135864fbcbe2d4d1d816986f3e (patch)
tree6c0f68ab95692207ecc97613e682466a7ddbf569
parentfa7f59ae7714679c37931ac4346d04d644cb9872 (diff)
downloadcdo-0c6a0c87fcd353135864fbcbe2d4d1d816986f3e.tar.gz
cdo-0c6a0c87fcd353135864fbcbe2d4d1d816986f3e.tar.xz
cdo-0c6a0c87fcd353135864fbcbe2d4d1d816986f3e.zip
233490: Change Subscription
https://bugs.eclipse.org/bugs/show_bug.cgi?id=233490
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/INotificationManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java2
7 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
index b06e9e73bb..5cf1f3e030 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
@@ -30,7 +30,7 @@ public class NotificationManager implements INotificationManager
this.repository = repository;
}
- public void notifyInvalidation(Session session, CommitContext commitContext)
+ public void notifyCommit(Session session, CommitContext commitContext)
{
CDORevisionDelta[] dirtyObjectDeltas = commitContext.getDirtyObjectDeltas();
@@ -49,7 +49,7 @@ public class NotificationManager implements INotificationManager
SessionManager sessionManager = (SessionManager)repository.getSessionManager();
- sessionManager.notifyInvalidation(commitContext.getTimeStamp(), dirtyIDs, deltas, session);
+ sessionManager.notifyCommit(commitContext.getTimeStamp(), dirtyIDs, deltas, session);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index a8f816900c..6c3ab4a38d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -205,7 +205,7 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider
return new View(this, viewID, type);
}
- public void notifyInvalidation(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas)
+ public void notifyCommit(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas)
{
if (!isPassiveUpdateEnabled()) dirtyIDs = new ArrayList<CDOID>();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 186033a0a8..6203c681d1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -105,13 +105,13 @@ public class SessionManager extends Container<ISession> implements ISessionManag
}
}
- public void notifyInvalidation(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas, Session excludedSession)
+ public void notifyCommit(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas, Session excludedSession)
{
for (Session session : getSessions())
{
if (session != excludedSession)
{
- session.notifyInvalidation(timeStamp, dirtyIDs, deltas);
+ session.notifyCommit(timeStamp, dirtyIDs, deltas);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
index 423f7bbce8..c7c7261725 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
@@ -200,7 +200,7 @@ public class Transaction extends View implements ITransaction, IStoreWriter.Comm
{
if (success)
{
- repository.getNotificationManager().notifyInvalidation( getSession(), this);
+ repository.getNotificationManager().notifyCommit( getSession(), this);
}
}
finally
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/INotificationManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/INotificationManager.java
index 5bb5b84a16..4535edc2f2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/INotificationManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/INotificationManager.java
@@ -19,6 +19,6 @@ import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
public interface INotificationManager
{
- public abstract void notifyInvalidation(Session session, CommitContext commitContext);
+ public abstract void notifyCommit(Session session, CommitContext commitContext);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index 3b6bd62272..32af38975a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -243,7 +243,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
((InternalCDOPackage)newPackage).setPersistent(true);
}
- changeSubscriptionManager.notifyCommit();
+ changeSubscriptionManager.notifyDirtyObjects();
Map<CDOID, CDOObject> dirtyObjects = this.getDirtyObjects();
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 76b0ce733b..25ae6ead85 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
@@ -195,7 +195,7 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
}
}
- protected void notifyCommit()
+ protected void notifyDirtyObjects()
{
synchronized (persistedObjects)
{

Back to the top