summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-05 03:27:21 (EDT)
committerEike Stepper2007-07-05 03:27:21 (EDT)
commitc22d46fa7e70659b20b236ef1db60c30bf446a88 (patch)
tree7786b0dabb4b81a8a490e948fa8d638b156c7616
parent117e684054a1aa6c4f515572add68e2124c7acea (diff)
downloadcdo-c22d46fa7e70659b20b236ef1db60c30bf446a88.zip
cdo-c22d46fa7e70659b20b236ef1db60c30bf446a88.tar.gz
cdo-c22d46fa7e70659b20b236ef1db60c30bf446a88.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java17
2 files changed, 7 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
index 0e85719..91d8830 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
@@ -36,7 +36,7 @@ public abstract class ItemsProcessor
{
try
{
- viewer.getControl().getDisplay().asyncExec(new Runnable()
+ viewer.getControl().getDisplay().syncExec(new Runnable()
{
public void run()
{
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 794768c..48f489a 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
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.emf.internal.cdo;
-import org.eclipse.emf.cdo.CDOSessionInvalidationEvent;
import org.eclipse.emf.cdo.CDOSession;
+import org.eclipse.emf.cdo.CDOSessionInvalidationEvent;
import org.eclipse.emf.cdo.CDOSessionViewsEvent;
import org.eclipse.emf.cdo.CDOView;
import org.eclipse.emf.cdo.protocol.CDOID;
@@ -165,6 +165,7 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
{
values = views.values();
}
+
return values.toArray(new CDOViewImpl[values.size()]);
}
@@ -189,22 +190,16 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
public void notifyInvalidation(long timeStamp, Set<CDOID> dirtyOIDs, CDOViewImpl excludedView)
{
- CDOViewImpl[] values;
- synchronized (views)
- {
- values = views.values().toArray(new CDOViewImpl[views.size()]);
- }
-
- Set<CDOID> unmodifiableSet = Collections.unmodifiableSet(dirtyOIDs);
- for (CDOViewImpl view : values)
+ dirtyOIDs = Collections.unmodifiableSet(dirtyOIDs);
+ for (CDOViewImpl view : getViews())
{
if (view != excludedView)
{
- view.notifyInvalidation(timeStamp, unmodifiableSet);
+ view.notifyInvalidation(timeStamp, dirtyOIDs);
}
}
- fireEvent(new InvalidationEvent(excludedView, timeStamp, unmodifiableSet));
+ fireEvent(new InvalidationEvent(excludedView, timeStamp, dirtyOIDs));
}
@Override