Mercurial > projects > dwt-addons
diff dwtx/jface/window/Window.d @ 104:04b47443bb01
Reworked the collection uses to make use of a wrapper collection that is compatible to the Java Collections.
These new wrappers now use the tango.util.containers instead of the tango.util.collections.
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Thu, 07 Aug 2008 15:01:33 +0200 |
parents | 46a6e0e6ccd4 |
children |
line wrap: on
line diff
--- a/dwtx/jface/window/Window.d Sun Aug 03 17:01:51 2008 +0200 +++ b/dwtx/jface/window/Window.d Thu Aug 07 15:01:33 2008 +0200 @@ -16,7 +16,6 @@ import dwtx.jface.window.WindowManager; import dwtx.jface.window.SameShellProvider; -import tango.util.collection.ArraySeq; import dwt.DWT; import dwt.events.ShellAdapter; @@ -41,6 +40,7 @@ import dwtx.jface.util.PropertyChangeEvent; import dwt.dwthelper.utils; +import dwtx.dwtxhelper.Collection; import tango.io.Stdout; /** @@ -329,8 +329,8 @@ * be called). * </p> * <p> - * Note that in order to prevent recursive calls to this method - * it does not call <code>Shell#close()</code>. As a result <code>ShellListener</code>s + * Note that in order to prevent recursive calls to this method + * it does not call <code>Shell#close()</code>. As a result <code>ShellListener</code>s * will not receive a <code>shellClosed</code> event. * </p> * @@ -384,18 +384,17 @@ // The equivalent in the multi-image version seems to be to remove the // disposed images from the array passed to the shell. if (defaultImages !is null && defaultImages.length > 0) { - auto nonDisposedImages = new ArraySeq!(Image); - nonDisposedImages.capacity(defaultImages.length); + ArrayList nonDisposedImages = new ArrayList(defaultImages.length); for (int i = 0; i < defaultImages.length; ++i) { if (defaultImages[i] !is null && !defaultImages[i].isDisposed()) { - nonDisposedImages.append(defaultImages[i]); + nonDisposedImages.add(defaultImages[i]); } } if (nonDisposedImages.size() <= 0) { Stderr.formatln("Window.configureShell: images disposed"); //$NON-NLS-1$ } else { - newShell.setImages(nonDisposedImages.toArray()); + newShell.setImages(arraycast!(Image)(nonDisposedImages.toArray())); } }