--- a/dwtx/jface/bindings/BindingManagerEvent.d	Sun Aug 03 17:01:51 2008 +0200
+++ b/dwtx/jface/bindings/BindingManagerEvent.d	Thu Aug 07 15:01:33 2008 +0200
@@ -17,15 +17,13 @@
 import dwtx.jface.bindings.Scheme;
 import dwtx.jface.bindings.TriggerSequence;
 
-// import tango.util.collection.Seq!(Object);
-import tango.util.collection.model.Map;
-import tango.util.collection.model.Seq;
 
 import dwtx.core.commands.ParameterizedCommand;
 import dwtx.core.commands.common.AbstractBitSetEvent;
 import dwtx.jface.util.Util;
 
 import dwt.dwthelper.utils;
+import dwtx.dwtxhelper.Collection;
 
 /**
  * An instance of this class describes changes to an instance of
@@ -71,12 +69,12 @@
     private const BindingManager manager;
 
     /**
-     * The map of triggers (<code>Seq!(Object)</code> of
+     * The map of triggers (<code>Collection</code> of
      * <code>TriggerSequence</code>) by parameterized command (<code>ParameterizedCommand</code>)
      * before the change occurred. This map may be empty and it may be
      * <code>null</code>.
      */
-    private const Map!(Object,Object) previousTriggersByParameterizedCommand;
+    private const Map previousTriggersByParameterizedCommand;
 
     /**
      * The scheme that became defined or undefined. This value may be
@@ -112,7 +110,7 @@
      */
     public this(BindingManager manager,
             bool activeBindingsChanged,
-            Map!(Object,Object) previousTriggersByParameterizedCommand,
+            Map previousTriggersByParameterizedCommand,
             bool activeSchemeChanged, Scheme scheme,
             bool schemeDefined, bool localeChanged,
             bool platformChanged) {
@@ -192,7 +190,7 @@
                 .getActiveBindingsFor(parameterizedCommand);
         TriggerSequence[] previousBindings;
         if (previousTriggersByParameterizedCommand !is null) {
-            Seq!(Object) previousBindingCollection = cast(Seq!(Object)) previousTriggersByParameterizedCommand
+            Collection previousBindingCollection = cast(Collection) previousTriggersByParameterizedCommand
                     .get(parameterizedCommand);
             if (previousBindingCollection is null) {
                 previousBindings = null;