diff options
Diffstat (limited to 'org.eclipse.search/search/org/eclipse/search')
14 files changed, 169 insertions, 169 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java index ec48bda03be..28cd5899a74 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java @@ -136,7 +136,7 @@ public class FileNamePatternSearchScope extends TextSearchScope { * @return returns true if the file name is matching to a file name pattern */ private boolean matchesFileName(String fileName) { - return getFileNameMatcher().reset(fileName).matches(); + return getFileNameMatcher().reset(fileName).matches(); } /** diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java index 5210d2505e5..f4b1a8b22a1 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java @@ -156,9 +156,9 @@ public class PatternConstructor { } - private static boolean isWordChar(char c) { - return Character.isLetterOrDigit(c); - } + private static boolean isWordChar(char c) { + return Character.isLetterOrDigit(c); + } /** * Creates a pattern element from an array of patterns in the old 'StringMatcher' format. @@ -172,8 +172,8 @@ public class PatternConstructor { StringBuilder pattern= new StringBuilder(); for (int i= 0; i < patterns.length; i++) { if (i > 0) { - // note that this works only as we know that the operands of the - // or expression will be simple and need no brackets. + // note that this works only as we know that the operands of the + // or expression will be simple and need no brackets. pattern.append('|'); } appendAsRegEx(true, patterns[i], pattern); @@ -183,75 +183,75 @@ public class PatternConstructor { public static StringBuilder appendAsRegEx(boolean isStringMatcher, String pattern, StringBuilder buffer) { - boolean isEscaped= false; - for (int i = 0; i < pattern.length(); i++) { - char c = pattern.charAt(i); - switch(c) { - // the backslash - case '\\': - // the backslash is escape char in string matcher - if (isStringMatcher && !isEscaped) { - isEscaped= true; - } - else { - buffer.append("\\\\"); //$NON-NLS-1$ - isEscaped= false; - } - break; - // characters that need to be escaped in the regex. - case '(': - case ')': - case '{': - case '}': - case '.': - case '[': - case ']': - case '$': - case '^': - case '+': - case '|': - if (isEscaped) { - buffer.append("\\\\"); //$NON-NLS-1$ - isEscaped= false; - } - buffer.append('\\'); - buffer.append(c); - break; - case '?': - if (isStringMatcher && !isEscaped) { - buffer.append('.'); - } - else { - buffer.append('\\'); - buffer.append(c); - isEscaped= false; - } - break; - case '*': - if (isStringMatcher && !isEscaped) { - buffer.append(".*"); //$NON-NLS-1$ - } - else { - buffer.append('\\'); - buffer.append(c); - isEscaped= false; - } - break; - default: - if (isEscaped) { - buffer.append("\\\\"); //$NON-NLS-1$ - isEscaped= false; - } - buffer.append(c); - break; - } - } - if (isEscaped) { - buffer.append("\\\\"); //$NON-NLS-1$ - isEscaped= false; - } - return buffer; - } + boolean isEscaped= false; + for (int i = 0; i < pattern.length(); i++) { + char c = pattern.charAt(i); + switch(c) { + // the backslash + case '\\': + // the backslash is escape char in string matcher + if (isStringMatcher && !isEscaped) { + isEscaped= true; + } + else { + buffer.append("\\\\"); //$NON-NLS-1$ + isEscaped= false; + } + break; + // characters that need to be escaped in the regex. + case '(': + case ')': + case '{': + case '}': + case '.': + case '[': + case ']': + case '$': + case '^': + case '+': + case '|': + if (isEscaped) { + buffer.append("\\\\"); //$NON-NLS-1$ + isEscaped= false; + } + buffer.append('\\'); + buffer.append(c); + break; + case '?': + if (isStringMatcher && !isEscaped) { + buffer.append('.'); + } + else { + buffer.append('\\'); + buffer.append(c); + isEscaped= false; + } + break; + case '*': + if (isStringMatcher && !isEscaped) { + buffer.append(".*"); //$NON-NLS-1$ + } + else { + buffer.append('\\'); + buffer.append(c); + isEscaped= false; + } + break; + default: + if (isEscaped) { + buffer.append("\\\\"); //$NON-NLS-1$ + isEscaped= false; + } + buffer.append(c); + break; + } + } + if (isEscaped) { + buffer.append("\\\\"); //$NON-NLS-1$ + isEscaped= false; + } + return buffer; + } /** * Interprets escaped characters in the given replace pattern. diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java index d7cb7cca8fe..d54ca7c8626 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java @@ -434,7 +434,7 @@ public class TextSearchVisitor { System.out.println(Messages.format( "[TextSearch] Search duration for {0} files in {1} jobs using {2} threads: {3}ms", args)); //$NON-NLS-1$ } - } + } } public IStatus search(TextSearchScope scope, IProgressMonitor monitor) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index 4af679f816e..316279d2eca 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -385,7 +385,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon ArrayList<SearchPageDescriptor> filteredList= new ArrayList<>(input.size()); for (SearchPageDescriptor descriptor : input) { if (!WorkbenchActivityHelper.filterItem(descriptor)) - filteredList.add(descriptor); + filteredList.add(descriptor); } return filteredList; @@ -431,7 +431,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon for (int i= 0; i < numPages; i++) { SearchPageDescriptor descriptor= getDescriptorAt(i); if (WorkbenchActivityHelper.filterItem(descriptor)) - continue; + continue; final CTabItem item = new CTabItem(folder, SWT.NONE); item.setData("descriptor", descriptor); //$NON-NLS-1$ @@ -480,9 +480,9 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // create help control if needed - if (isHelpAvailable()) { - createHelpControl(composite); - } + if (isHelpAvailable()) { + createHelpControl(composite); + } fCustomizeButton= createButton(composite, CUSTOMIZE_ID, SearchMessages.SearchDialog_customize, true); Label filler= new Label(composite, SWT.NONE); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java index 128325ba81f..090407b3325 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java @@ -216,7 +216,7 @@ public final class SearchMessages extends NLS { } // public static String ReplaceDialog2_nomatches_error; - public static String SearchPreferencePage_textSearchEngine; + public static String SearchPreferencePage_textSearchEngine; public static String TextSearchEngineRegistry_defaulttextsearch_label; public static String FileSearchQuery_singularPatternWithFileExt; public static String FileSearchQuery_pluralPatternWithFileExt; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java index 372c4dedeb5..e9ced17ae76 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java @@ -192,15 +192,15 @@ class SearchPageDescriptor implements IPluginContribution, Comparable<SearchPage if (sizeHint != null) { int commaSep= sizeHint.indexOf(','); if (commaSep != -1) { - try { - int xval= Integer.parseInt(sizeHint.substring(0, commaSep).trim()); - int yval= Integer.parseInt(sizeHint.substring(commaSep + 1).trim()); - return new Point(xval, yval); - } catch (NumberFormatException e) { - } + try { + int xval= Integer.parseInt(sizeHint.substring(0, commaSep).trim()); + int yval= Integer.parseInt(sizeHint.substring(commaSep + 1).trim()); + return new Point(xval, yval); + } catch (NumberFormatException e) { + } } } - return UNKNOWN_SIZE; + return UNKNOWN_SIZE; } /** @@ -367,13 +367,13 @@ class SearchPageDescriptor implements IPluginContribution, Comparable<SearchPage } } - @Override + @Override public String getLocalId() { - return getId(); - } + return getId(); + } - @Override + @Override public String getPluginId() { - return fElement.getContributor().getName(); - } + return fElement.getContributor().getName(); + } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java index 62feefb89dc..d5860f28bec 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java @@ -302,19 +302,19 @@ public class SearchPlugin extends AbstractUIPlugin { } - public TextSearchEngineRegistry getTextSearchEngineRegistry() { - if (fTextSearchEngineRegistry == null) { - fTextSearchEngineRegistry= new TextSearchEngineRegistry(); - } - return fTextSearchEngineRegistry; - } - - public TextSearchQueryProviderRegistry getTextSearchQueryProviderRegistry() { - if (fTextSearchQueryProviderRegistry == null) { - fTextSearchQueryProviderRegistry= new TextSearchQueryProviderRegistry(); - } - return fTextSearchQueryProviderRegistry; - } + public TextSearchEngineRegistry getTextSearchEngineRegistry() { + if (fTextSearchEngineRegistry == null) { + fTextSearchEngineRegistry= new TextSearchEngineRegistry(); + } + return fTextSearchEngineRegistry; + } + + public TextSearchQueryProviderRegistry getTextSearchQueryProviderRegistry() { + if (fTextSearchQueryProviderRegistry == null) { + fTextSearchQueryProviderRegistry= new TextSearchQueryProviderRegistry(); + } + return fTextSearchQueryProviderRegistry; + } /** * Creates all necessary sorter description nodes. diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java index 331f9c81a93..7e868698d10 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java @@ -53,8 +53,8 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I public static final String DEFAULT_PERSPECTIVE= "org.eclipse.search.defaultPerspective"; //$NON-NLS-1$ private static final String NO_DEFAULT_PERSPECTIVE= "org.eclipse.search.defaultPerspective.none"; //$NON-NLS-1$ public static final String BRING_VIEW_TO_FRONT= "org.eclipse.search.bringToFront"; //$NON-NLS-1$ - public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$ - public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$ + public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$ + public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$ public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$ private ColorFieldEditor fColorEditor; @@ -119,7 +119,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I POTENTIAL_MATCH_FG_COLOR, SearchMessages.SearchPreferencePage_potentialMatchFgColor, getFieldEditorParent() - ); + ); addField(fColorEditor); fEmphasizedCheckbox.setEnabled(!arePotentialMatchesIgnored(), getFieldEditorParent()); @@ -134,17 +134,17 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I getFieldEditorParent()); addField(comboEditor); - // in case we have a contributed engine, let the user choose. - TextSearchEngineRegistry reg= SearchPlugin.getDefault().getTextSearchEngineRegistry(); - String[][] engineNamesAndIds= reg.getAvailableEngines(); - if (engineNamesAndIds.length > 1) { - comboEditor= new ComboFieldEditor( - TEXT_SEARCH_ENGINE, - SearchMessages.SearchPreferencePage_textSearchEngine, - engineNamesAndIds, - getFieldEditorParent()); - addField(comboEditor); - } + // in case we have a contributed engine, let the user choose. + TextSearchEngineRegistry reg= SearchPlugin.getDefault().getTextSearchEngineRegistry(); + String[][] engineNamesAndIds= reg.getAvailableEngines(); + if (engineNamesAndIds.length > 1) { + comboEditor= new ComboFieldEditor( + TEXT_SEARCH_ENGINE, + SearchMessages.SearchPreferencePage_textSearchEngine, + engineNamesAndIds, + getFieldEditorParent()); + addField(comboEditor); + } } @Override diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java index 32a76bcdb88..6d843df2483 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java @@ -132,10 +132,10 @@ class SortDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } - @Override + @Override public void run() { // nothing to do - } + } private SorterDescriptor findSorter(String pageId) { Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index 8a64d62fc1e..b396c04c4bf 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -90,30 +90,30 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt return 2; } - @Override + @Override public int compare(Viewer viewer, Object e1, Object e2) { - int cat1 = category(e1); - int cat2 = category(e2); + int cat1 = category(e1); + int cat2 = category(e2); - if (cat1 != cat2) { + if (cat1 != cat2) { return cat1 - cat2; } - if (e1 instanceof LineElement && e2 instanceof LineElement) { + if (e1 instanceof LineElement && e2 instanceof LineElement) { LineElement m1= (LineElement) e1; LineElement m2= (LineElement) e2; - return m1.getOffset() - m2.getOffset(); - } - - String name1= fLabelProvider.getText(e1); - String name2= fLabelProvider.getText(e2); - if (name1 == null) - name1 = "";//$NON-NLS-1$ - if (name2 == null) - name2 = "";//$NON-NLS-1$ + return m1.getOffset() - m2.getOffset(); + } + + String name1= fLabelProvider.getText(e1); + String name2= fLabelProvider.getText(e2); + if (name1 == null) + name1 = "";//$NON-NLS-1$ + if (name2 == null) + name2 = "";//$NON-NLS-1$ int result= getComparator().compare(name1, name2); return result; - } + } } private static final String KEY_SORTING= "org.eclipse.search.resultpage.sorting"; //$NON-NLS-1$ diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java index 07a7d597cbd..803577488a6 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java @@ -63,12 +63,12 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { public ReplaceConfigurationPage(ReplaceRefactoring refactoring) { super("ReplaceConfigurationPage"); //$NON-NLS-1$ fReplaceRefactoring= refactoring; - } + } - @Override + @Override public void createControl(Composite parent) { - Composite result= new Composite(parent, SWT.NONE); - GridLayout layout= new GridLayout(2, false); + Composite result= new Composite(parent, SWT.NONE); + GridLayout layout= new GridLayout(2, false); result.setLayout(layout); Label description= new Label(result, SWT.NONE); @@ -153,7 +153,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { Dialog.applyDialogFont(result); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ISearchHelpContextIds.REPLACE_DIALOG); - } + } final void updateOKStatus() { RefactoringStatus status= new RefactoringStatus(); @@ -176,7 +176,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { fTextFieldContentAssist.setEnabled(enable); } - @Override + @Override protected boolean performFinish() { initializeRefactoring(); storeSettings(); @@ -204,10 +204,10 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_GROUP); settings.put(SETTINGS_REPLACE_WITH, history.toArray(new String[history.size()])); - } + } private void initializeRefactoring() { fReplaceRefactoring.setReplaceString(fTextField.getText()); - } + } }
\ No newline at end of file diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java index 6c7648f2b32..e07c3653509 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java @@ -476,15 +476,15 @@ public class ReplaceRefactoring extends Refactoring { replacementText= PatternConstructor.interpretReplaceEscapes(replacementText, originalText, lineDelimiter); Matcher matcher= pattern.matcher(originalText); - StringBuffer sb = new StringBuffer(); - matcher.reset(); - if (matcher.find()) { - matcher.appendReplacement(sb, replacementText); - } else { - return null; - } - matcher.appendTail(sb); - return sb.toString(); + StringBuffer sb = new StringBuffer(); + matcher.reset(); + if (matcher.find()) { + matcher.appendReplacement(sb, replacementText); + } else { + return null; + } + matcher.appendTail(sb); + return sb.toString(); } catch (IndexOutOfBoundsException ex) { throw new PatternSyntaxException(ex.getLocalizedMessage(), replacementText, -1); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java index 09ce30ad928..75bb63ea705 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java @@ -279,7 +279,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP ErrorDialog.openError(getShell(), SearchMessages.TextSearchPage_replace_searchproblems_title, SearchMessages.TextSearchPage_replace_searchproblems_message, e.getStatus()); return false; } - return true; + return true; } @Override @@ -741,7 +741,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP }); fSearchBinaryCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 1, 1)); fSearchBinaryCheckbox.setFont(searchInGroup.getFont()); - } + } /** * Sets the search page's container. diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java index 19696cbc6d0..180084c81ab 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java @@ -53,26 +53,26 @@ public interface ISearchResultView extends IViewPart { * If every match should show up in the search result view then the match * itself can be used as key. * - * @param groupFactory the action group factory - * or <code>null</code> if no factory is provided. - * @param singularLabel the label to be used for this search occurrence - * if there is one match + * @param groupFactory the action group factory + * or <code>null</code> if no factory is provided. + * @param singularLabel the label to be used for this search occurrence + * if there is one match * or <code>null</code> if the pluralLabelPattern should be used - * @param pluralLabelPattern the label pattern to be used for this search occurrence - * if there are more than one matches or none. - * This string may contain {0} which will be replace by the match count - * @param imageDescriptor the image descriptor to be used for this search occurrence, + * @param pluralLabelPattern the label pattern to be used for this search occurrence + * if there are more than one matches or none. + * This string may contain {0} which will be replace by the match count + * @param imageDescriptor the image descriptor to be used for this search occurrence, * or <code>null</code> if this search should not have an image * @param pageId the id of the search page which started the search * @param labelProvider the label provider used by this search result view - * or <code>null</code> if the default provider should be used. + * or <code>null</code> if the default provider should be used. * The default label provider shows the resource name and the corresponding image. * @param gotoAction the action used by the view to go to a marker * @param groupByKeyComputer the computer used by the view to compute the key for a marker * @param operation the runnable used by the view to repeat the search * * @see IActionGroupFactory - * @since 2.0 + * @since 2.0 */ public void searchStarted( IActionGroupFactory groupFactory, @@ -200,7 +200,7 @@ public interface ISearchResultView extends IViewPart { * * @param description the text description of the match * @param groupByKey the <code>Object</code> by which this match is grouped - * @param marker the marker for this match + * @param marker the marker for this match * @param resource the marker's resource passed for optimization */ public void addMatch(String description, Object groupByKey, IResource resource, IMarker marker); |