summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-30 07:36:27 (EDT)
committerEike Stepper2006-08-30 07:36:27 (EDT)
commitd31995f202288aa0fe0ad2f44ccb30134903376b (patch)
treeabd323b34d55f918fc475813d00ff038e0b94e44
parente308d242f37bca3cda82ad5559d0a949591ccae3 (diff)
downloadcdo-d31995f202288aa0fe0ad2f44ccb30134903376b.zip
cdo-d31995f202288aa0fe0ad2f44ccb30134903376b.tar.gz
cdo-d31995f202288aa0fe0ad2f44ccb30134903376b.tar.bz2
[155638] Give feedback on transaction status in CDOEditor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=155638
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java8
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
index 3177de9..a3d2417 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
@@ -13,8 +13,11 @@ package org.eclipse.emf.cdo.tests.model1;
import org.eclipse.emf.cdo.client.ResourceManager;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
+import java.util.List;
+
import testmodel1.TreeNode;
import junit.framework.ComparisonFailure;
@@ -150,7 +153,8 @@ public class NotificationTest extends AbstractModel1Test
ResourceManager client2 = loaded.cdoGetResource().getResourceManager();
client2.addInvalidationListener(new ResourceManager.InvalidationListener()
{
- public void notifyInvalidation(ResourceManager resourceManager, long[] oids)
+ public void notifyInvalidation(ResourceManager resourceManager, List<EObject> invalidated,
+ List<EObject> deferred)
{
notificationReceived[0] = true;
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
index f1e4b26..bdc8885 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
@@ -14,7 +14,12 @@ package org.eclipse.emf.cdo.tests.model1;
import org.eclipse.emf.cdo.client.OptimisticControlException;
import org.eclipse.emf.cdo.client.ResourceManager;
+import org.eclipse.emf.ecore.EObject;
+
import testmodel1.TreeNode;
+
+import java.util.List;
+
import junit.framework.ComparisonFailure;
@@ -70,7 +75,8 @@ public class RollbackTest extends AbstractModel1Test
ResourceManager resourceManager = client2.cdoGetResource().getResourceManager();
resourceManager.addInvalidationListener(new ResourceManager.InvalidationListener()
{
- public void notifyInvalidation(ResourceManager resourceManager, long[] oids)
+ public void notifyInvalidation(ResourceManager resourceManager, List<EObject> invalidated,
+ List<EObject> deferred)
{
notificationReceived[0] = true;
}