Skip to content

Move the 'search in' selection to a menu #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gzsombor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move the 'search in' selection to a menu #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ protected void open(ISelection selection, boolean activate) {
private CancelSearchAction fCancelSearchAction;
private ExpandWithConstructorsAction fExpandWithConstructorsAction;
private RemoveFromViewAction fRemoveFromViewAction;
private ShowSearchInDialogAction fShowSearchInDialogAction;
private CompositeActionGroup fActionGroups;
private CallHierarchyViewer fCallHierarchyViewer;
private boolean fShowCallDetails;
Expand All @@ -245,13 +244,15 @@ protected void open(ISelection selection, boolean activate) {
private boolean fIsPinned;
private PinCallHierarchyViewAction fPinViewAction;
private ShowCallHierarchyFilterDialogAction fFiltersAction;
private final SearchInSelectionManager searchInManager;


public CallHierarchyViewPart() {
super();

fDialogSettings = JavaPlugin.getDefault().getDialogSettings();

searchInManager= new SearchInSelectionManager(this);
fIsPinned= false;
}

Expand Down Expand Up @@ -719,9 +720,10 @@ private void fillViewMenu() {
fieldSubMenu.add(fToggleFieldModeAction);
}
viewMenu.add(fieldSubMenu);
viewMenu.add(fShowSearchInDialogAction);
viewMenu.add(searchInManager.createSearchInMenu());
}


@Override
public void dispose() {
if (fActionGroups != null)
Expand Down Expand Up @@ -1040,7 +1042,6 @@ private void makeActions() {
fFocusOnSelectionAction = new FocusOnSelectionAction(this);
fCopyAction= new CopyCallHierarchyAction(this, fClipboard, fCallHierarchyViewer);
fSearchScopeActions = new SearchScopeActionGroup(this, fDialogSettings);
fShowSearchInDialogAction= new ShowSearchInDialogAction(this, fCallHierarchyViewer);
fFiltersActionGroup = new CallHierarchyFiltersActionGroup(this,
fCallHierarchyViewer);
fHistoryDropDownAction = new HistoryDropDownAction(this);
Expand Down Expand Up @@ -1153,7 +1154,7 @@ private void setContentDescription(int includeMask) {
* @since 3.7
*/
private int getIncludeMask() {
return fShowSearchInDialogAction.getSearchInDialog().getIncludeMask();
return this.searchInManager.getIncludeMask();
}

/**
Expand Down
243 changes: 0 additions & 243 deletions org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/SearchInDialog.java
View file
Open in desktop

This file was deleted.

Loading