Migrate CDT to the new Terminal View of Eclipse

Author: laeubi

cmake/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cmake</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF

@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.207.200,4)",
  org.eclipse.cdt.launch;bundle-version="[11.0.0,12)",
  org.eclipse.debug.core;bundle-version="[3.23.0,4)",
  org.eclipse.core.resources;bundle-version="[3.22.200,4)",
- org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)",
  org.eclipse.cdt.native.serial;bundle-version="[12.2.0,13)",
  org.eclipse.launchbar.ui;bundle-version="[2.5.600,3)"
 Bundle-ActivationPolicy: lazy
@@ -52,3 +51,5 @@ Export-Package: org.eclipse.cdt.dsf.gdb.internal.ui;x-friends:="org.eclipse.cdt.
  org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.commands;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch;x-internal:=true
 Automatic-Module-Name: org.eclipse.cdt.dsf.gdb.ui
+Import-Package: org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
+ org.eclipse.terminal.control;version="[1.0.0,2.0.0)"

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java

@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.dsf.gdb.internal.ui.console;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
 import org.eclipse.cdt.debug.internal.ui.views.debuggerconsole.DebuggerConsoleView;
@@ -43,12 +42,13 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.tm.internal.terminal.control.ITerminalListener;
-import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
-import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory;
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
-import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
+import org.eclipse.terminal.connector.ITerminalConnector;
+import org.eclipse.terminal.connector.ITerminalControl;
+import org.eclipse.terminal.connector.TerminalState;
+import org.eclipse.terminal.control.ITerminalListener;
+import org.eclipse.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.control.TerminalTitleRequestor;
+import org.eclipse.terminal.control.TerminalViewControlFactory;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.Page;
 
@@ -158,16 +158,18 @@ public void setState(TerminalState state) {
 			}
 
 			@Override
-			public void setTerminalTitle(final String title) {
+			public void setTerminalSelectionChanged() {
 			}
+
+			@Override
+			public void setTerminalTitle(String title, TerminalTitleRequestor requestor) {
+			}
+
 		}, fMainComposite, new ITerminalConnector[] {}, useCommonPrefs);
 
 		fTerminalControl.setConnector(new GdbTerminalPageConnector(fGdbTerminalControlConnector, fGdbPty));
 
-		try {
-			fTerminalControl.setEncoding(Charset.defaultCharset().name());
-		} catch (UnsupportedEncodingException e) {
-		}
+		fTerminalControl.setCharset(Charset.defaultCharset());
 		if (fTerminalControl instanceof ITerminalControl) {
 			((ITerminalControl) fTerminalControl).setConnectOnEnterIfClosed(false);
 			((ITerminalControl) fTerminalControl).setVT100LineWrapping(true);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbTerminalConnector.java

@@ -27,7 +27,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.terminal.connector.ITerminalControl;
 
 /**
  * This class will read from the GDB process output and error streams and will write it to any registered

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbTerminalPageConnector.java

@@ -14,10 +14,10 @@
 
 import org.eclipse.cdt.utils.pty.PTY;
 import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
-import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
+import org.eclipse.terminal.connector.ISettingsStore;
+import org.eclipse.terminal.connector.ITerminalConnector;
+import org.eclipse.terminal.connector.ITerminalControl;
+import org.eclipse.terminal.connector.TerminalState;
 
 /**
  * Class that connects the GDB process I/O with the terminal.

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/IGdbTerminalControlConnector.java

@@ -12,7 +12,7 @@
 
 import java.io.OutputStream;
 
-import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.terminal.connector.ITerminalControl;
 
 /**
  * Interface to connect multiple page terminal controls with their single associated GDB process I/O.

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/GdbConsoleClearAction.java

@@ -14,7 +14,7 @@
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.ConsoleMessages;
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.IConsoleImagesConst;
 import org.eclipse.jface.action.Action;
-import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.control.ITerminalViewControl;
 
 /**
  * Action to clear the contents of the associated GDB terminal

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/GdbConsoleCopyAction.java

@@ -14,7 +14,7 @@
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.ConsoleMessages;
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.IConsoleImagesConst;
 import org.eclipse.jface.action.Action;
-import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.control.ITerminalViewControl;
 
 /**
  * Action to copy the selected text from the associated terminal

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/GdbConsolePasteAction.java

@@ -14,7 +14,7 @@
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.ConsoleMessages;
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.IConsoleImagesConst;
 import org.eclipse.jface.action.Action;
-import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.control.ITerminalViewControl;
 
 /**
  * Action to paste from the clip-board to the associated terminal

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/GdbConsoleScrollLockAction.java

@@ -15,7 +15,7 @@
 import org.eclipse.cdt.dsf.gdb.internal.ui.console.IConsoleImagesConst;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.control.ITerminalViewControl;
 
 /**
  * Action to lock the scrolling of the associated terminal