projects/dwt-addons: dwtx/jface/viewers/AbstractListViewer.d comparison

comparison dwtx/jface/viewers/AbstractListViewer.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

comparison

equal deleted inserted replaced

-:2d6540440fe6
+:04b47443bb01
 import dwtx.jface.viewers.ILabelProvider;
 import dwtx.jface.viewers.IBaseLabelProvider;
 import dwtx.jface.viewers.ViewerComparator;
 import dwtx.jface.viewers.IElementComparer;
-import tango.util.collection.ArraySeq;
-import tango.util.collection.model.Seq;
-import tango.util.collection.model.SeqView;
 import dwt.widgets.Control;
 import dwt.widgets.Widget;
 import dwtx.core.runtime.Assert;
 import dwt.dwthelper.utils;
+import dwtx.dwtxhelper.Collection;
 import dwt.dwthelper.Runnable;
 /**
 * Abstract base class for viewers that contain lists of items (such as a combo or list).
 * Most of the viewer implementation is in this base class, except for the minimal code that
 alias StructuredViewer.setSelectionToWidget setSelectionToWidget;
 /**
 * A list of viewer elements (element type: <code>Object</code>).
 */
-private Seq!(Object) listMap;
+private dwtx.dwtxhelper.Collection.List listMap;
 /**
 * Adds the given string to the underlying widget at the given index
 *
 * @param string the string to add
 * Deselects all selected items in the underlying widget.
 */
 protected abstract void listDeselectAll();
 public this(){
-listMap = new ArraySeq!(Object);
+listMap = new ArrayList();
 }
 /**
 * Adds the given elements to this list viewer.
 * If this viewer does not have a sorter, the elements are added at the end
 }
 }
 private void insertItem(ILabelProvider labelProvider, Object element, int index) {
 listAdd(getLabelProviderText(labelProvider, element), index);
-listMap.addAt(index, element);
+listMap.add(index, element);
 mapElement(element, getControl()); // must map it, since findItem only looks in map, if enabled
 }
 /**
 * Inserts the given element into this list viewer at the given position.
 * Method declared on Viewer.
 */
 /* (non-Javadoc)
 * Method declared on StructuredViewer.
 */
-protected override SeqView!(Object) getSelectionFromWidget() {
+protected override List getSelectionFromWidget() {
 int[] ixs = listGetSelectionIndices();
-ArraySeq!(Object) list = new ArraySeq!(Object);
+ArrayList list = new ArrayList(ixs.length);
-list.capacity(ixs.length);
 for (int i = 0; i < ixs.length; i++) {
 Object e = getElementAt(ixs[i]);
 if (e !is null) {
-list.append(e);
+list.add(e);
 }
 }
 return list;
 }
 listRemoveAll();
 String[] labels = new String[size];
 for (int i = 0; i < size; i++) {
 Object el = children[i];
 labels[i] = getLabelProviderText(cast(ILabelProvider) getLabelProvider(),el);
-listMap.append(el);
+listMap.add(el);
 mapElement(el, getControl()); // must map it, since findItem only looks in map, if enabled
 }
 listSetItems(labels);
 }
 // the parent
 if (listMap !is null) {
 listMap.clear();
 }
 unmapAllElements();
-auto selection = getSelectionFromWidget();
+List selection = getSelectionFromWidget();
 int topIndex = -1;
-if (selection is null || selection.drained()) {
+if (selection is null || selection.isEmpty()) {
 topIndex = listGetTopIndex();
 }
 Object[] children = null;
 list.setRedraw(false);
 try {
 listRemoveAll();
 children = getSortedChildren(getRoot());
 String[] items = new String[children.length];
 ILabelProvider labelProvider = cast(ILabelProvider) getLabelProvider();
 for (int i = 0; i < items.length; i++) {
 Object el = children[i];
 items[i] = getLabelProviderText(labelProvider, el);
-listMap.append(el);
+listMap.add(el);
 mapElement(el, list); // must map it, since findItem only looks in map, if enabled
 }
 listSetItems(items);
 } finally {
 list.setRedraw(true);
 }
 return;
 }
 int ix = getElementIndex(elements[i]);
 if (ix >= 0) {
 listRemove(ix);
-listMap.removeAt(ix);
+listMap.remove(ix);
 unmapElement(elements[i], getControl());
 }
 }
 }
 public void remove(Object[] elements) {
 assertElementsNotNull(elements);
 if (elements.length is 0) {
 return;
 }
-preservingSelection(new class(elements) Runnable {
+preservingSelection( dgRunnable( (Object[] elements_){
-Object[] elements_;
+internalRemove(elements_);
-this(Object[] a){
+}, elements));
-elements_= a;
-}
-public void run() {
-internalRemove(elements_);
-}
-});
 }
 /**
 * Removes the given element from this list viewer.
 * The selection is updated if necessary.
 }
 /* (non-Javadoc)
 * Method declared on StructuredViewer.
 */
-protected override void setSelectionToWidget(SeqView!(Object) in_, bool reveal) {
+protected override void setSelectionToWidget(List in_, bool reveal) {
 if (in_ is null || in_.size() is 0) { // clear selection
 listDeselectAll();
 } else {
 int n = in_.size();
 int[] ixs = new int[n];
 * @return the index
 */
 int getElementIndex(Object element) {
 IElementComparer comparer = getComparer();
 if (comparer is null) {
-int idx = 0;
+return listMap.indexOf(element);
-foreach( e; listMap ){
-if( e == element ){
-return idx;
-}
-idx++;
-}
-return -1;
 }
 int size = listMap.size();
 for (int i = 0; i < size; i++) {
 if (comparer.opEquals(element, listMap.get(i)))
 return i;

Mercurial > projects > dwt-addons

comparison dwtx/jface/viewers/AbstractListViewer.d @ 104:04b47443bb01