Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-06-16 15:52:24 +0000
committerSimon McDuff2008-06-16 15:52:24 +0000
commit1b0d7961c9c2fc7f28abb02591bad07dc5c067df (patch)
tree44491d619b311e3c7dc3fa55c6d4edfb563da285
parent0c6a0c87fcd353135864fbcbe2d4d1d816986f3e (diff)
downloadcdo-1b0d7961c9c2fc7f28abb02591bad07dc5c067df.tar.gz
cdo-1b0d7961c9c2fc7f28abb02591bad07dc5c067df.tar.xz
cdo-1b0d7961c9c2fc7f28abb02591bad07dc5c067df.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.java2
-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/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.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/protocol/InvalidationIndication.java2
6 files changed, 7 insertions, 7 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 5cf1f3e030..73e4647e95 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
@@ -49,7 +49,7 @@ public class NotificationManager implements INotificationManager
SessionManager sessionManager = (SessionManager)repository.getSessionManager();
- sessionManager.notifyCommit(commitContext.getTimeStamp(), dirtyIDs, deltas, session);
+ sessionManager.handleCommitNotification(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 6c3ab4a38d..4fda745141 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 notifyCommit(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas)
+ public void handleCommitNotification(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 6203c681d1..dc1e7427c5 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 notifyCommit(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas, Session excludedSession)
+ public void handleCommitNotification(long timeStamp, List<CDOID> dirtyIDs, List<CDORevisionDelta> deltas, Session excludedSession)
{
for (Session session : getSessions())
{
if (session != excludedSession)
{
- session.notifyCommit(timeStamp, dirtyIDs, deltas);
+ session.handleCommitNotification(timeStamp, dirtyIDs, deltas);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index b1825d37f9..e3657414b1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -558,7 +558,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
types.put(id, type);
}
- public void notifyCommit(long timeStamp, Set<CDOID> dirtyOIDs, Collection<CDORevisionDelta> deltas,
+ public void handleCommitNotification(long timeStamp, Set<CDOID> dirtyOIDs, Collection<CDORevisionDelta> deltas,
CDOViewImpl excludedView)
{
if (isPassiveUpdateEnabled())
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 32af38975a..05d1a58469 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
@@ -249,7 +249,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
if (!dirtyObjects.isEmpty())
{
- session.notifyCommit(result.getTimeStamp(), dirtyObjects.keySet(),deltas, this);
+ session.handleCommitNotification(result.getTimeStamp(), dirtyObjects.keySet(),deltas, this);
}
cleanUp();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
index 391669d776..2adf9acdec 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
@@ -83,7 +83,7 @@ public class InvalidationIndication extends Indication
deltas.add(new CDORevisionDeltaImpl(in, getSession().getPackageManager()));
}
- session.notifyCommit(timeStamp, dirtyOIDs, deltas, null);
+ session.handleCommitNotification(timeStamp, dirtyOIDs, deltas, null);
}
protected CDOSessionImpl getSession()

Back to the top