Attachment #62287 for bug #154571

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.





	/* (non-Javadoc) Method declared on StructuredViewer. */
	protected void internalRefresh(Object element, boolean updateLabels) {
		if (isBusy())
		if (element == null) {
			internalRefresh(getControl(), getRoot(), true, updateLabels);
			return;
		busy = true;
		try {
			// If element is null, do a full refresh.
			if (element == null) {
				internalRefresh(getControl(), getRoot(), true, updateLabels);
				return;
			}
			Widget[] items = findItems(element);
			if (items.length != 0) {
				for (int i = 0; i < items.length; i++) {
					// pick up structure changes too
					internalRefresh(items[i], element, true, updateLabels);
				}
			}
		} finally {
			busy = false;
		}
	}





						IContentProvider contentProvider = getContentProvider();
						// If we are building lazily then request lookup now
						if (contentProvider instanceof ILazyContentProvider) {
							boolean oldBusy = busy;
							busy = false;
							try {
								((ILazyContentProvider) contentProvider)
										.updateElement(index);
							} finally {
								busy = oldBusy;
							}
							return;
						}
					}

		List result = new ArrayList();
		int[] selectionIndices = doGetSelectionIndices();
		if (getContentProvider() instanceof ILazyContentProvider) {
			boolean oldBusy = busy;
			busy = false;
			try {
				ILazyContentProvider lazy = (ILazyContentProvider) getContentProvider();
				for (int i = 0; i < selectionIndices.length; i++) {
					int selectionIndex = selectionIndices[i];
					lazy.updateElement(selectionIndex);// Start the update
					Object element = doGetItem(selectionIndex).getData();
					// Only add the element if it got updated.
					// If this is done deferred the selection will
					// be incomplete until selection is finished.
					if (element != null) {
						result.add(element);
					}
				}
			} finally {
				busy = oldBusy;
			}
		} else {
			for (int i = 0; i < selectionIndices.length; i++) {

	 *      boolean)
	 */
	protected void internalRefresh(Object element, boolean updateLabels) {
		if (isBusy())
			return;
		busy = true;
		try {
			applyEditorValue();
			if (element == null || equals(element, getRoot())) {
				if (virtualManager == null) {
					internalRefreshAll(updateLabels);
				} else {
					internalVirtualRefreshAll();
				}
			} else {
				Widget w = findItem(element);
				if (w != null) {
					updateItem(w, element);
				}
			if (w != null) {
				updateItem(w, element);
			}
		} finally {
			busy = false;
		}
	}





		return false;
	}
	
	public void refresh(Object element) {
		if (isBusy())
			return;
		busy = true;
		try {
			super.refresh(element);
		} finally {
			busy = false;
		}
	}
	
	public void refresh(Object element, boolean updateLabels) {
		if (isBusy())
			return;
		busy = true;
		try {
			super.refresh(element, updateLabels);
		} finally {
			busy = false;
		}
	}
	
	public void update(Object element, String[] properties) {
		if (isBusy())
			return;

Return to bug 154571

Lines 1720-1736 Link Here

(-)src/org/eclipse/jface/viewers/AbstractTreeViewer.java (-9 / +16 lines)
1720		1720
1721	/* (non-Javadoc) Method declared on StructuredViewer. */	1721	/* (non-Javadoc) Method declared on StructuredViewer. */
1722	protected void internalRefresh(Object element, boolean updateLabels) {	1722	protected void internalRefresh(Object element, boolean updateLabels) {
1723	// If element is null, do a full refresh.	1723	if (isBusy())
1724	if (element == null) {
1725	internalRefresh(getControl(), getRoot(), true, updateLabels);
1726	return;	1724	return;
1727	}	1725	busy = true;
1728	Widget[] items = findItems(element);	1726	try {
1729	if (items.length != 0) {	1727	// If element is null, do a full refresh.
1730	for (int i = 0; i < items.length; i++) {	1728	if (element == null) {
1731	// pick up structure changes too	1729	internalRefresh(getControl(), getRoot(), true, updateLabels);
1732	internalRefresh(items[i], element, true, updateLabels);	1730	return;
1733	}	1731	}
		1732	Widget[] items = findItems(element);
		1733	if (items.length != 0) {
		1734	for (int i = 0; i < items.length; i++) {
		1735	// pick up structure changes too
		1736	internalRefresh(items[i], element, true, updateLabels);
		1737	}
		1738	}
		1739	} finally {
		1740	busy = false;
1734	}	1741	}
1735	}	1742	}
1736		1743

Lines 73-80 Link Here

(-)src/org/eclipse/jface/viewers/AbstractTableViewer.java (-22 / +41 lines)
73	IContentProvider contentProvider = getContentProvider();	73	IContentProvider contentProvider = getContentProvider();
74	// If we are building lazily then request lookup now	74	// If we are building lazily then request lookup now
75	if (contentProvider instanceof ILazyContentProvider) {	75	if (contentProvider instanceof ILazyContentProvider) {
76	((ILazyContentProvider) contentProvider)	76	boolean oldBusy = busy;
77	.updateElement(index);	77	busy = false;
		78	try {
		79	((ILazyContentProvider) contentProvider)
		80	.updateElement(index);
		81	} finally {
		82	busy = oldBusy;
		83	}
78	return;	84	return;
79	}	85	}
80	}	86	}
Lines 468-484 Link Here
468	List result = new ArrayList();	474	List result = new ArrayList();
469	int[] selectionIndices = doGetSelectionIndices();	475	int[] selectionIndices = doGetSelectionIndices();
470	if (getContentProvider() instanceof ILazyContentProvider) {	476	if (getContentProvider() instanceof ILazyContentProvider) {
471	ILazyContentProvider lazy = (ILazyContentProvider) getContentProvider();	477	boolean oldBusy = busy;
472	for (int i = 0; i < selectionIndices.length; i++) {	478	busy = false;
473	int selectionIndex = selectionIndices[i];	479	try {
474	lazy.updateElement(selectionIndex);// Start the update	480	ILazyContentProvider lazy = (ILazyContentProvider) getContentProvider();
475	Object element = doGetItem(selectionIndex).getData();	481	for (int i = 0; i < selectionIndices.length; i++) {
476	// Only add the element if it got updated.	482	int selectionIndex = selectionIndices[i];
477	// If this is done deferred the selection will	483	lazy.updateElement(selectionIndex);// Start the update
478	// be incomplete until selection is finished.	484	Object element = doGetItem(selectionIndex).getData();
479	if (element != null) {	485	// Only add the element if it got updated.
480	result.add(element);	486	// If this is done deferred the selection will
		487	// be incomplete until selection is finished.
		488	if (element != null) {
		489	result.add(element);
		490	}
481	}	491	}
		492	} finally {
		493	busy = oldBusy;
482	}	494	}
483	} else {	495	} else {
484	for (int i = 0; i < selectionIndices.length; i++) {	496	for (int i = 0; i < selectionIndices.length; i++) {
Lines 609-626 Link Here
609	* boolean)	621	* boolean)
610	*/	622	*/
611	protected void internalRefresh(Object element, boolean updateLabels) {	623	protected void internalRefresh(Object element, boolean updateLabels) {
612	applyEditorValue();	624	if (isBusy())
613	if (element == null \|\| equals(element, getRoot())) {	625	return;
614	if (virtualManager == null) {	626	busy = true;
615	internalRefreshAll(updateLabels);	627	try {
		628	applyEditorValue();
		629	if (element == null \|\| equals(element, getRoot())) {
		630	if (virtualManager == null) {
		631	internalRefreshAll(updateLabels);
		632	} else {
		633	internalVirtualRefreshAll();
		634	}
616	} else {	635	} else {
617	internalVirtualRefreshAll();	636	Widget w = findItem(element);
618	}	637	if (w != null) {
619	} else {	638	updateItem(w, element);
620	Widget w = findItem(element);	639	}
621	if (w != null) {
622	updateItem(w, element);
623	}	640	}
		641	} finally {
		642	busy = false;
624	}	643	}
625	}	644	}
626		645

Lines 475-502 Link Here

(-)src/org/eclipse/jface/viewers/ColumnViewer.java (-22 lines)
475	return false;	475	return false;
476	}	476	}
477		477
478	public void refresh(Object element) {
479	if (isBusy())
480	return;
481	busy = true;
482	try {
483	super.refresh(element);
484	} finally {
485	busy = false;
486	}
487	}
488
489	public void refresh(Object element, boolean updateLabels) {
490	if (isBusy())
491	return;
492	busy = true;
493	try {
494	super.refresh(element, updateLabels);
495	} finally {
496	busy = false;
497	}
498	}
499
500	public void update(Object element, String[] properties) {	478	public void update(Object element, String[] properties) {
501	if (isBusy())	479	if (isBusy())
502	return;	480	return;