diff options
Diffstat (limited to 'org.eclipse.search/search/org/eclipse/search/internal/ui')
10 files changed, 82 insertions, 82 deletions
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. |