Attachment 192104 Details for Bug 327004 – Fix 2

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

[patch] Fix 2

patch2.txt (text/plain), 1.62 KB, created by Markus Keller

on 2011-03-29 11:26:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2011-03-29 11:26:53 EDT

Size: 1.62 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	29 Mar 2011 15:25:35 -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
>@@ -2616,7 +2616,13 @@
> 			CustomHashtable children = newHashtable(elementChildren.length * 2);
> 			for (int i = 0; i < elementChildren.length; i++) {
> 				Object elementChild = elementChildren[i];
>-				children.put(elementChild, elementChild);
>+				Object old = children.put(elementChild, elementChild);
>+				if (old != null) {
>+					throw new IllegalStateException("Element has multiple equal children:\n" + //$NON-NLS-1$
>+							"parent: " + parent + "\n" + //$NON-NLS-1$ //$NON-NLS-2$
>+							"child 1: " + old + "\n" + //$NON-NLS-1$ //$NON-NLS-2$
>+							"child 2: " + elementChild); //$NON-NLS-1$
>+				}
> 			}
> 			int i = 0;
> 			while (numItemsToDispose > 0 && i < items.length) {

Actions: View | Diff

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