diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/BindingCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/BindingCollector.java index 8dd61c7552d..046b4c65039 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/BindingCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/BindingCollector.java @@ -6,10 +6,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX - Initial API and implementation - * Markus Schorn (Wind River Systems) - * Andrew Ferguson (Symbian) - * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) + * QNX - Initial API and implementation + * Markus Schorn (Wind River Systems) + * Andrew Ferguson (Symbian) + * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java index ba65f98b4a2..dd13d5a6fa7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation - * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) + * Markus Schorn - initial API and implementation + * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom; @@ -29,16 +29,15 @@ import org.eclipse.core.runtime.OperationCanceledException; * @since 4.0 */ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { - private final PDOMLinkage linkage; private final char[] matchChars; private final boolean prefixLookup; private final IContentAssistMatcher contentAssistMatcher; private final boolean caseSensitive; - private IProgressMonitor monitor= null; - private int monitorCheckCounter= 0; + private IProgressMonitor monitor; + private int monitorCheckCounter; - private List nodes = new ArrayList(); + private List nodes = new ArrayList<>(); /** * Collects all nodes with given name. @@ -99,14 +98,13 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { int cmp; if (prefixLookup) { cmp= rhsName.comparePrefix(matchChars, false); - if(caseSensitive) { - cmp= cmp==0 ? rhsName.comparePrefix(matchChars, true) : cmp; + if (caseSensitive) { + cmp= cmp == 0 ? rhsName.comparePrefix(matchChars, true) : cmp; } } else { - if(caseSensitive) { + if (caseSensitive) { cmp= rhsName.compareCompatibleWithIgnoreCase(matchChars); - } - else { + } else { cmp= rhsName.compare(matchChars, false); } }