Skip to content

Rename eclipse.tm.terminal > eclipse.terminal #1979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

Rename eclipse.tm.terminal > eclipse.terminal #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.debug.core;bundle-version="3.23.0",
org.eclipse.tm.terminal.control;bundle-version="5.6.0",
org.eclipse.terminal.control;bundle-version="5.6.0",
org.eclipse.cdt.core.native;bundle-version="[6.4.0,7.0.0)",
org.eclipse.swt;bundle-version="3.130.0",
org.eclipse.ui;bundle-version="3.207.100",
Expand Down
8 changes: 4 additions & 4 deletions debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.cdt.utils.spawner.Spawner;
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.internal.provisional.api.ISettingsStore;
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
import org.eclipse.terminal.internal.provisional.api.ITerminalControl;
import org.eclipse.terminal.internal.provisional.api.TerminalState;

class ConsoleConnector implements ITerminalConnector {

Expand Down
4 changes: 2 additions & 2 deletions ...org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*******************************************************************************/
package org.eclipse.debug.terminal.ui;

import org.eclipse.tm.internal.terminal.control.ITerminalListener;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.terminal.internal.control.ITerminalListener;
import org.eclipse.terminal.internal.provisional.api.TerminalState;

class ConsoleTerminalListener implements ITerminalListener {

Expand Down
2 changes: 1 addition & 1 deletion debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.debug.terminal.ui;

import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
import org.eclipse.ui.console.AbstractConsole;
import org.eclipse.ui.console.IConsoleView;
import org.eclipse.ui.part.IPageBookViewPage;
Expand Down
4 changes: 2 additions & 2 deletions .../org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.runtime.ILog;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.console.ConsolePlugin;
Expand All @@ -38,7 +38,7 @@ public void openConsole() {
if (commandService == null || handlerService == null) {
return;
}
Command command = commandService.getCommand("org.eclipse.tm.terminal.view.ui.command.launchConsole");
Command command = commandService.getCommand("org.eclipse.terminal.view.ui.command.launchConsole");
if (command == null) {
return;
}
Expand Down
8 changes: 4 additions & 4 deletions debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
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.terminal.internal.control.ITerminalViewControl;
import org.eclipse.terminal.internal.control.TerminalViewControlFactory;
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
import org.eclipse.terminal.internal.provisional.api.ITerminalControl;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.IPageBookViewPage;
Expand Down
2 changes: 1 addition & 1 deletion terminal/features/org.eclipse.platform.terminal.feature/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.platform.terminal.feature</name>
<name>org.eclipse.terminal.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
22 changes: 11 additions & 11 deletions terminal/features/org.eclipse.platform.terminal.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.platform.terminal.feature"
id="org.eclipse.terminal.feature"
label="%featureName"
version="1.0.0.qualifier"
provider-name="%providerName">
Expand All @@ -18,40 +18,40 @@
</license>

<requires>
<import plugin="org.eclipse.cdt.core.linux.x86_64" filter="(&amp;(osgi.os=linux)(osgi.arch=x86_64))"/>
<import plugin="org.eclipse.cdt.core.linux.x86_64" filter="(&amp;(osgi.os=linux)(osgi.arch=x86_64))"/>
<import plugin="org.eclipse.cdt.core.linux.ppc64le" filter="(&amp;(osgi.os=linux)(osgi.arch=ppc64le))"/>
<import plugin="org.eclipse.cdt.core.linux.aarch64" filter="(&amp;(osgi.os=linux)(osgi.arch=aarch64))"/>
<import plugin="org.eclipse.cdt.core.macosx" filter="(osgi.os=macosx)"/>
<import plugin="org.eclipse.cdt.core.win32.x86_64" filter="(&amp;(osgi.os=win32)(osgi.arch=x86_64))"/>
<import plugin="org.eclipse.cdt.core.macosx" filter="(osgi.os=macosx)"/>
<import plugin="org.eclipse.cdt.core.win32.x86_64" filter="(&amp;(osgi.os=win32)(osgi.arch=x86_64))"/>
<import plugin="org.eclipse.cdt.core.win32.aarch64" filter="(&amp;(osgi.os=win32)(osgi.arch=aarch64))"/>
</requires>

<plugin
id="org.eclipse.tm.terminal.control"
id="org.eclipse.terminal.control"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.view.core"
id="org.eclipse.terminal.view.core"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.view.ui"
id="org.eclipse.terminal.view.ui"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.connector.process"
id="org.eclipse.terminal.connector.process"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.connector.local"
id="org.eclipse.terminal.connector.local"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.connector.telnet"
id="org.eclipse.terminal.connector.telnet"
version="0.0.0"/>

<plugin
id="org.eclipse.tm.terminal.connector.ssh"
id="org.eclipse.terminal.connector.ssh"
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion terminal/plugins/org.eclipse.tm.terminal.connector.local/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.connector.local</name>
<name>org.eclipse.terminal.connector.local</name>
<comment></comment>
<projects>
</projects>
Expand Down
22 changes: 11 additions & 11 deletions terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.local;singleton:=true
Bundle-SymbolicName: org.eclipse.terminal.connector.local;singleton:=true
Bundle-Version: 4.9.0.qualifier
Bundle-Activator: org.eclipse.tm.terminal.connector.local.activator.UIPlugin
Bundle-Activator: org.eclipse.terminal.connector.local.activator.UIPlugin
Bundle-Vendor: %providerName
Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
org.eclipse.core.resources;bundle-version="[3.22.200,4)";resolution:=optional,
org.eclipse.core.resources;bundle-version="[3.22.200,4)",
org.eclipse.core.runtime;bundle-version="[3.33.0,4)",
org.eclipse.core.variables;bundle-version="[3.6.500,4)",
org.eclipse.debug.ui;bundle-version="[3.18.800,4)";resolution:=optional,
org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional,
org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional,
org.eclipse.tm.terminal.connector.process;bundle-version="[4.9.200,5)",
org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)",
org.eclipse.debug.ui;bundle-version="[3.18.800,4)",
org.eclipse.terminal.view.core;bundle-version="[4.10.400,5)",
org.eclipse.terminal.view.ui;bundle-version="[4.11.600,5)",
org.eclipse.terminal.connector.process;bundle-version="[4.9.200,5)",
org.eclipse.terminal.control;bundle-version="[5.6.0,6.0.0)",
org.eclipse.ui;bundle-version="[3.207.200,4)"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.tm.terminal.connector.local.activator;x-internal:=true,
org.eclipse.tm.terminal.connector.local.controls,
org.eclipse.tm.terminal.connector.local.launcher
Export-Package: org.eclipse.terminal.connector.local.activator;x-internal:=true,
org.eclipse.terminal.connector.local.controls,
org.eclipse.terminal.connector.local.launcher
Automatic-Module-Name: org.eclipse.tm.terminal.connector.local
50 changes: 25 additions & 25 deletions terminal/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@

<!-- Terminal connector contributions -->
<!-- uses process connector -->
<extension point="org.eclipse.tm.terminal.control.connectors">
<extension point="org.eclipse.terminal.control.connectors">
<connector
class="org.eclipse.tm.terminal.connector.process.ProcessConnector"
class="org.eclipse.terminal.connector.process.ProcessConnector"
hidden="true"
id="org.eclipse.tm.terminal.connector.local.LocalConnector"
id="org.eclipse.terminal.connector.local.LocalConnector"
name="%TerminalConnector.local"/>
</extension>

<!-- Terminal launcher delegate contributions -->
<extension point="org.eclipse.tm.terminal.view.ui.launcherDelegates">
<extension point="org.eclipse.terminal.view.ui.launcherDelegates">
<delegate
class="org.eclipse.tm.terminal.connector.local.launcher.LocalLauncherDelegate"
id="org.eclipse.tm.terminal.connector.local.launcher.local"
class="org.eclipse.terminal.connector.local.launcher.LocalLauncherDelegate"
id="org.eclipse.terminal.connector.local.launcher.local"
label="%LocalLauncherDelegate.label">
</delegate>
</extension>

<!-- Menu contributions -->
<extension point="org.eclipse.ui.menus">
<!-- Project Explorer "Show In" contribution -->
<menuContribution locationURI="popup:org.eclipse.tm.terminal.view.ui.ProjectExplorer.menu.showIn?after=additions">
<menuContribution locationURI="popup:org.eclipse.terminal.view.ui.ProjectExplorer.menu.showIn?after=additions">
<command
commandId="org.eclipse.tm.terminal.connector.local.command.launch"
id="org.eclipse.tm.terminal.connector.local.commands.showin.launch"
commandId="org.eclipse.terminal.connector.local.command.launch"
id="org.eclipse.terminal.connector.local.commands.showin.launch"
label="%menu.showIn.localterminal.label"
style="push">
<visibleWhen
Expand Down Expand Up @@ -65,7 +65,7 @@
</iterate>
</with>
<with
variable="org.eclipse.tm.terminal.external.executable.configured">
variable="org.eclipse.terminal.external.executable.configured">
<equals
value="TRUE">
</equals>
Expand All @@ -77,10 +77,10 @@
</menuContribution>

<!-- JDT Package Explorer "Show In" contribution -->
<menuContribution locationURI="popup:org.eclipse.tm.terminal.view.ui.PackageExplorer.menu.showIn?after=additions">
<menuContribution locationURI="popup:org.eclipse.terminal.view.ui.PackageExplorer.menu.showIn?after=additions">
<command
commandId="org.eclipse.tm.terminal.connector.local.command.launch"
id="org.eclipse.tm.terminal.connector.local.commands.showin.launch"
commandId="org.eclipse.terminal.connector.local.command.launch"
id="org.eclipse.terminal.connector.local.commands.showin.launch"
label="%menu.showIn.localterminal.label"
style="push">
<visibleWhen
Expand Down Expand Up @@ -108,7 +108,7 @@
</iterate>
</with>
<with
variable="org.eclipse.tm.terminal.external.executable.configured">
variable="org.eclipse.terminal.external.executable.configured">
<equals
value="TRUE">
</equals>
Expand All @@ -120,10 +120,10 @@
</menuContribution>

<!-- Bndtools Explorer "Show In" contribution -->
<menuContribution locationURI="popup:org.eclipse.tm.terminal.view.ui.BndtoolsExplorer.menu.showIn?after=additions">
<menuContribution locationURI="popup:org.eclipse.terminal.view.ui.BndtoolsExplorer.menu.showIn?after=additions">
<command
commandId="org.eclipse.tm.terminal.connector.local.command.launch"
id="org.eclipse.tm.terminal.connector.local.commands.showin.launch"
commandId="org.eclipse.terminal.connector.local.command.launch"
id="org.eclipse.terminal.connector.local.commands.showin.launch"
label="%menu.showIn.localterminal.label"
style="push">
<visibleWhen
Expand Down Expand Up @@ -151,7 +151,7 @@
</iterate>
</with>
<with
variable="org.eclipse.tm.terminal.external.executable.configured">
variable="org.eclipse.terminal.external.executable.configured">
<equals
value="TRUE">
</equals>
Expand All @@ -166,24 +166,24 @@
<!-- Command contributions -->
<extension point="org.eclipse.ui.commands">
<command
categoryId="org.eclipse.tm.terminal.view.ui.commands.category"
helpContextId="org.eclipse.tm.terminal.connector.local.command_Launch"
id="org.eclipse.tm.terminal.connector.local.command.launch"
categoryId="org.eclipse.terminal.view.ui.commands.category"
helpContextId="org.eclipse.terminal.connector.local.command_Launch"
id="org.eclipse.terminal.connector.local.command.launch"
name="%command.launch.name">
</command>
</extension>

<extension point="org.eclipse.ui.commandImages">
<image
commandId="org.eclipse.tm.terminal.connector.local.command.launch"
commandId="org.eclipse.terminal.connector.local.command.launch"
icon="icons/eview16/terminal_view.gif">
</image>
</extension>

<!-- Key bindings -->
<extension point="org.eclipse.ui.bindings">
<key
commandId="org.eclipse.tm.terminal.connector.local.command.launch"
commandId="org.eclipse.terminal.connector.local.command.launch"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="CTRL+M3+T"/> <!-- Bug 435111: Don't use M1 since COMMAND+Option T already taken on Mac -->
Expand All @@ -192,8 +192,8 @@
<!-- Handler contributions -->
<extension point="org.eclipse.ui.handlers">
<handler
class="org.eclipse.tm.terminal.connector.local.launcher.LocalLauncherHandler"
commandId="org.eclipse.tm.terminal.connector.local.command.launch">
class="org.eclipse.terminal.connector.local.launcher.LocalLauncherHandler"
commandId="org.eclipse.terminal.connector.local.command.launch">
</handler>
</extension>

Expand Down
8 changes: 4 additions & 4 deletions ...l/connector/local/activator/UIPlugin.java → ...l/connector/local/activator/UIPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
package org.eclipse.tm.terminal.connector.local.activator;
package org.eclipse.terminal.connector.local.activator;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences;
import org.eclipse.tm.terminal.view.core.tracing.TraceHandler;
import org.eclipse.terminal.view.core.preferences.ScopedEclipsePreferences;
import org.eclipse.terminal.view.core.tracing.TraceHandler;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

Expand Down Expand Up @@ -52,7 +52,7 @@ public static String getUniqueIdentifier() {
if (getDefault() != null && getDefault().getBundle() != null) {
return getDefault().getBundle().getSymbolicName();
}
return "org.eclipse.tm.terminal.connector.local"; //$NON-NLS-1$
return "org.eclipse.terminal.connector.local"; //$NON-NLS-1$
}

/**
Expand Down
10 changes: 5 additions & 5 deletions ...ntrols/LocalWizardConfigurationPanel.java → ...ntrols/LocalWizardConfigurationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
package org.eclipse.tm.terminal.connector.local.controls;
package org.eclipse.terminal.connector.local.controls;

import java.util.Map;

Expand All @@ -27,9 +27,9 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;
import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel;
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
import org.eclipse.terminal.view.ui.panels.AbstractExtendedConfigurationPanel;
import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchEncoding;
Expand Down Expand Up @@ -114,7 +114,7 @@ public void setupData(Map<String, Object> data) {
public void extractData(Map<String, Object> data) {
// set the terminal connector id for local terminal
data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
"org.eclipse.tm.terminal.connector.local.LocalConnector"); //$NON-NLS-1$
"org.eclipse.terminal.connector.local.LocalConnector"); //$NON-NLS-1$

// Store the encoding
data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
Expand Down
4 changes: 2 additions & 2 deletions ...al/connector/local/controls/Messages.java → ...al/connector/local/controls/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.tm.terminal.connector.local.controls;
package org.eclipse.terminal.connector.local.controls;

import org.eclipse.osgi.util.NLS;

/**
* @noreference This class is not intended to be referenced by clients.
*/
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.local.controls.Messages"; //$NON-NLS-1$
private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.local.controls.Messages"; //$NON-NLS-1$
public static String LocalWizardConfigurationPanel_encoding_does_not_match;
static {
// initialize resource bundle
Expand Down
0 ...nector/local/controls/Messages.properties → ...nector/local/controls/Messages.properties
View file
Open in desktop
File renamed without changes.
Loading
Loading