From ffe0ce4345a600d6ee034aff40f42eb5d099935c Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 17 Jan 2010 00:52:45 +0000 Subject: [PATCH] Fixed a typo. --- .../eclipse/cdt/internal/ui/search/PDOMSearchPage.java | 6 +++--- .../cdt/internal/ui/search/PDOMSearchQuery.java | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java index f4cbd7d11ec..38c8d406826 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java @@ -129,7 +129,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { new Integer(PDOMSearchQuery.FIND_DECLARATIONS), new Integer(PDOMSearchQuery.FIND_DEFINITIONS), new Integer(PDOMSearchQuery.FIND_REFERENCES), - new Integer(PDOMSearchQuery.FIND_ALL_OCCURANCES), + new Integer(PDOMSearchQuery.FIND_ALL_OCCURRENCES), }; // The index of FIND_ALL_OCCURANCES @@ -552,7 +552,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { IDialogSettings settings = getDialogSettings(); - int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchQuery.FIND_ALL_OCCURANCES; + int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchQuery.FIND_ALL_OCCURRENCES; try { searchFlags = settings.getInt(STORE_SEARCH_FLAGS); } catch (NumberFormatException e) { @@ -646,7 +646,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { } } - if ((searchFlags & PDOMSearchQuery.FIND_ALL_OCCURANCES) == PDOMSearchQuery.FIND_ALL_OCCURANCES) { + if ((searchFlags & PDOMSearchQuery.FIND_ALL_OCCURRENCES) == PDOMSearchQuery.FIND_ALL_OCCURRENCES) { limitToButtons[limitToAllButtonIndex].setSelection(true); for (int i = 0; i < limitToButtons.length; ++i) { if (i != limitToAllButtonIndex) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java index ca52a3dc520..35a90471f86 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java @@ -76,7 +76,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery { public static final int FIND_DEFINITIONS = IIndex.FIND_DEFINITIONS; public static final int FIND_REFERENCES = IIndex.FIND_REFERENCES; public static final int FIND_DECLARATIONS_DEFINITIONS = FIND_DECLARATIONS | FIND_DEFINITIONS; - public static final int FIND_ALL_OCCURANCES = FIND_DECLARATIONS | FIND_DEFINITIONS | FIND_REFERENCES; + public static final int FIND_ALL_OCCURRENCES = FIND_DECLARATIONS | FIND_DEFINITIONS | FIND_REFERENCES; protected final static int LABEL_FLAGS= CElementBaseLabels.M_PARAMETER_TYPES | @@ -135,7 +135,6 @@ public abstract class PDOMSearchQuery implements ISearchQuery { return defaultLabel; } - public String getLabel() { String type; if ((flags & FIND_REFERENCES) != 0) @@ -152,8 +151,8 @@ public abstract class PDOMSearchQuery implements ISearchQuery { public String getResultLabel(String pattern, int matchCount) { // Report pattern and number of matches String label; - final int kindFlags= flags & FIND_ALL_OCCURANCES; - switch(kindFlags) { + final int kindFlags= flags & FIND_ALL_OCCURRENCES; + switch (kindFlags) { case FIND_REFERENCES: label = NLS.bind(CSearchMessages.PDOMSearchQuery_refs_result_label, pattern); break; @@ -431,8 +430,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery { } try { return runWithIndex(index, monitor); - } - finally { + } finally { index.releaseReadLock(); } } catch (CoreException e) {