Skip to content

Commit d49db2d

Browse files
laeubilaeubi
committed
Migrate CDT to the new Terminal View of Eclipse
1 parent 731533b commit d49db2d

File tree

373 files changed

+238
-40889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

373 files changed

+238
-40889
lines changed

‎cmake/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>cmake</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎jsoncdb/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>jsoncdb</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎releng/org.eclipse.cdt.repo/category.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
<category name="launchbar"/>
134134
</feature>
135135
<!-- Republish the tm terminal control that is now Eclipse Platform to our p2 repository -->
136-
<bundle id="org.eclipse.tm.terminal.control" version="0.0.0"/>
137-
<bundle id="org.eclipse.tm.terminal.control.source" version="0.0.0"/>
136+
<bundle id="org.eclipse.terminal.control" version="0.0.0"/>
137+
<bundle id="org.eclipse.terminal.control.source" version="0.0.0"/>
138138
<feature id="org.eclipse.tm.terminal.control.feature">
139139
<category name="terminal_main"/>
140140
</feature>

‎remote/org.eclipse.remote.console/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.remote.console;singleton:=true
5-
Bundle-Version: 1.4.300.qualifier
5+
Bundle-Version: 1.4.400.qualifier
66
Bundle-Activator: org.eclipse.remote.internal.console.Activator
77
Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -26,8 +26,8 @@ Import-Package: org.eclipse.core.commands,
2626
org.eclipse.swt.events,
2727
org.eclipse.swt.layout,
2828
org.eclipse.swt.widgets,
29-
org.eclipse.tm.internal.terminal.control,
30-
org.eclipse.tm.internal.terminal.provisional.api,
29+
org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
30+
org.eclipse.terminal.control;version="[1.0.0,2.0.0)",
3131
org.eclipse.ui,
3232
org.eclipse.ui.console,
3333
org.eclipse.ui.console.actions,

‎remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsole.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.eclipse.core.runtime.Status;
1919
import org.eclipse.remote.console.ITerminalConsole;
2020
import org.eclipse.remote.core.IRemoteConnection;
21-
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
21+
import org.eclipse.terminal.connector.TerminalState;
2222
import org.eclipse.ui.console.AbstractConsole;
2323
import org.eclipse.ui.console.IConsoleView;
2424
import org.eclipse.ui.part.IPageBookViewPage;

‎remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.eclipse.remote.core.IRemoteProcessBuilder;
3232
import org.eclipse.remote.core.IRemoteProcessTerminalService;
3333
import org.eclipse.remote.core.exception.RemoteConnectionException;
34-
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
35-
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
36-
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
37-
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
34+
import org.eclipse.terminal.connector.ISettingsStore;
35+
import org.eclipse.terminal.connector.ITerminalConnector;
36+
import org.eclipse.terminal.connector.ITerminalControl;
37+
import org.eclipse.terminal.connector.TerminalState;
3838

3939
public class TerminalConsoleConnector {
4040

‎remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsolePage.java‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.remote.internal.console;
1515

16-
import java.io.UnsupportedEncodingException;
16+
import java.nio.charset.Charset;
1717
import java.util.List;
1818

1919
import org.eclipse.core.runtime.IAdaptable;
@@ -23,8 +23,6 @@
2323
import org.eclipse.core.runtime.jobs.Job;
2424
import org.eclipse.jface.action.GroupMarker;
2525
import org.eclipse.jface.action.IToolBarManager;
26-
import org.eclipse.jface.dialogs.ErrorDialog;
27-
import org.eclipse.osgi.util.NLS;
2826
import org.eclipse.remote.console.actions.ConsoleAction;
2927
import org.eclipse.remote.console.actions.IConsoleActionFactory;
3028
import org.eclipse.remote.core.IRemoteConnection;
@@ -36,12 +34,12 @@
3634
import org.eclipse.swt.layout.GridData;
3735
import org.eclipse.swt.widgets.Composite;
3836
import org.eclipse.swt.widgets.Control;
39-
import org.eclipse.tm.internal.terminal.control.ITerminalListener;
40-
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
41-
import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory;
42-
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
43-
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
44-
import org.eclipse.ui.PlatformUI;
37+
import org.eclipse.terminal.connector.ITerminalConnector;
38+
import org.eclipse.terminal.connector.TerminalState;
39+
import org.eclipse.terminal.control.ITerminalListener;
40+
import org.eclipse.terminal.control.ITerminalViewControl;
41+
import org.eclipse.terminal.control.TerminalTitleRequestor;
42+
import org.eclipse.terminal.control.TerminalViewControlFactory;
4543
import org.eclipse.ui.console.IConsoleConstants;
4644
import org.eclipse.ui.console.actions.CloseConsoleAction;
4745
import org.eclipse.ui.part.IPageSite;
@@ -76,8 +74,12 @@ public void setState(TerminalState state) {
7674
}
7775

7876
@Override
79-
public void setTerminalTitle(final String title) {
80-
// ignore titles coming from the widget
77+
public void setTerminalSelectionChanged() {
78+
}
79+
80+
@Override
81+
public void setTerminalTitle(String title, TerminalTitleRequestor requestor) {
82+
8183
}
8284
};
8385

@@ -131,15 +133,7 @@ public void createControl(Composite parent) {
131133
tViewCtrl = TerminalViewControlFactory.makeControl(listener, mainComposite, new ITerminalConnector[] {});
132134
tViewCtrl.setConnector(terminalConsole.getTerminalConnector().newPageConnector());
133135

134-
try {
135-
tViewCtrl.setEncoding(encoding);
136-
} catch (UnsupportedEncodingException e) {
137-
IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
138-
NLS.bind(ConsoleMessages.ENCODING_UNAVAILABLE_1, encoding));
139-
Activator.log(status);
140-
ErrorDialog.openError(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
141-
ConsoleMessages.OPEN_CONSOLE_ERROR, ConsoleMessages.ENCODING_UNAVAILABLE_0, status);
142-
}
136+
tViewCtrl.setCharset(Charset.forName(encoding));
143137
connectTerminalJob.schedule();
144138
}
145139

‎terminal/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>terminal</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎terminal/features/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>features</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎terminal/features/org.eclipse.tm.terminal.connector.local.feature/feature.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@
3232
</license>
3333

3434
<requires>
35-
<import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
36-
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
37-
<import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
38-
<import plugin="org.eclipse.tm.terminal.connector.local" version="4.8.0" match="greaterOrEqual"/>
39-
<import plugin="org.eclipse.tm.terminal.connector.process" version="4.5.0" match="greaterOrEqual"/>
40-
<import plugin="org.eclipse.tm.terminal.control" version="4.5.0" match="greaterOrEqual"/>
41-
<import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
35+
<import plugin="org.eclipse.terminal.connector.local" version="1.0.0" match="greaterOrEqual"/>
4236
<import feature="org.eclipse.tm.terminal.control.feature"/>
43-
<import plugin="org.eclipse.cdt.core.native"/>
4437
</requires>
4538
</feature>

0 commit comments

Comments
 (0)