Attachment 192171 Details for Bug 327004 – Improved fix

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

[patch] Improved fix

patch.txt (text/plain), 1.96 KB, created by Dani Megert

on 2011-03-30 06:02:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2011-03-30 06:02:40 EDT

Size: 1.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/viewers/AbstractTreeViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java,v
>retrieving revision 1.151
>diff -u -r1.151 AbstractTreeViewer.java
>--- src/org/eclipse/jface/viewers/AbstractTreeViewer.java	5 Jul 2010 09:21:10 -0000	1.151
>+++ src/org/eclipse/jface/viewers/AbstractTreeViewer.java	30 Mar 2011 10:01:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -23,9 +23,6 @@
> import java.util.LinkedList;
> import java.util.List;
> 
>-import org.eclipse.core.runtime.Assert;
>-import org.eclipse.core.runtime.ListenerList;
>-import org.eclipse.jface.util.SafeRunnable;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.BusyIndicator;
> import org.eclipse.swt.events.SelectionEvent;
>@@ -37,6 +34,11 @@
> import org.eclipse.swt.widgets.Item;
> import org.eclipse.swt.widgets.Widget;
> 
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.core.runtime.ListenerList;
>+
>+import org.eclipse.jface.util.SafeRunnable;
>+
> /**
>  * Abstract base implementation for tree-structure-oriented viewers (trees and
>  * table trees).
>@@ -2621,7 +2623,7 @@
> 			int i = 0;
> 			while (numItemsToDispose > 0 && i < items.length) {
> 				Object data = items[i].getData();
>-				if (data == null || items.length - i <= numItemsToDispose || !children.containsKey(data)) {
>+				if (data == null || !children.containsKey(data)) {
> 					if (data != null) {
> 						disassociate(items[i]);
> 					}

Actions: View | Diff

Attachments on bug 327004: 192088 | 192104 | 192171 | 192180