Show match when copying to clipboard
diff --git a/org.eclipse.search/plugin.properties b/org.eclipse.search/plugin.properties
index 43f5fc8..8f22a3f 100644
--- a/org.eclipse.search/plugin.properties
+++ b/org.eclipse.search/plugin.properties
@@ -21,6 +21,3 @@
ResourcenameSorter.tooltip = Sort by Resource Name
ResourcePathSorter.label = &Path
ResourcePathSorter.tooltip = Sort by Resource Path
-
-CopyToClipboardAction.label = Copy to Clip&board
-CopyToClipboardAction.tooltip = Copy to Clipboard
diff --git a/org.eclipse.search/plugin.xml b/org.eclipse.search/plugin.xml
index 511e804..2f2f0cb 100644
--- a/org.eclipse.search/plugin.xml
+++ b/org.eclipse.search/plugin.xml
@@ -70,20 +70,6 @@
</view>
</extension>
-<extension point="org.eclipse.ui.popupMenus">
- <viewerContribution
- id="org.eclipse.search.CopyToClipboardActionContribution"
- targetID="org.eclipse.search.SearchResultView">
- <action id="org.eclipse.search.CopyToClipboardAction"
- menubarPath="additions"
- label="%CopyToClipboardAction.label"
- tooltip="%CopyToClipboardAction.tooltip"
- class="org.eclipse.search.internal.ui.CopyToClipboardActionDelegate"
- enablesFor="+">
- </action>
- </viewerContribution>
-</extension>
-
<extension point="org.eclipse.search.searchPages">
<page
id="org.eclipse.search.internal.ui.text.TextSearchPage"
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java
new file mode 100644
index 0000000..a4b7c28
--- /dev/null
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java
Binary files differ
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardActionDelegate.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardActionDelegate.java
deleted file mode 100644
index 54ea7c8..0000000
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardActionDelegate.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
index a563171..84209ed 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
@@ -229,7 +229,7 @@
} else {
// test if selected working set has been removed
if (!Arrays.asList(WorkingSet.getWorkingSets()).contains(fWorkingSet)) {
- fWorkingSetText.setText("");
+ fWorkingSetText.setText(""); //$NON-NLS-1$
fWorkingSet= null;
}
}
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 bedf6b7..b4e4044 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
@@ -130,3 +130,6 @@
ScopePart.workingSetChooseButton.text=C&hoose...
ScopePart.workingSetScope.text=Wor&king Set
ScopePart.workspaceScope.text=&Workspace
+
+CopyToClipboardAction.label = Copy to Clip&board
+CopyToClipboardAction.tooltip = Copy to Clipboard
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 b217049..a1fd8ba 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
@@ -59,6 +59,7 @@
private RemoveMatchAction fRemoveMatchAction;
private SortDropDownAction fSortDropDownAction;
private SearchDropDownAction fSearchDropDownAction;
+ private CopyToClipboardAction fCopyToClipboardAction;
private int fMarkerToShow;
/*
@@ -97,6 +98,7 @@
fSortDropDownAction.setEnabled(getItemCount() > 0);
fSearchDropDownAction= new SearchDropDownAction(this);
fSearchDropDownAction.setEnabled(hasSearch);
+ fCopyToClipboardAction= new CopyToClipboardAction(this);
addSelectionChangedListener(
new ISelectionChangedListener() {
@@ -213,6 +215,7 @@
fgContextMenuContributor.fill(menu, this);
if (!getSelection().isEmpty()) {
+ menu.appendToGroup(IContextMenuConstants.GROUP_ADDITIONS, fCopyToClipboardAction);
menu.appendToGroup(IContextMenuConstants.GROUP_GOTO, fGotoMarkerAction);
if (enableRemoveMatchMenuItem())
menu.appendToGroup(IContextMenuConstants.GROUP_REORGANIZE, fRemoveMatchAction);
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
index 0f23ed4..9d46139 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
@@ -25,7 +25,7 @@
public static final int SHOW_PATH_LABEL= 3;
public static final int SHOW_PATH= 4;
- private static final String fgSeparatorFormat= SearchMessages.getString("FileLabelProvider.dashSeparated");
+ private static final String fgSeparatorFormat= SearchMessages.getString("FileLabelProvider.dashSeparated"); //$NON-NLS-1$
private int fOrder;
private String[] fArgs= new String[2];
@@ -65,7 +65,7 @@
if (path != null)
pathString= path.toString();
else
- pathString= "";
+ pathString= ""; //$NON-NLS-1$
if (fOrder == SHOW_PATH_LABEL) {
fArgs[0]= pathString;
fArgs[1]= fWorkbenchLabelProvider.getText(resource);
