mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Merge "Fix preference category and remove debugging"

Browse source
This commit is contained in:
Greg Watson 2015-04-15 20:05:15 -04:00 • committed by Gerrit Code Review @ Eclipse.org
commit 6ee3aff83b
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/org.eclipse.remote.terminal/plugin.xml
View file

@ -17,7 +17,7 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.remote.terminal.TerminalPreferencePage"
category="org.eclipse.remote.ui.RemoteDevelopmentPreferencePage"
class="org.eclipse.remote.internal.terminal.preferences.RemoteTerminalPreferencePage"
id="org.eclipse.remote.terminal.page"
name="%RemoteTerminalPage.name">

10
bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/view/TerminalView.java
View file

@ -194,7 +194,6 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
}
public TerminalView() {
TerminalViewPlugin.log("==============================================================="); //$NON-NLS-1$
fMultiConnectionManager.addListener(this);
}
@ -235,7 +234,6 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
*/
@Override
public void onTerminalNewTerminal() {
TerminalViewPlugin.log("creating new Terminal instance."); //$NON-NLS-1$
setupControls();
if (newConnection(ViewMessages.NEW_TERMINAL_CONNECTION) == null) {
fMultiConnectionManager.removeActive();
@ -269,7 +267,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
// unique. This code runs only when the user clicks the New Terminal
// button, so there is no risk that this code will run twice in a single
// millisecond.
IViewPart newTerminalView = getSite().getPage().showView("org.eclipse.tm.terminal.view.TerminalView",//$NON-NLS-1$
IViewPart newTerminalView = getSite().getPage().showView("org.eclipse.tm.terminal.view.TerminalView", //$NON-NLS-1$
"SecondaryTerminal" + System.currentTimeMillis(), //$NON-NLS-1$
IWorkbenchPage.VIEW_ACTIVATE);
if (newTerminalView instanceof ITerminalView) {
@ -362,15 +360,11 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
if (title != null) {
dlgTerminalSettings.setTitle(title);
}
TerminalViewPlugin.log("opening Settings dialog."); //$NON-NLS-1$
if (dlgTerminalSettings.open() == Window.CANCEL) {
TerminalViewPlugin.log("Settings dialog cancelled."); //$NON-NLS-1$
return null;
}
TerminalViewPlugin.log("Settings dialog OK'ed."); //$NON-NLS-1$
// When the settings dialog is closed, we persist the Terminal settings.
saveSettings(fStore, dlgTerminalSettings.getConnector());
// we also save it in the preferences. This will keep the last change
@ -462,8 +456,6 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
@Override
public void dispose() {
TerminalViewPlugin.log("entered."); //$NON-NLS-1$
JFaceResources.getFontRegistry().removeListener(fPropertyChangeHandler);
// dispose all connections