1 files changed, 4 insertions, 68 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java
index 5be7dd7967..70c701c560 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java
@@ -10,86 +10,22 @@
  */
 package org.eclipse.emf.spi.cdo;
 
-import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent;
-
-import org.eclipse.emf.internal.cdo.bundle.OM;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
 
 /**
  * If the meaning of this type isn't clear, there really should be more of a description here...
  *
  * @author Eike Stepper
  * @since 4.0
+ * @deprecated As of 4.2 use {@link CDOSessionInvalidationEventQueue}.
  * @noextend This interface is not intended to be extended by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
-public class CDOSessionInvalidationAggregator
+@Deprecated
+public class CDOSessionInvalidationAggregator extends CDOSessionInvalidationEventQueue
 {
-  private CDOSession session;
-
-  private IListener sessionListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      try
-      {
-        if (event instanceof CDOSessionInvalidationEvent)
-        {
-          CDOSessionInvalidationEvent e = (CDOSessionInvalidationEvent)event;
-          handleEvent(e);
-        }
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  };
-
-  private CDOChangeSetData changeSetData;
-
   public CDOSessionInvalidationAggregator(CDOSession session)
   {
-    this.session = session;
-    session.addListener(sessionListener);
-  }
-
-  public void dispose()
-  {
-    reset();
-    session.removeListener(sessionListener);
-    session = null;
-  }
-
-  public CDOSession getSession()
-  {
-    return session;
-  }
-
-  public CDOChangeSetData getChangeSetData()
-  {
-    return changeSetData;
-  }
-
-  public void reset()
-  {
-    changeSetData = null;
-  }
-
-  protected void handleEvent(CDOSessionInvalidationEvent event) throws Exception
-  {
-    CDOChangeSetData copy = event.copy();
-    if (changeSetData == null)
-    {
-      changeSetData = copy;
-    }
-    else
-    {
-      changeSetData.merge(copy);
-    }
+    super(session);
   }
 }