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

comparison dwtx/jface/viewers/AbstractTreeViewer.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	5df4896124c7
children

comparison

equal deleted inserted replaced

-:2d6540440fe6
+:04b47443bb01
 import dwtx.jface.viewers.IElementComparer;
 import dwtx.jface.viewers.ITreeSelection;
 import dwtx.jface.viewers.IBaseLabelProvider;
 import dwtx.jface.viewers.ITreePathLabelProvider;
-import tango.util.collection.LinkSeq;
-import tango.util.collection.ArraySeq;
-import tango.util.collection.model.Seq;
-import tango.util.collection.model.SeqView;
 import dwt.DWT;
 import dwt.custom.BusyIndicator;
 import dwt.events.SelectionEvent;
 import dwtx.core.runtime.Assert;
 import dwtx.core.runtime.ListenerList;
 import dwtx.jface.util.SafeRunnable;
 import dwt.dwthelper.utils;
+import dwtx.dwtxhelper.Collection;
 import dwt.dwthelper.Runnable;
 /**
 * Abstract base implementation for tree-structure-oriented viewers (trees and
 * table trees).
 * @return the filter list of children
 */
 private Object[] filter(Object parentElementOrTreePath, Object[] elements) {
 ViewerFilter[] filters = getFilters();
 if (filters !is null) {
-auto filtered = new ArraySeq!(Object);
+ArrayList filtered = new ArrayList(elements.length);
-filtered.capacity(elements.length);
 for (int i = 0; i < elements.length; i++) {
 bool add = true;
 for (int j = 0; j < filters.length; j++) {
 add = filters[j].select(this, parentElementOrTreePath,
 elements[i]);
 if (!add) {
 break;
 }
 }
 if (add) {
-filtered.append(elements[i]);
+filtered.add(elements[i]);
 }
 }
 return filtered.toArray();
 }
 return elements;
 if (data !is null) {
 return; // children already there!
 }
 }
-BusyIndicator.showWhile(widget.getDisplay(), new class(widget,tis) Runnable {
+BusyIndicator.showWhile(widget.getDisplay(), dgRunnable( (Widget widget_, Item[] tis_){
-Widget widget_;
+// fix for PR 1FW89L7:
-Item[] tis_;
+// don't complain and remove all "dummies" ...
-this( Widget a, Item[] b){
+if (tis_ !is null) {
-widget_ = a;
+for (int i = 0; i < tis_.length; i++) {
-tis_=b;
+if (tis_[i].getData() !is null) {
-}
+disassociate(tis_[i]);
-public void run() {
+Assert.isTrue(tis_[i].getData() is null,
-// fix for PR 1FW89L7:
+"Second or later child is non -null");//$NON-NLS-1$
-// don't complain and remove all "dummies" ...
-if (tis_ !is null) {
-for (int i = 0; i < tis_.length; i++) {
-if (tis_[i].getData() !is null) {
-disassociate(tis_[i]);
-Assert.isTrue(tis_[i].getData() is null,
-"Second or later child is non -null");//$NON-NLS-1$
-}
-tis_[i].dispose();
 }
-}
+tis_[i].dispose();
-Object d = widget_.getData();
+}
-if (d !is null) {
+}
-Object parentElement = d;
+Object d = widget_.getData();
-Object[] children;
+if (d !is null) {
-if (isTreePathContentProvider() && (null !is cast(Item)widget_) ) {
+Object parentElement = d;
-TreePath path = getTreePathFromItem(cast(Item) widget_);
+Object[] children;
-children = getSortedChildren(path);
+if (isTreePathContentProvider() && (null !is cast(Item)widget_) ) {
-} else {
+TreePath path = getTreePathFromItem(cast(Item) widget_);
-children = getSortedChildren(parentElement);
+children = getSortedChildren(path);
-}
+} else {
-for (int i = 0; i < children.length; i++) {
+children = getSortedChildren(parentElement);
-createTreeItem(widget_, children[i], -1);
+}
-}
+for (int i = 0; i < children.length; i++) {
-}
+createTreeItem(widget_, children[i], -1);
 }
+}
-});
+}, widget,tis ));
 } finally {
 setBusy(oldBusy);
 }
 }
 * @return <code>true</code> if the refer to the same elements,
 *         <code>false</code> otherwise
 *
 * @since 3.1 in TreeViewer, moved to AbstractTreeViewer in 3.3
 */
