mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00
Code Issues Wiki Activity

removed warmings and code cleanup

Browse source
This commit is contained in:
Michael Scharf 2007-02-02 04:25:13 +00:00
parent cc3f619114
commit d038f96ff3
1 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java
View file

@ -25,6 +25,7 @@ import org.eclipse.jface.action.Separator;
import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.window.ApplicationWindow;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.TextTransfer;
@ -54,13 +55,11 @@ import org.eclipse.tm.terminal.internal.actions.TerminalActionSettings;
import org.eclipse.ui.IActionBars; import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IMemento; import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewSite; import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.RetargetAction; import org.eclipse.ui.actions.RetargetAction;
import org.eclipse.ui.internal.WorkbenchWindow;
import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.part.ViewPart;
public class TerminalView extends ViewPart implements ITerminalView, ITerminalListener { public class TerminalView extends ViewPart implements ITerminalView, ITerminalListener {
@ -354,21 +353,10 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
setPartName("Terminal"); //$NON-NLS-1$ setPartName("Terminal"); //$NON-NLS-1$
TerminalViewPlugin plugin;
IWorkbench workbench;
WorkbenchWindow workbenchWindow;
MenuManager menuMgr;
Menu menu;
JFaceResources.getFontRegistry().removeListener(fPropertyChangeHandler); JFaceResources.getFontRegistry().removeListener(fPropertyChangeHandler);
plugin = TerminalViewPlugin.getDefault(); MenuManager menuMgr = getEditMenuManager();
workbench = plugin.getWorkbench(); Menu menu = menuMgr.getMenu();
workbenchWindow = (WorkbenchWindow) workbench
.getActiveWorkbenchWindow();
menuMgr = workbenchWindow.getMenuManager();
menuMgr = (MenuManager) menuMgr
.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
menu = menuMgr.getMenu();
menuMgr.removeMenuListener(fMenuHandlerEdit); menuMgr.removeMenuListener(fMenuHandlerEdit);
@ -377,7 +365,6 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
fCtlTerminal.disposeTerminal(); fCtlTerminal.disposeTerminal();
} }
/** /**
* Passing the focus request to the viewer's control. * Passing the focus request to the viewer's control.
*/ */
@ -443,25 +430,23 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
} }
protected void setupMenus() { protected void setupMenus() {
TerminalViewPlugin plugin; MenuManager menuMgr = getEditMenuManager();
IWorkbench workbench; Menu menu = menuMgr.getMenu();
WorkbenchWindow workbenchWindow;
MenuManager menuMgr;
Menu menu;
fMenuHandlerEdit = new TerminalMenuHandlerEdit(); fMenuHandlerEdit = new TerminalMenuHandlerEdit();
plugin = TerminalViewPlugin.getDefault();
workbench = plugin.getWorkbench();
workbenchWindow = (WorkbenchWindow) workbench
.getActiveWorkbenchWindow();
menuMgr = workbenchWindow.getMenuManager();
menuMgr = (MenuManager) menuMgr
.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
menu = menuMgr.getMenu();
menuMgr.addMenuListener(fMenuHandlerEdit); menuMgr.addMenuListener(fMenuHandlerEdit);
menu.addMenuListener(fMenuHandlerEdit); menu.addMenuListener(fMenuHandlerEdit);
} }
/**
* @return the Edit Menu
*/
private MenuManager getEditMenuManager() {
ApplicationWindow workbenchWindow = (ApplicationWindow) TerminalViewPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
MenuManager menuMgr = workbenchWindow.getMenuBarManager();
menuMgr = (MenuManager) menuMgr.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
return menuMgr;
}
protected void setupLocalToolBars() { protected void setupLocalToolBars() {
IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager(); IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();
@ -507,6 +492,15 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
// Inner classes // Inner classes
/**
* Because it is too expensive to update the cut/copy/pase/selectAll actions
* each time the selection in the terminal view has changed, we update them,
* when the menu is shown.
* <p>
* TODO: this might be dangerous because those actions might be shown in the toolbar
* and might not update...
*
*/
protected class TerminalMenuHandlerEdit implements MenuListener, IMenuListener { protected class TerminalMenuHandlerEdit implements MenuListener, IMenuListener {
protected String fActionDefinitionIdCopy; protected String fActionDefinitionIdCopy;
@ -567,9 +561,6 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
// do nothing // do nothing
} }
public void menuHidden(MenuEvent event) { public void menuHidden(MenuEvent event) {
TerminalViewPlugin plugin;
IWorkbench workbench;
WorkbenchWindow workbenchWindow;
MenuManager menuMgr; MenuManager menuMgr;
ActionContributionItem item; ActionContributionItem item;
RetargetAction action; RetargetAction action;
@ -578,13 +569,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
updateEditCopy(); updateEditCopy();
updateEditCut(); updateEditCut();
plugin = TerminalViewPlugin.getDefault(); menuMgr = getEditMenuManager();
workbench = plugin.getWorkbench();
workbenchWindow = (WorkbenchWindow) workbench
.getActiveWorkbenchWindow();
menuMgr = workbenchWindow.getMenuManager();
menuMgr = (MenuManager) menuMgr
.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
item = (ActionContributionItem) menuMgr.find(ActionFactory.COPY item = (ActionContributionItem) menuMgr.find(ActionFactory.COPY
.getId()); .getId());