mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-14 20:45:22 +02:00
[232106] NPE when hovering near "User Actions" on System View Context Menu
https://bugs.eclipse.org/bugs/show_bug.cgi?id=232106
This commit is contained in:
parent
753f09c04b
commit
771470a2e2
1 changed files with 6 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
||||||
package org.eclipse.rse.internal.useractions.ui.uda;
|
package org.eclipse.rse.internal.useractions.ui.uda;
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2002, 2007 IBM Corporation and others.
|
* Copyright (c) 2002, 2008 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -9,6 +9,7 @@ package org.eclipse.rse.internal.useractions.ui.uda;
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* IBM Corporation - initial API and implementation
|
* IBM Corporation - initial API and implementation
|
||||||
|
* David Dykstal (IBM) - [232106] - NPE when resolving types
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
|
@ -73,7 +74,10 @@ public class SystemUDAResolvedTypes {
|
||||||
SystemUDTypeElement typeElem = (SystemUDTypeElement) objElems[i];
|
SystemUDTypeElement typeElem = (SystemUDTypeElement) objElems[i];
|
||||||
if (type.equals(typeElem.toString())) {
|
if (type.equals(typeElem.toString())) {
|
||||||
previousTypes.addElement(type);
|
previousTypes.addElement(type);
|
||||||
resolvedTypes = resolveTypes(typeElem.getTypes(), v, objElems);
|
String types = typeElem.getTypes();
|
||||||
|
if (types != null) {
|
||||||
|
resolvedTypes = resolveTypes(types, v, objElems);
|
||||||
|
}
|
||||||
previousTypes.remove(type);
|
previousTypes.remove(type);
|
||||||
v.addElement(new SystemUDAFileTypesForName(type, resolvedTypes));
|
v.addElement(new SystemUDAFileTypesForName(type, resolvedTypes));
|
||||||
return resolvedTypes;
|
return resolvedTypes;
|
||||||
|
|
Loading…
Add table
Reference in a new issue