diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java index ad630f30084..d35781eaebe 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. + * Copyright (c) 2004, 2008 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 @@ -96,12 +96,15 @@ public class TypeInfoLabelProvider extends LabelProvider { } buf.append(qualifiedName.getFullyQualifiedName()); } - if (isSet(SHOW_PARAMETERS) && typeInfo.getCElementType() == ICElement.C_FUNCTION || typeInfo.getCElementType() == ICElement.C_MACRO) { - if (typeInfo instanceof IFunctionInfo) { - IFunctionInfo functionInfo= (IFunctionInfo)typeInfo; - String[] params= functionInfo.getParameters(); - if (params != null) { - buf.append(FunctionDeclaration.getParameterClause(params)); + if (isSet(SHOW_PARAMETERS)) { + final int elementType = typeInfo.getCElementType(); + if (elementType == ICElement.C_FUNCTION || elementType == ICElement.C_MACRO) { + if (typeInfo instanceof IFunctionInfo) { + IFunctionInfo functionInfo= (IFunctionInfo)typeInfo; + String[] params= functionInfo.getParameters(); + if (params != null) { + buf.append(FunctionDeclaration.getParameterClause(params)); + } } } } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index 05075eb9fa4..3715a2ada2c 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -214,7 +214,7 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { private static final String SETTINGS_SHOW_LOWLEVEL = "show_lowlevel"; //$NON-NLS-1$ private static final TypeInfoLabelProvider fElementRenderer = new TypeInfoLabelProvider( - TypeInfoLabelProvider.SHOW_NAME_ONLY); + TypeInfoLabelProvider.SHOW_NAME_ONLY | TypeInfoLabelProvider.SHOW_PARAMETERS); private static final TypeInfoLabelProvider fQualifierRenderer = new TypeInfoLabelProvider( TypeInfoLabelProvider.SHOW_FULLY_QUALIFIED | TypeInfoLabelProvider.SHOW_PARAMETERS |