-protected bool isSameSelection(SeqView!(Item) items, Item[] current) {
+protected bool isSameSelection(List items, Item[] current) {
 // If they are not the same size then they are not equivalent
 int n = items.size();
 if (n !is current.length) {
 return false;
 }
 CustomHashtable itemSet = newHashtable(n * 2 + 1);
-foreach( item; items ){
+for (Iterator i = items.iterator(); i.hasNext();) {
+Item item = cast(Item) i.next();
 Object element = item.getData();
 itemSet.put(element, element);
 }
 // Go through the items of the current collection
 *
 * @return the array of expanded elements
 * @see #setExpandedElements
 */
 public Object[] getExpandedElements() {
-auto items = new ArraySeq!(Item);
+ArrayList items = new ArrayList();
 internalCollectExpandedItems(items, getControl());
-auto result = new ArraySeq!(Object);
+ArrayList result = new ArrayList(items.size());
-result.capacity(items.size());
+for (Iterator it = items.iterator(); it.hasNext();) {
-foreach ( item; items ) {
+Item item = cast(Item) it.next();
 Object data = item.getData();
 if (data !is null) {
-result.append(data);
+result.add(data);
 }
 }
 return result.toArray();
 }
 /*
 * (non-Javadoc)
 *
 * @see dwtx.jface.viewers.StructuredViewer#getSelectionFromWidget()
 */
-protected override SeqView!(Object) getSelectionFromWidget() {
+protected override List getSelectionFromWidget() {
 Widget[] items = getSelection(getControl());
-ArraySeq!(Object) list = new ArraySeq!(Object);
+ArrayList list = new ArrayList(items.length);
-list.capacity(items.length);
 for (int i = 0; i < items.length; i++) {
 Widget item = items[i];
 Object e = item.getData();
 if (e !is null) {
-list.append(e);
+list.add(e);
 }
 }
 return list;
 }
 *            a list (element type: <code>Item</code>) into which to
 *            collect the elements
 * @param widget
 *            the widget
 */
-private void internalCollectExpandedItems(Seq!(Item) result, Widget widget) {
+private void internalCollectExpandedItems(List result, Widget widget) {
 Item[] items = getChildren(widget);
 for (int i = 0; i < items.length; i++) {
 Item item = items[i];
 if (getExpanded(item)) {
-result.append(item);
+result.add(item);
 }
 internalCollectExpandedItems(result, item);
 }
 }
 Object element = internalToElement(elementOrPath);
 w = internalFindChild(pw, element);
 if (expand && null !is cast(Item)pw ) {
 // expand parent items top-down
 Item item = cast(Item) pw;
-auto toExpandList = new LinkSeq!(Item);
+LinkedList toExpandList = new LinkedList();
 while (item !is null && !getExpanded(item)) {
-toExpandList.prepend(item);
+toExpandList.addFirst(item);
 item = getParentItem(item);
 }
-foreach( toExpand; toExpandList ){
+for (Iterator it = toExpandList.iterator(); it
+.hasNext();) {
+Item toExpand = cast(Item) it.next();
 setExpanded(toExpand, true);
 }
 }
 }
 }
 if (elementsOrTreePaths.length is 0) {
 return;
 }
 if (checkBusy())
 return;
-preservingSelection(new class(elementsOrTreePaths) Runnable {
+preservingSelection( dgRunnable( (Object[] elementsOrTreePaths_){
-Object[] elementsOrTreePaths_;
+internalRemove(elementsOrTreePaths_);
-this(Object[] a){
+}, elementsOrTreePaths));
-elementsOrTreePaths_=a;
-}
-public void run() {
-internalRemove(elementsOrTreePaths_);
-}
-});
 }
 /**
 * Removes the given elements from this viewer whenever they appear as
 * children of the given parent element. If the given elements also appear
 if (elements.length is 0) {
 return;
 }
 if (checkBusy())
 return;
-preservingSelection(new class(parent,elements) Runnable {
+preservingSelection( dgRunnable( (Object parent_,Object[] elements_){
-Object parent_;
+internalRemove(parent_, elements_);
-Object[] elements_;
+}, parent, elements ));
-this(Object a,Object[] b){
-parent_=a;
-elements_=b;
-}
-public void run() {
-internalRemove(parent_, elements_);
-}
-});
 }
 /**
 * Removes the given element from the viewer. The selection is updated if
 * necessary.
 *
 * @param items
 *            list of items (element type:
 *            <code>dwt.widgets.Item</code>)
 */
-protected abstract void setSelection(SeqView!(Item) items);
+protected abstract void setSelection(List items);
 /**
 * This implementation of setSelectionToWidget accepts a list of elements or
 * a list of tree paths.
 */
-protected override void setSelectionToWidget(SeqView!(Object) v, bool reveal) {
+protected override void setSelectionToWidget(List v, bool reveal) {
 if (v is null) {
-setSelection(new ArraySeq!(Item));
+setSelection(new ArrayList(0));
 return;
 }
 int size = v.size();
-auto newSelection = new ArraySeq!(Item);
+List newSelection = new ArrayList(size);
-newSelection.capacity(size);
 for (int i = 0; i < size; ++i) {
 Object elementOrTreePath = v.get(i);
 // Use internalExpand since item may not yet be created. See
 // 1G6B1AR.
 Widget w = internalExpand(elementOrTreePath, false);
 if ( auto it = cast(Item)w ) {
-newSelection.append(it);
+newSelection.add(it);
 } else if (w is null && null !is cast(TreePath)elementOrTreePath ) {
 TreePath treePath = cast(TreePath) elementOrTreePath;
 Object element = treePath.getLastSegment();
 if (element !is null) {
 w = internalExpand(element, false);
 if ( auto it = cast(Item)w ) {
-newSelection.append(it);
+newSelection.add(it);
 }
 }
 }
 }
 setSelection(newSelection);
 *
 * @return the visible expanded elements
 * @since 2.0
 */
 public Object[] getVisibleExpandedElements() {
-auto v = new ArraySeq!(Object);
+ArrayList v = new ArrayList();
 internalCollectVisibleExpanded(v, getControl());
 return v.toArray();
 }
-private void internalCollectVisibleExpanded(ArraySeq!(Object) result, Widget widget) {
+private void internalCollectVisibleExpanded(ArrayList result, Widget widget) {
 Item[] items = getChildren(widget);
 for (int i = 0; i < items.length; i++) {
 Item item = items[i];
 if (getExpanded(item)) {
 Object data = item.getData();
 if (data !is null) {
-result.append(data);
+result.add(data);
 }
 // Only recurse if it is expanded - if
 // not then the children aren't visible
 internalCollectVisibleExpanded(result, item);
 }
 * @return {@link TreePath}
 *
 * @since 3.2
 */
 protected TreePath getTreePathFromItem(Item item) {
-auto segments = new LinkSeq!(Object);
+LinkedList segments = new LinkedList();
 while (item !is null) {
 Object segment = item.getData();
 Assert.isNotNull(segment);
-segments.prepend(segment);
+segments.addFirst(segment);
 item = getParentItem(item);
 }
 return new TreePath(segments.toArray());
 }
 package TreePath getTreePathFromItem_package(Item item) {
 Control control = getControl();
 if (control is null || control.isDisposed()) {
 return TreeSelection.EMPTY;
 }
 Widget[] items = getSelection(getControl());
-auto list = new ArraySeq!(TreePath);
+ArrayList list = new ArrayList(items.length);
-list.capacity(items.length);
 for (int i = 0; i < items.length; i++) {
 Widget item = items[i];
 if (item.getData() !is null) {
-list.append(getTreePathFromItem(cast(Item) item));
+list.add(getTreePathFromItem(cast(Item) item));
 }
 }
-return new TreeSelection( list.toArray(), getComparer());
+return new TreeSelection( arraycast!(TreePath)(list.toArray()), getComparer());
 }
 protected override void setSelectionToWidget(ISelection selection, bool reveal) {
 if ( auto treeSelection = cast(ITreeSelection)selection ) {
-auto list = new ArraySeq!(Object);
+setSelectionToWidget(Arrays.asList(treeSelection.getPaths()),
-auto paths = treeSelection.getPaths();
+reveal);
-list.capacity(paths.length);
-foreach( path; paths ){
-list.append(path);
-}
-setSelectionToWidget(list, reveal);
 } else {
 super.setSelectionToWidget(selection, reveal);
 }
 }
 * @see #setExpandedElements
 *
 * @since 3.2
 */
 public TreePath[] getExpandedTreePaths() {
-auto items = new ArraySeq!(Item);
+ArrayList items = new ArrayList();
 internalCollectExpandedItems(items, getControl());
-auto result = new ArraySeq!(TreePath);
+ArrayList result = new ArrayList(items.size());
-result.capacity(items.size());
+for (Iterator it = items.iterator(); it.hasNext();) {
-foreach( item; items ){
+Item item = cast(Item) it.next();
 TreePath treePath = getTreePathFromItem(item);
 if (treePath !is null) {
-result.append(treePath);
+result.add(treePath);
 }
 }
-return result.toArray();
+return arraycast!(TreePath)(result.toArray());
 }
 private bool isTreePathContentProvider() {
 return null !is cast(ITreePathContentProvider)getContentProvider() ;
 }

Mercurial > projects > dwt-addons

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