From 9580bf3b1b828b92071037169724afe702f0770b Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Fri, 8 May 2015 17:21:40 +0200 Subject: [PATCH] fix tracing options --- .../.options | 2 +- .../.options | 2 +- .../.options | 4 +-- .../.options | 2 +- .../.options | 2 +- .../org.eclipse.tm.terminal.control/.options | 6 ++-- .../emulator/VT100TerminalControl.java | 31 +++++++++---------- .../terminal/provisional/api/Logger.java | 6 ++-- .../org.eclipse.tm.terminal.view.ui/.options | 6 ++-- 9 files changed, 29 insertions(+), 32 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.connector.local/.options b/plugins/org.eclipse.tm.terminal.connector.local/.options index b396734183f..5cbcb6722b8 100644 --- a/plugins/org.eclipse.tm.terminal.connector.local/.options +++ b/plugins/org.eclipse.tm.terminal.connector.local/.options @@ -1 +1 @@ -org.eclipse.tcf.te.ui.terminals.local/debugmode = 0 +org.eclipse.tm.terminal.connector.local/debugmode = 0 diff --git a/plugins/org.eclipse.tm.terminal.connector.process/.options b/plugins/org.eclipse.tm.terminal.connector.process/.options index a9f0396bb4e..7e3d5dfe7aa 100644 --- a/plugins/org.eclipse.tm.terminal.connector.process/.options +++ b/plugins/org.eclipse.tm.terminal.connector.process/.options @@ -1 +1 @@ -org.eclipse.tcf.te.ui.terminals.process/debugmode = 0 +org.eclipse.tm.terminal.connector.process/debugmode = 0 diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/.options b/plugins/org.eclipse.tm.terminal.connector.serial/.options index 9d8591b7606..7a6120d0244 100644 --- a/plugins/org.eclipse.tm.terminal.connector.serial/.options +++ b/plugins/org.eclipse.tm.terminal.connector.serial/.options @@ -1,2 +1,2 @@ -org.eclipse.tcf.te.ui.terminals.serial/debugmode = 0 -org.eclipse.tcf.te.ui.terminals.serial/trace/serialLinePanel = false +org.eclipse.tm.terminal.connector.serial/debugmode = 0 +org.eclipse.tm.terminal.connector.serial/trace/serialLinePanel = false diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/.options b/plugins/org.eclipse.tm.terminal.connector.ssh/.options index 910d2e57c84..8ec18dafab2 100644 --- a/plugins/org.eclipse.tm.terminal.connector.ssh/.options +++ b/plugins/org.eclipse.tm.terminal.connector.ssh/.options @@ -1 +1 @@ -org.eclipse.tcf.te.ui.terminals.ssh/debugmode = 0 +org.eclipse.tm.terminal.connector.ssh/debugmode = 0 diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/.options b/plugins/org.eclipse.tm.terminal.connector.telnet/.options index 47f69c8a6eb..77c6a134ddd 100644 --- a/plugins/org.eclipse.tm.terminal.connector.telnet/.options +++ b/plugins/org.eclipse.tm.terminal.connector.telnet/.options @@ -1 +1 @@ -org.eclipse.tcf.te.ui.terminals.telnet/debugmode = 0 +org.eclipse.tm.terminal.connector.telnet/debugmode = 0 diff --git a/plugins/org.eclipse.tm.terminal.control/.options b/plugins/org.eclipse.tm.terminal.control/.options index 78cb917d600..7e591a4d4e7 100644 --- a/plugins/org.eclipse.tm.terminal.control/.options +++ b/plugins/org.eclipse.tm.terminal.control/.options @@ -1,3 +1,3 @@ -org.eclipse.tm.terminal/debug/log = false -org.eclipse.tm.terminal/debug/log/char = false -org.eclipse.tm.terminal/debug/log/VT100Backend = false +org.eclipse.tm.terminal.control/debug/log = false +org.eclipse.tm.terminal.control/debug/log/char = false +org.eclipse.tm.terminal.control/debug/log/VT100Backend = false diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java index 20c9af95d13..74fefb04c14 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java @@ -695,8 +695,9 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#onFontChanged() + * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#setFont(org.eclipse.swt.graphics.Font) */ + @Deprecated public void setFont(Font font) { getCtlText().setFont(font); if(fCommandInputField!=null) { @@ -838,6 +839,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC super(); } + @SuppressWarnings("cast") public void focusGained(FocusEvent event) { // Disable all keyboard accelerators (e.g., Control-B) so the Terminal view // can see every keystroke. Without this, Emacs, vi, and Bash are unusable @@ -845,28 +847,25 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC if (getState() == TerminalState.CONNECTED) captureKeyEvents(true); - IContextService contextService = (IContextService) PlatformUI - .getWorkbench().getAdapter(IContextService.class); - editContextActivation = contextService - .activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$ + IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class); + editContextActivation = contextService.activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$ } + @SuppressWarnings("cast") public void focusLost(FocusEvent event) { // Enable all keybindings. captureKeyEvents(false); // Restore the command context to its previous value. - IContextService contextService = (IContextService) PlatformUI - .getWorkbench().getAdapter(IContextService.class); + IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class); contextService.deactivateContext(editContextActivation); } + @SuppressWarnings("cast") protected void captureKeyEvents(boolean capture) { - IBindingService bindingService = (IBindingService) PlatformUI - .getWorkbench().getAdapter(IBindingService.class); - IContextService contextService = (IContextService) PlatformUI - .getWorkbench().getAdapter(IContextService.class); + IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class); + IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class); boolean enableKeyFilter = !capture; if (bindingService.isKeyFilterEnabled() != enableKeyFilter) @@ -879,8 +878,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC // override menu-activation accelerators with no-op commands in our // plugin.xml file, which enables the Terminal view to see absolutely _all_ // key-presses. - terminalContextActivation = contextService - .activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$ + terminalContextActivation = contextService.activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$ } else if (!capture && terminalContextActivation != null) { contextService.deactivateContext(terminalContextActivation); @@ -1189,16 +1187,15 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC /* * Process given event as Eclipse key binding. */ + @SuppressWarnings("cast") private void processKeyBinding(KeyEvent event, int accelerator) { - IBindingService bindingService = (IBindingService) PlatformUI - .getWorkbench().getAdapter(IBindingService.class); + IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class); KeyStroke keyStroke = SWTKeySupport.convertAcceleratorToKeyStroke(accelerator); Binding binding = bindingService.getPerfectMatch(KeySequence.getInstance(keyStroke)); if (binding != null) { ParameterizedCommand cmd = binding.getParameterizedCommand(); if (cmd != null) { - IHandlerService handlerService = (IHandlerService) PlatformUI - .getWorkbench().getAdapter(IHandlerService.class); + IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class); Event cmdEvent = new Event(); cmdEvent.type = SWT.KeyDown; cmdEvent.display = event.display; diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java index e465587f72a..437935f3959 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java @@ -42,9 +42,9 @@ import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; *

