diff options
author | Carsten Hammer | 2019-11-16 14:45:36 +0000 |
---|---|---|
committer | Karsten Thoms | 2019-12-10 15:37:25 +0000 |
commit | c048e3fe4c50cc1d187ab84dc299ca273e2fd738 (patch) | |
tree | cbf4634a96070487b5f20352b0257053310a84cb | |
parent | bcecfe1867f24bb06167836bf3084210fb359bbf (diff) | |
download | eclipse.platform.text-c048e3fe4c50cc1d187ab84dc299ca273e2fd738.tar.gz eclipse.platform.text-c048e3fe4c50cc1d187ab84dc299ca273e2fd738.tar.xz eclipse.platform.text-c048e3fe4c50cc1d187ab84dc299ca273e2fd738.zip |
Add @Override Annotation and activate corresponding save action
Change-Id: Ib8d6b0ffb0e5a3f160bf1868e7813321ebd1846f
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
9 files changed, 47 insertions, 3 deletions
diff --git a/org.eclipse.text.quicksearch/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.text.quicksearch/.settings/org.eclipse.jdt.ui.prefs index c576259787c..eb9543bf233 100644 --- a/org.eclipse.text.quicksearch/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.text.quicksearch/.settings/org.eclipse.jdt.ui.prefs @@ -2,7 +2,7 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_annotations=true sp_cleanup.add_missing_deprecated_annotations=true sp_cleanup.add_missing_methods=false sp_cleanup.add_missing_nls_tags=false @@ -28,6 +28,7 @@ sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true sp_cleanup.on_save_use_additional_actions=true sp_cleanup.organize_imports=false +sp_cleanup.push_down_negation=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true @@ -40,6 +41,7 @@ sp_cleanup.remove_redundant_type_arguments=false sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false sp_cleanup.remove_unnecessary_casts=false sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unused_imports=false @@ -51,6 +53,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true @@ -59,3 +62,4 @@ sp_cleanup.use_this_for_non_static_field_access=false sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextQuery.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextQuery.java index eb57731cd55..c1ce3ba01f0 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextQuery.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextQuery.java @@ -36,9 +36,11 @@ public class QuickTextQuery { this.start = start; this.len = len; } + @Override public int getLength() { return len; } + @Override public int getOffset() { return start; } diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java index 9c1029b104b..5692ff146d9 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java @@ -48,6 +48,7 @@ public abstract class ResourceWalker extends Job { this.resource = r; } + @Override public int compareTo(QItem other) { return Double.compare(other.priority, this.priority); } @@ -116,6 +117,7 @@ public abstract class ResourceWalker extends Job { this.schedule(); } + @Override public IStatus run(IProgressMonitor monitor) { //TODO: progress reporting? while (!suspend && queue!=null) { diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchAction.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchAction.java index 48884c1e463..1c6e774e0b1 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchAction.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchAction.java @@ -21,16 +21,20 @@ public class QuickSearchAction implements IWorkbenchWindowActionDelegate { private IWorkbenchWindow window; + @Override public void run(IAction action) { QuickSearchHandler.doQuickSearch(window); } + @Override public void selectionChanged(IAction action, ISelection selection) { } + @Override public void dispose() { } + @Override public void init(IWorkbenchWindow window) { this.window = window; } diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchActivator.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchActivator.java index 58ff698a197..c862c05edf7 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchActivator.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchActivator.java @@ -42,6 +42,7 @@ public class QuickSearchActivator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -51,6 +52,7 @@ public class QuickSearchActivator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java index 557236cd336..6be655d52a4 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java @@ -405,6 +405,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.window.Window#create() */ + @Override public void create() { super.create(); pattern.setFocus(); @@ -471,6 +472,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { } } + @Override public void run() { //setChecked(!isChecked()); } @@ -492,6 +494,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { } } + @Override public void run() { //setChecked(!isChecked()); refreshHeaderLabel(); @@ -505,12 +508,13 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { this.progressJob.cancel(); this.progressJob = null; // this.refreshProgressMessageJob.cancel(); if (showViewHandler != null) { - IHandlerService service = (IHandlerService) PlatformUI + IHandlerService service = PlatformUI .getWorkbench().getService(IHandlerService.class); service.deactivateHandler(showViewHandler); showViewHandler.getHandler().dispose(); @@ -578,6 +582,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { headerLabel = new Label(header, SWT.NONE); headerLabel.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) { e.detail = SWT.TRAVERSE_NONE; @@ -623,6 +628,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { .setText(WorkbenchMessages.FilteredItemsSelectionDialog_listLabel); listLabel.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) { e.detail = SWT.TRAVERSE_NONE; @@ -652,6 +658,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { toolBar.setLayoutData(data); toolBar.addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { showViewMenu(); } @@ -662,6 +669,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { toolItem .setToolTipText(WorkbenchMessages.FilteredItemsSelectionDialog_menu); toolItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { showViewMenu(); } @@ -671,9 +679,10 @@ public class QuickSearchDialog extends SelectionStatusDialog { fillViewMenu(menuManager); - IHandlerService service = (IHandlerService) PlatformUI.getWorkbench() + IHandlerService service = PlatformUI.getWorkbench() .getService(IHandlerService.class); IHandler handler = new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { showViewMenu(); return null; @@ -723,6 +732,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { contextMenuManager = new MenuManager(); contextMenuManager.setRemoveAllWhenShown(true); contextMenuManager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { fillContextMenu(manager); } @@ -743,6 +753,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { Composite dialogArea = (Composite) super.createDialogArea(parent); dialogArea.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { QuickSearchDialog.this.dispose(); } @@ -758,6 +769,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { GridDataFactory.fillDefaults().grab(true, false).applyTo(inputRow); pattern = new Text(inputRow, SWT.SINGLE | SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL); pattern.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LegacyActionTools.removeMnemonics(headerLabel .getText()); @@ -787,6 +799,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { list.getTable().setLinesVisible(true); list.getTable().getAccessible().addAccessibleListener( new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { if (e.childID == ACC.CHILDID_SELF) { e.result = LegacyActionTools @@ -832,6 +845,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { }); pattern.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_DOWN) { if (list.getTable().getItemCount() > 0) { @@ -845,6 +859,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { }); list.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { StructuredSelection selection = (StructuredSelection) event .getSelection(); @@ -853,12 +868,14 @@ public class QuickSearchDialog extends SelectionStatusDialog { }); list.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { handleDoubleClick(); } }); list.getTable().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_UP && (e.stateMask & SWT.SHIFT) == 0 @@ -940,6 +957,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { details.setFont(JFaceResources.getFont(TEXT_FONT)); list.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { refreshDetails(); } @@ -1085,6 +1103,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.window.Dialog#getDialogBoundsSettings() */ + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = getDialogSettings(); IDialogSettings section = settings.getSection(DIALOG_BOUNDS_SETTINGS); @@ -1146,6 +1165,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() */ + @Override protected void computeResult() { List objectsToReturn = ((StructuredSelection) list.getSelection()) .toList(); @@ -1410,6 +1430,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return items.toArray(); } @@ -1423,6 +1444,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -1432,6 +1454,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -1440,6 +1463,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.viewers.ILazyContentProvider#updateElement(int) */ + @Override public void updateElement(int index) { QuickSearchDialog.this.list.replace((items diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchHandler.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchHandler.java index 1d906b1bc5f..9a6a8c23615 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchHandler.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchHandler.java @@ -38,6 +38,7 @@ public class QuickSearchHandler extends AbstractHandler { * the command has been executed, so extract extract the needed information * from the application context. */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); doQuickSearch(window); diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/TableResizeHelper.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/TableResizeHelper.java index 2b9f2ff7ac9..8aac29c1da9 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/TableResizeHelper.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/TableResizeHelper.java @@ -35,9 +35,11 @@ public class TableResizeHelper { public void enableResizing() { ControlListener resizeListener = new ControlListener() { + @Override public void controlResized(ControlEvent e) { resizeTable(); } + @Override public void controlMoved(ControlEvent e) { } }; diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/util/LightSchedulingRule.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/util/LightSchedulingRule.java index fa4b2af7e9f..d52ae66d3e6 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/util/LightSchedulingRule.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/util/LightSchedulingRule.java @@ -36,14 +36,17 @@ public class LightSchedulingRule implements ISchedulingRule { this.name = name; } + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } + @Override public boolean isConflicting(ISchedulingRule rule) { return rule == this || rule.contains(this); } + @Override public String toString() { return name; } |