[142620] WSDL Editor: Need the references -> workspace/project/workingset menu option
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java
index add0d88..1ac668f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java
@@ -26,6 +26,7 @@
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
+//TODO (trung) should be in common.ui this one ??
public abstract class BaseGroupActionDelegate implements IObjectActionDelegate, IEditorActionDelegate, IMenuCreator
{
protected ISelection fSelection;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java
index c4d6664..ac5a175 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java
@@ -16,7 +16,7 @@
import org.eclipse.ui.IEditorPart;
public class FindAction extends Action implements ISelectionChangedListener
{
- IEditorPart editor;
+ protected IEditorPart editor;
protected FindAction(IEditorPart editor)
{
@@ -27,4 +27,4 @@
{
// TODO Auto-generated method stub
}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
index 74bc648..c94f256 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
@@ -36,7 +36,7 @@
QualifiedName elementQName = new QualifiedName(component.getTargetNamespace(), component.getName());
IPath fullPath = file.getFullPath();
ProjectSearchScope scope = new ProjectSearchScope(fullPath);
- String scopeDescription = "Workspace";
+ String scopeDescription = "Project";
XSDSearchQuery searchQuery = new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);
NewSearchUI.activateSearchResultView();
NewSearchUI.runQueryInBackground(searchQuery);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java
index 72e82a4..4c710ef 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java
@@ -59,7 +59,7 @@
scope.addAWorkingSetToScope(elements);
}
- String scopeDescription = "Workspace";
+ String scopeDescription = "Working Set";
XSDSearchQuery searchQuery =
new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);
NewSearchUI.activateSearchResultView();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
index 2eda48e..d6984b3 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
@@ -24,18 +24,17 @@
import org.eclipse.wst.xsd.ui.internal.search.SearchMessages;
public class ReferencesSearchGroup extends SearchGroup {
+ protected static final String MENU_TEXT= SearchMessages.group_references;
- private static final String MENU_TEXT= SearchMessages.group_references;
-
+ protected IEditorPart fEditor;
private IWorkbenchSite fSite;
- private IEditorPart fEditor;
private IActionBars fActionBars;
// private String fGroupId;
- private FindReferencesAction fFindReferencesAction;
- private FindReferencesInProjectAction fFindReferencesInProjectAction;
- private FindReferencesInWorkingSetAction fFindReferencesInWorkingSetAction;
+ protected FindAction fFindReferencesAction;
+ protected FindAction fFindReferencesInProjectAction;
+ protected FindAction fFindReferencesInWorkingSetAction;
/**
@@ -46,9 +45,14 @@
Assert.isNotNull(editor);
fEditor= editor;
fSite= fEditor.getSite();
-// fGroupId= ITextEditorActionConstants.GROUP_FIND;
+
+ initialize();
+ }
+
+ protected void initialize() {
+// fGroupId= ITextEditorActionConstants.GROUP_FIND;
- fFindReferencesAction= new FindReferencesAction(editor);
+ fFindReferencesAction= new FindReferencesAction(fEditor);
fFindReferencesAction.setText(SearchMessages.Search_FindDeclarationAction_label);
fFindReferencesAction.setActionDefinitionId("SEARCH_REFERENCES_IN_WORKSPACE");
//fEditor.setAction("SearchReferencesInWorkspace", fFindReferencesAction); //$NON-NLS-1$
@@ -61,7 +65,7 @@
fFindReferencesInWorkingSetAction= new FindReferencesInWorkingSetAction(fEditor);
fFindReferencesInWorkingSetAction.setText(SearchMessages.Search_FindDeclarationsInWorkingSetAction_label);
fFindReferencesInWorkingSetAction.setActionDefinitionId(".SEARCH_REFERENCES_IN_WORKING_SET");
- //fEditor.setAction("SearchReferencesInWorkingSet", fFindReferencesInWorkingSetAction); //$NON-NLS-1$
+ //fEditor.setAction("SearchReferencesInWorkingSet", fFindReferencesInWorkingSetAction); //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java
index 65d6ff4..5ec359f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java
@@ -20,6 +20,7 @@
import org.eclipse.jface.action.Separator;
import org.eclipse.ui.actions.CompoundContributionItem;
+// TODO should be in common.ui
public class XSDSearchGroupSubMenu extends CompoundContributionItem
{
SearchGroup searchActionGroup;
@@ -59,7 +60,7 @@
}
else
{
- Action dummyAction = new Action("XSDSeachActionGroup_no_refactoring_available")
+ Action dummyAction = new Action("XSDSeachActionGroup_no_refactoring_available") //TODO wrong string here ??
{
// dummy inner class; no methods
};