*/ public final class Logger { - public static final String TRACE_DEBUG_LOG = "org.eclipse.tm.terminal/debug/log"; //$NON-NLS-1$ - public static final String TRACE_DEBUG_LOG_CHAR = "org.eclipse.tm.terminal/debug/log/char"; //$NON-NLS-1$ - public static final String TRACE_DEBUG_LOG_VT100BACKEND = "org.eclipse.tm.terminal/debug/log/VT100Backend"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG = "org.eclipse.tm.terminal.control/debug/log"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG_CHAR = "org.eclipse.tm.terminal.control/debug/log/char"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG_VT100BACKEND = "org.eclipse.tm.terminal.control/debug/log/VT100Backend"; //$NON-NLS-1$ private static PrintStream logStream; diff --git a/plugins/org.eclipse.tm.terminal.view.ui/.options b/plugins/org.eclipse.tm.terminal.view.ui/.options index cf7e9ecb799..2b37de4fb78 100644 --- a/plugins/org.eclipse.tm.terminal.view.ui/.options +++ b/plugins/org.eclipse.tm.terminal.view.ui/.options @@ -1,3 +1,3 @@ -org.eclipse.tcf.te.ui.terminals/debugmode = 0 -org.eclipse.tcf.te.ui.terminals/trace/outputStreamMonitor = false -org.eclipse.tcf.te.ui.terminals/trace/launchTerminalCommandHandler = false +org.eclipse.tm.terminal.view.ui/debugmode = 0 +org.eclipse.tm.terminal.view.ui/trace/outputStreamMonitor = false +org.eclipse.tm.terminal.view.ui/trace/launchTerminalCommandHandler = false