mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 23:45:23 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2015-05-06 10:18:08 -07:00
parent 89ae641793
commit 15da05324a
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/BindingCollector.java
View file

@ -6,10 +6,10 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Andrew Ferguson (Symbian) * Andrew Ferguson (Symbian)
* Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion) * Jens Elmenthaler - http://bugs.eclipse.org/173458 (camel case completion)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.pdom.dom; package org.eclipse.cdt.internal.core.pdom.dom;

20
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java
View file

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