View | Details | Raw Unified | Return to bug 294650 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jface/viewers/AbstractTreeViewer.java (-1 / +8 lines)
Lines 39-44 Link Here
39
import org.eclipse.swt.graphics.Point;
39
import org.eclipse.swt.graphics.Point;
40
import org.eclipse.swt.widgets.Control;
40
import org.eclipse.swt.widgets.Control;
41
import org.eclipse.swt.widgets.Item;
41
import org.eclipse.swt.widgets.Item;
42
import org.eclipse.swt.widgets.TreeItem;
42
import org.eclipse.swt.widgets.Widget;
43
import org.eclipse.swt.widgets.Widget;
43
44
44
/**
45
/**
Lines 272-277 Link Here
272
			}
273
			}
273
			createAddedElements(widget, filtered);
274
			createAddedElements(widget, filtered);
274
		}
275
		}
276
		assertElementsNotNull(parent, getChildren(widget));
275
	}
277
	}
276
278
277
	/**
279
	/**
Lines 1390-1396 Link Here
1390
				&& elements.length > 1) {
1392
				&& elements.length > 1) {
1391
			CustomHashtable elementSet = newHashtable(elements.length * 2);
1393
			CustomHashtable elementSet = newHashtable(elements.length * 2);
1392
			for (int i = 0; i < elements.length; i++) {
1394
			for (int i = 0; i < elements.length; i++) {
1393
				Object element = elements[i];
1395
				Object element;
1396
				if(elements[i] instanceof TreeItem){
1397
					element = ((TreeItem)elements[i]).getData();
1398
				}else{
1399
					element = elements[i];
1400
				}
1394
				Object old = elementSet.put(element, element);
1401
				Object old = elementSet.put(element, element);
1395
				if (old != null) {
1402
				if (old != null) {
1396
					String message = "Sibling elements in viewer must not be equal:\n  " //$NON-NLS-1$
1403
					String message = "Sibling elements in viewer must not be equal:\n  " //$NON-NLS-1$

Return to bug 294650