Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2002-05-31 10:52:34 +0000
committerDani Megert2002-05-31 10:52:34 +0000
commit8596b5051d542912a0ffe1dc850bffbd4f3df0e3 (patch)
tree5014b622ab3e1a03de29fdfc60def991b577c062
parentd2b2aae0076b45b2133280728cf174ea26a5c98b (diff)
downloadeclipse.platform.text-8596b5051d542912a0ffe1dc850bffbd4f3df0e3.tar.gz
eclipse.platform.text-8596b5051d542912a0ffe1dc850bffbd4f3df0e3.tar.xz
eclipse.platform.text-8596b5051d542912a0ffe1dc850bffbd4f3df0e3.zip
Fixed 18134 (next/previous accelerators)v20020531
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties4
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java22
2 files changed, 15 insertions, 11 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
index a87811c8594..f0139ffc6a9 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
@@ -37,9 +37,9 @@ SearchResultView.removeMatch.tooltip= Remove Match
SearchResultView.gotoMarker.text= &Go to File
SearchResultView.gotoMarker.tooltip= Go to File
SearchResultView.showNext.text= Next
-SearchResultView.showNext.tooltip= Show Next Match Ctrl+E
+SearchResultView.showNext.tooltip= Show Next Match
SearchResultView.showPrev.text= Previous
-SearchResultView.showPrev.tooltip= Show Previous Match Ctrl+Shift+E
+SearchResultView.showPrev.tooltip= Show Previous Match
SearchDialogClosingDialog.title= Search Dialog Closing
SearchDialogClosingDialog.message= Dialog can not be closed due to an active operation. You must cancel the operation before you can close the dialog.
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
index bda034e40f8..f42d6e2659b 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
@@ -37,6 +37,7 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.actions.ActionGroup;
@@ -71,6 +72,7 @@ public class SearchResultViewer extends TableViewer {
private CopyToClipboardAction fCopyToClipboardAction;
private int fMarkerToShow;
private boolean fHandleSelectionChangedEvents= true;
+ private ISelection fLastSelection;
private boolean fCurrentMatchRemoved= false;
private Color fPotentialMatchFgColor;
private ActionGroup fActionGroup;
@@ -120,7 +122,10 @@ public class SearchResultViewer extends TableViewer {
addSelectionChangedListener(
new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
- handleSelectionChanged();
+ if (fLastSelection == null || !fLastSelection.equals(event.getSelection())) {
+ fLastSelection= event.getSelection();
+ handleSelectionChanged();
+ }
}
}
);
@@ -145,6 +150,11 @@ public class SearchResultViewer extends TableViewer {
// Register menu
fOuterPart.getSite().registerContextMenu(menuMgr, this);
+
+ IActionBars actionBars= fOuterPart.getViewSite().getActionBars();
+ if (actionBars != null)
+ actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fShowNextResultAction);
+ actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fShowPreviousResultAction);
}
/**
@@ -218,6 +228,7 @@ public class SearchResultViewer extends TableViewer {
protected void inputChanged(Object input, Object oldInput) {
+ fLastSelection= null;
getTable().removeAll();
super.inputChanged(input, oldInput);
fMarkerToShow= -1;
@@ -341,14 +352,6 @@ public class SearchResultViewer extends TableViewer {
new RemoveResultAction(SearchResultViewer.this).run();
return; // performance
}
- if (e.stateMask == SWT.CTRL && e.character == 'E'-0x40) {
- showNextResult();
- return; // performance
- }
- if (e.stateMask == (SWT.CTRL | SWT.SHIFT) && e.character == 'E'-0x40) {
- showPreviousResult();
- return; // performance
- }
}
});
}
@@ -525,6 +528,7 @@ public class SearchResultViewer extends TableViewer {
protected void handleDispose(DisposeEvent event) {
+ fLastSelection= null;
Menu menu= getTable().getMenu();
if (menu != null)
menu.dispose();

Back to the top