From 65ed9ea1ea04acab429b69abca2d9be27c67a7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Tue, 24 Jun 2025 06:50:24 +0200 Subject: [PATCH] Rename eclipse.tm.terminal > eclipse.terminal --- .../META-INF/MANIFEST.MF | 2 +- .../debug/terminal/ui/ConsoleConnector.java | 8 +- .../terminal/ui/ConsoleTerminalListener.java | 4 +- .../debug/terminal/ui/TerminalConsole.java | 2 +- .../terminal/ui/TerminalConsoleFactory.java | 4 +- .../terminal/ui/TerminalConsolePage.java | 8 +- .../.project | 2 +- .../feature.xml | 22 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 22 +- .../plugin.xml | 50 ++-- .../connector/local/activator/UIPlugin.java | 8 +- .../LocalWizardConfigurationPanel.java | 10 +- .../connector/local/controls/Messages.java | 4 +- .../local/controls/Messages.properties | 0 .../local/launcher/LocalLauncherDelegate.java | 44 ++-- .../local/launcher/LocalLauncherHandler.java | 10 +- .../local/launcher/LocalMementoHandler.java | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 18 +- .../plugin.xml | 12 +- .../connector/process/ProcessConnector.java | 26 +- .../process/ProcessLauncherDelegate.java | 26 +- .../connector/process/ProcessMonitor.java | 2 +- .../connector/process/ProcessSettings.java | 8 +- .../process/ProcessSettingsPage.java | 6 +- .../connector/process/activator/UIPlugin.java | 6 +- .../process/help/IContextHelpIds.java | 4 +- .../connector/process/nls/Messages.java | 4 +- .../connector/process/nls/Messages.properties | 0 .../.project | 2 +- .../META-INF/MANIFEST.MF | 20 +- .../plugin.xml | 14 +- .../connector/ssh/activator/UIPlugin.java | 8 +- .../ssh/connector/ISshConstants.java | 2 +- .../connector/ssh/connector/ISshSettings.java | 4 +- .../connector/KeyboardInteractiveDialog.java | 2 +- .../ssh/connector/SshConnection.java | 11 +- .../connector/ssh/connector/SshConnector.java | 14 +- .../connector/ssh/connector/SshMessages.java | 2 +- .../ssh/connector/SshMessages.properties | 0 .../connector/ssh/connector/SshSettings.java | 4 +- .../ssh/connector/SshSettingsPage.java | 4 +- .../ssh/connector/UserValidationDialog.java | 2 +- .../controls/SshWizardConfigurationPanel.java | 55 ++--- .../ssh/launcher/SshLauncherDelegate.java | 46 ++-- .../ssh/launcher/SshMementoHandler.java | 12 +- .../terminal/connector/ssh/nls/Messages.java | 4 +- .../connector/ssh/nls/Messages.properties | 0 .../.project | 2 +- .../.settings/.api_filters | 11 - .../META-INF/MANIFEST.MF | 20 +- .../plugin.xml | 14 +- .../connector/telnet/activator/UIPlugin.java | 6 +- .../telnet/connector/ITelnetSettings.java | 4 +- .../telnet/connector/NetworkPortMap.java | 2 +- .../telnet/connector/TelnetCodes.java | 2 +- .../telnet/connector/TelnetConnectWorker.java | 8 +- .../telnet/connector/TelnetConnection.java | 8 +- .../telnet/connector/TelnetConnector.java | 14 +- .../telnet/connector/TelnetMessages.java | 2 +- .../connector/TelnetMessages.properties | 0 .../telnet/connector/TelnetOption.java | 4 +- .../telnet/connector/TelnetProperties.java | 2 +- .../telnet/connector/TelnetSettings.java | 4 +- .../telnet/connector/TelnetSettingsPage.java | 4 +- .../TelnetWizardConfigurationPanel.java | 22 +- .../launcher/TelnetLauncherDelegate.java | 32 +-- .../telnet/launcher/TelnetMementoHandler.java | 6 +- .../connector/telnet/nls/Messages.java | 4 +- .../connector/telnet/nls/Messages.properties | 0 .../org.eclipse.tm.terminal.control/.project | 2 +- .../META-INF/MANIFEST.MF | 28 +-- .../plugin.xml | 132 +++++----- .../schema/connectors.exsd | 6 +- .../connector/TerminalConnector.java | 20 +- ...TerminalToRemoteInjectionOutputStream.java | 2 +- .../control/CommandInputFieldWithHistory.java | 2 +- .../internal}/control/ICommandInputField.java | 2 +- .../internal}/control/ITerminalListener.java | 6 +- .../internal}/control/ITerminalListener2.java | 2 +- .../internal}/control/ITerminalListener3.java | 2 +- .../control/ITerminalMouseListener.java | 4 +- .../control/ITerminalMouseListener2.java | 4 +- .../control/ITerminalViewControl.java | 12 +- .../control/TerminalViewControlFactory.java | 8 +- .../actions/AbstractTerminalAction.java | 6 +- .../control/actions/ActionMessages.java | 2 +- .../control/actions/ActionMessages.properties | 0 .../control/actions/ImageConsts.java | 2 +- .../actions/TerminalActionClearAll.java | 4 +- .../control/actions/TerminalActionCopy.java | 8 +- .../control/actions/TerminalActionCut.java | 4 +- .../control/actions/TerminalActionPaste.java | 10 +- .../actions/TerminalActionSelectAll.java | 4 +- .../control/impl/ITerminalControlForText.java | 8 +- .../control/impl/TerminalMessages.java | 2 +- .../control/impl/TerminalMessages.properties | 0 .../control/impl/TerminalPlugin.java | 6 +- .../emulator/EditActionAccelerators.java | 6 +- .../emulator/IVT100EmulatorBackend.java | 4 +- .../emulator/LoggingOutputStream.java | 4 +- .../emulator/VT100BackendTraceDecorator.java | 4 +- .../internal}/emulator/VT100Emulator.java | 34 +-- .../emulator/VT100EmulatorBackend.java | 6 +- .../emulator/VT100TerminalControl.java | 60 ++--- .../internal}/model/ISnapshotChanges.java | 4 +- .../internal}/model/SnapshotChanges.java | 4 +- .../model/SynchronizedTerminalTextData.java | 10 +- .../internal}/model/SystemDefaultColors.java | 2 +- .../internal}/model/TerminalTextData.java | 12 +- .../model/TerminalTextDataFastScroll.java | 10 +- .../model/TerminalTextDataSnapshot.java | 10 +- .../model/TerminalTextDataStore.java | 10 +- .../model/TerminalTextDataWindow.java | 10 +- .../preferences/ITerminalConstants.java | 4 +- .../preferences/TerminalColorPresets.java | 50 ++-- .../TerminalColorsFieldEditor.java | 48 ++-- .../TerminalPreferenceInitializer.java | 8 +- .../preferences/TerminalPreferencePage.java | 6 +- .../provisional/api/AbstractSettingsPage.java | 2 +- .../provisional/api/ISettingsPage.java | 2 +- .../provisional/api/ISettingsStore.java | 2 +- .../provisional/api/ITerminalConnector.java | 15 +- .../provisional/api/ITerminalControl.java | 6 +- .../internal}/provisional/api/Logger.java | 12 +- .../provisional/api/NullSettingsStore.java | 2 +- .../api/TerminalConnectorExtension.java | 16 +- .../provisional/api/TerminalState.java | 2 +- .../api/provider/TerminalConnectorImpl.java | 13 +- .../textcanvas/AbstractTextCanvasModel.java | 12 +- .../internal}/textcanvas/GridCanvas.java | 2 +- .../internal}/textcanvas/ILinelRenderer.java | 4 +- .../textcanvas/ITextCanvasModel.java | 4 +- .../textcanvas/ITextCanvasModelListener.java | 2 +- .../textcanvas/PipedInputStream.java | 2 +- .../textcanvas/PollingTextCanvasModel.java | 4 +- .../internal}/textcanvas/StyleMap.java | 10 +- .../internal}/textcanvas/TextCanvas.java | 8 +- .../textcanvas/TextLineRenderer.java | 14 +- .../internal}/textcanvas/VirtualCanvas.java | 4 +- .../terminal/model/ITerminalTextData.java | 2 +- .../model/ITerminalTextDataReadOnly.java | 2 +- .../model/ITerminalTextDataSnapshot.java | 2 +- .../{tm => }/terminal/model/LineSegment.java | 2 +- .../terminal/model/TerminalColor.java | 2 +- .../terminal/model/TerminalStyle.java | 6 +- .../model/TerminalTextDataFactory.java | 6 +- .../{tm => }/terminal/model/TextRange.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 22 +- .../plugin.xml | 2 +- .../schema/contextPropertiesProviders.exsd | 4 +- ...minalContextPropertiesProviderFactory.java | 10 +- .../view/core/TerminalServiceFactory.java | 12 +- .../core/activator/CoreBundleActivator.java | 4 +- .../ITerminalContextPropertiesProvider.java | 2 +- .../core/interfaces/ITerminalService.java | 2 +- ...nalServiceOutputStreamMonitorListener.java | 2 +- .../core/interfaces/ITerminalTabListener.java | 2 +- .../IContextPropertiesConstants.java | 2 +- .../constants/ILineSeparatorConstants.java | 2 +- .../ITerminalsConnectorConstants.java | 4 +- .../view/core/internal/PropertyTester.java | 4 +- .../terminal/view/core/nls/Messages.java | 4 +- .../view/core/nls/Messages.properties | 0 .../preferences/ScopedEclipsePreferences.java | 2 +- .../view/core/tracing/TraceHandler.java | 4 +- .../terminal/view/core/utils/Env.java | 2 +- .../org.eclipse.tm.terminal.view.ui/.project | 2 +- .../.settings/.api_filters | 35 --- .../META-INF/MANIFEST.MF | 50 ++-- .../plugin.xml | 226 +++++++++--------- .../view/ui/actions/AbstractAction.java | 14 +- .../view/ui/actions/InvertColorsAction.java | 12 +- .../ui/actions/NewTerminalViewAction.java | 14 +- .../view/ui/actions/RenameTerminalAction.java | 12 +- .../view/ui/actions/SelectEncodingAction.java | 14 +- .../view/ui/actions/TabScrollLockAction.java | 14 +- .../ui/actions/ToggleCommandFieldAction.java | 20 +- .../terminal/view/ui/activator/UIPlugin.java | 20 +- .../controls/ConfigurationPanelControl.java | 8 +- .../view/ui/controls/NoteCompositeHelper.java | 4 +- .../view/ui/help/IContextHelpIds.java | 4 +- .../ui/interfaces/IConfigurationPanel.java | 4 +- .../IConfigurationPanelContainer.java | 2 +- .../IExternalExecutablesProperties.java | 2 +- .../view/ui/interfaces/ILauncherDelegate.java | 8 +- .../view/ui/interfaces/IMementoHandler.java | 2 +- .../view/ui/interfaces/IPreferenceKeys.java | 2 +- .../view/ui/interfaces/ITerminalsView.java | 2 +- .../view/ui/interfaces/IUIConstants.java | 4 +- .../view/ui/interfaces/ImageConsts.java | 2 +- .../view/ui/interfaces/tracing/ITraceIds.java | 2 +- .../ui/internal/ExternalExecutablesState.java | 6 +- .../view/ui/internal/PropertyTester.java | 12 +- .../view/ui/internal/SettingsStore.java | 4 +- .../dialogs/EncodingSelectionDialog.java | 10 +- .../internal/dialogs/ErrorSettingsPanel.java | 6 +- .../dialogs/LaunchTerminalSettingsDialog.java | 36 +-- .../AbstractTriggerCommandHandler.java | 6 +- .../DisconnectTerminalCommandHandler.java | 8 +- .../handler/LaunchTerminalCommandHandler.java | 27 +-- .../internal/handler/MaximizeViewHandler.java | 2 +- .../handler/NewTerminalViewHandler.java | 8 +- .../internal/handler/QuickAccessHandler.java | 2 +- .../ui/launcher/AbstractLauncherDelegate.java | 10 +- .../ui/launcher/LauncherDelegateManager.java | 14 +- .../ui/listeners/AbstractWindowListener.java | 2 +- .../ui/listeners/WorkbenchPartListener.java | 6 +- .../ui/listeners/WorkbenchWindowListener.java | 2 +- .../showin/DynamicContributionItems.java | 12 +- .../showin/ExternalExecutablesDialog.java | 8 +- .../showin/ExternalExecutablesManager.java | 10 +- .../showin/ExternalExecutablesUtils.java | 2 +- .../showin/IDetectExternalExecutable.java | 4 +- .../local/showin/detectors/DetectGitBash.java | 8 +- .../ui/local/showin/detectors/DetectWSL.java | 6 +- .../view/ui/manager/ConsoleManager.java | 22 +- .../terminal/view/ui/nls/Messages.java | 4 +- .../terminal/view/ui/nls/Messages.properties | 0 .../ui/panels/AbstractConfigurationPanel.java | 6 +- .../AbstractExtendedConfigurationPanel.java | 16 +- .../view/ui/preferences/PreferencePage.java | 18 +- .../preferences/PreferencesInitializer.java | 8 +- .../view/ui/services/TerminalService.java | 22 +- .../ui/streams/AbstractStreamsConnector.java | 8 +- .../view/ui/streams/InputStreamMonitor.java | 10 +- .../view/ui/streams/OutputStreamMonitor.java | 14 +- .../view/ui/streams/StreamsConnector.java | 10 +- .../ui/streams/StreamsLauncherDelegate.java | 26 +- .../view/ui/streams/StreamsSettings.java | 8 +- .../view/ui/tabs/OpenFileMouseHandler.java | 12 +- .../view/ui/tabs/TabCommandFieldHandler.java | 6 +- .../view/ui/tabs/TabDisposeListener.java | 10 +- .../view/ui/tabs/TabFolderManager.java | 24 +- .../view/ui/tabs/TabFolderMenuHandler.java | 26 +- .../ui/tabs/TabFolderSelectionListener.java | 2 +- .../view/ui/tabs/TabFolderToolbarHandler.java | 24 +- .../view/ui/tabs/TabTerminalListener.java | 12 +- .../view/ui/view/OldTerminalsViewHandler.java | 4 +- .../terminal/view/ui/view/TerminalsView.java | 16 +- .../ui/view/TerminalsViewMementoHandler.java | 12 +- .../org.eclipse.tm.terminal.test/.project | 2 +- .../META-INF/MANIFEST.MF | 22 +- .../org.eclipse.tm.terminal.test/plugin.xml | 2 +- .../TerminalConnectorFactoryTest.java | 12 +- .../TerminalConnectorPluginTest.java | 8 +- .../connector/TerminalConnectorTest.java | 14 +- ...inalToRemoteInjectionOutputStreamTest.java | 2 +- .../internal}/emulator/AllTestSuite.java | 2 +- .../emulator/MockTerminalControlForText.java | 10 +- .../emulator/VT100EmulatorBackendTest.java | 16 +- .../internal}/emulator/VT100EmulatorTest.java | 8 +- .../model/AbstractITerminalTextDataTest.java | 10 +- .../internal}/model/AllTestSuite.java | 2 +- .../internal}/model/SnapshotChangesTest.java | 4 +- .../SynchronizedTerminalTextDataTest.java | 4 +- ...rminalTextDataFastScrollMaxHeightTest.java | 4 +- .../model/TerminalTextDataFastScrollTest.java | 4 +- .../TerminalTextDataPerformanceTest.java | 8 +- .../model/TerminalTextDataSnapshotTest.java | 10 +- .../TerminalTextDataSnapshotWindowTest.java | 8 +- .../model/TerminalTextDataStoreTest.java | 4 +- .../internal}/model/TerminalTextDataTest.java | 4 +- .../model/TerminalTextDataWindowTest.java | 8 +- .../model/TerminalTextTestHelper.java | 8 +- .../speedtest/SpeedTestConnection.java | 10 +- .../speedtest/SpeedTestConnector.java | 16 +- .../speedtest/SpeedTestSettings.java | 4 +- .../internal}/test/terminalcanvas/Main.java | 2 +- .../test/terminalcanvas/Snippet48.java | 2 +- .../terminalcanvas/TerminalTextCanvas.java | 2 +- .../test/terminalcanvas/VirtualCanvas.java | 2 +- .../ui/AbstractLineOrientedDataSource.java | 6 +- .../internal}/test/ui/DataReader.java | 4 +- .../internal}/test/ui/FastDataSource.java | 4 +- .../internal}/test/ui/FileDataSource.java | 4 +- .../internal}/test/ui/IDataSource.java | 4 +- .../internal}/test/ui/IStatus.java | 2 +- .../test/ui/LineCountingDataSource.java | 12 +- .../internal}/test/ui/RandomDataSource.java | 14 +- .../internal}/test/ui/TerminalTextUITest.java | 16 +- .../internal}/test/ui/VT100DataSource.java | 14 +- .../PipedInputStreamPerformanceTest.java | 2 +- .../internal}/textcanvas/PipedStreamTest.java | 2 +- .../{tm => }/terminal/model/AllTestSuite.java | 2 +- .../{tm => }/terminal/model/StyleTest.java | 2 +- .../terminal/model/TerminalColorUITest.java | 20 +- .../test/AutomatedIntegrationSuite.java | 2 +- .../test/AutomatedPluginTestSuite.java | 6 +- .../terminal/test/AutomatedTestSuite.java | 14 +- .../teamConfig/Terminal AutomatedTests.launch | 26 +- 293 files changed, 1406 insertions(+), 1517 deletions(-) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/activator/UIPlugin.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/controls/LocalWizardConfigurationPanel.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/controls/Messages.java (82%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/controls/Messages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/launcher/LocalLauncherDelegate.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/launcher/LocalLauncherHandler.java (87%) rename terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/{tm => }/terminal/connector/local/launcher/LocalMementoHandler.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/ProcessConnector.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/ProcessLauncherDelegate.java (82%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/ProcessMonitor.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/ProcessSettings.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/ProcessSettingsPage.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/activator/UIPlugin.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/help/IContextHelpIds.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/nls/Messages.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/{tm => }/terminal/connector/process/nls/Messages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/activator/UIPlugin.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/ISshConstants.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/ISshSettings.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshConnection.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshConnector.java (87%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshMessages.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshMessages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshSettings.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/SshSettingsPage.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/connector/UserValidationDialog.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/launcher/SshLauncherDelegate.java (76%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/launcher/SshMementoHandler.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/nls/Messages.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/{tm => }/terminal/connector/ssh/nls/Messages.properties (100%) delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/.api_filters rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/activator/UIPlugin.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/ITelnetSettings.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/NetworkPortMap.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetCodes.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetConnectWorker.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetConnection.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetConnector.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetMessages.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetMessages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetOption.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetProperties.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetSettings.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/connector/TelnetSettingsPage.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java (81%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/launcher/TelnetMementoHandler.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/nls/Messages.java (87%) rename terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/{tm => }/terminal/connector/telnet/nls/Messages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalConnector.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalToRemoteInjectionOutputStream.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/CommandInputFieldWithHistory.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ICommandInputField.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalListener.java (84%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalListener2.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalListener3.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalMouseListener.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalMouseListener2.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/ITerminalViewControl.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/TerminalViewControlFactory.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/AbstractTerminalAction.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/ActionMessages.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/ActionMessages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/ImageConsts.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/TerminalActionClearAll.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/TerminalActionCopy.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/TerminalActionCut.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/TerminalActionPaste.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/actions/TerminalActionSelectAll.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/impl/ITerminalControlForText.java (82%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/impl/TerminalMessages.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/impl/TerminalMessages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/control/impl/TerminalPlugin.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/EditActionAccelerators.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/IVT100EmulatorBackend.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/LoggingOutputStream.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100BackendTraceDecorator.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100Emulator.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100EmulatorBackend.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100TerminalControl.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/ISnapshotChanges.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/SnapshotChanges.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/SynchronizedTerminalTextData.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/SystemDefaultColors.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextData.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataFastScroll.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataSnapshot.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataStore.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataWindow.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/preferences/ITerminalConstants.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/preferences/TerminalColorPresets.java (66%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/preferences/TerminalColorsFieldEditor.java (83%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/preferences/TerminalPreferenceInitializer.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/preferences/TerminalPreferencePage.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/AbstractSettingsPage.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/ISettingsPage.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/ISettingsStore.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/ITerminalConnector.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/ITerminalControl.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/Logger.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/NullSettingsStore.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/TerminalConnectorExtension.java (84%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/TerminalState.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/provisional/api/provider/TerminalConnectorImpl.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/AbstractTextCanvasModel.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/GridCanvas.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/ILinelRenderer.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/ITextCanvasModel.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/ITextCanvasModelListener.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/PipedInputStream.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/PollingTextCanvasModel.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/StyleMap.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/TextCanvas.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/TextLineRenderer.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/VirtualCanvas.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/ITerminalTextData.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/ITerminalTextDataReadOnly.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/ITerminalTextDataSnapshot.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/LineSegment.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/TerminalColor.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/TerminalStyle.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/TerminalTextDataFactory.java (80%) rename terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/{tm => }/terminal/model/TextRange.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/TerminalContextPropertiesProviderFactory.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/TerminalServiceFactory.java (78%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/activator/CoreBundleActivator.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/ITerminalService.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/ITerminalTabListener.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/internal/PropertyTester.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/nls/Messages.java (87%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/nls/Messages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/preferences/ScopedEclipsePreferences.java (99%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/tracing/TraceHandler.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/{tm => }/terminal/view/core/utils/Env.java (98%) delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.view.ui/.settings/.api_filters rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/AbstractAction.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/InvertColorsAction.java (80%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/NewTerminalViewAction.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/RenameTerminalAction.java (82%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/SelectEncodingAction.java (81%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/TabScrollLockAction.java (78%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/actions/ToggleCommandFieldAction.java (81%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/activator/UIPlugin.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/controls/ConfigurationPanelControl.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/controls/NoteCompositeHelper.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/help/IContextHelpIds.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IConfigurationPanel.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IConfigurationPanelContainer.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IExternalExecutablesProperties.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/ILauncherDelegate.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IMementoHandler.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IPreferenceKeys.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/ITerminalsView.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/IUIConstants.java (85%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/ImageConsts.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/interfaces/tracing/ITraceIds.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/ExternalExecutablesState.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/PropertyTester.java (83%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/SettingsStore.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java (88%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java (89%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java (86%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/MaximizeViewHandler.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/NewTerminalViewHandler.java (79%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/internal/handler/QuickAccessHandler.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/launcher/AbstractLauncherDelegate.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/launcher/LauncherDelegateManager.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/listeners/AbstractWindowListener.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/listeners/WorkbenchPartListener.java (91%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/listeners/WorkbenchWindowListener.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/DynamicContributionItems.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/ExternalExecutablesDialog.java (98%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/ExternalExecutablesManager.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/ExternalExecutablesUtils.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/IDetectExternalExecutable.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/detectors/DetectGitBash.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/local/showin/detectors/DetectWSL.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/manager/ConsoleManager.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/nls/Messages.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/nls/Messages.properties (100%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/panels/AbstractConfigurationPanel.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/preferences/PreferencePage.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/preferences/PreferencesInitializer.java (83%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/services/TerminalService.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/AbstractStreamsConnector.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/InputStreamMonitor.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/OutputStreamMonitor.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/StreamsConnector.java (87%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/StreamsLauncherDelegate.java (78%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/streams/StreamsSettings.java (95%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/OpenFileMouseHandler.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabCommandFieldHandler.java (93%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabDisposeListener.java (90%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabFolderManager.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabFolderMenuHandler.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabFolderSelectionListener.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabFolderToolbarHandler.java (92%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/tabs/TabTerminalListener.java (94%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/view/OldTerminalsViewHandler.java (96%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/view/TerminalsView.java (97%) rename terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/{tm => }/terminal/view/ui/view/TerminalsViewMementoHandler.java (95%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalConnectorFactoryTest.java (94%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalConnectorPluginTest.java (86%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalConnectorTest.java (93%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/connector/TerminalToRemoteInjectionOutputStreamTest.java (99%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/AllTestSuite.java (95%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/MockTerminalControlForText.java (80%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100EmulatorBackendTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/emulator/VT100EmulatorTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/AbstractITerminalTextDataTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/AllTestSuite.java (97%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/SnapshotChangesTest.java (99%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/SynchronizedTerminalTextDataTest.java (88%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataFastScrollMaxHeightTest.java (88%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataFastScrollTest.java (87%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataPerformanceTest.java (96%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataSnapshotTest.java (99%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataSnapshotWindowTest.java (96%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataStoreTest.java (87%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataTest.java (87%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextDataWindowTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/model/TerminalTextTestHelper.java (93%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/speedtest/SpeedTestConnection.java (90%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/speedtest/SpeedTestConnector.java (83%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/speedtest/SpeedTestSettings.java (93%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/terminalcanvas/Main.java (94%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/terminalcanvas/Snippet48.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/terminalcanvas/TerminalTextCanvas.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/terminalcanvas/VirtualCanvas.java (99%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/AbstractLineOrientedDataSource.java (88%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/DataReader.java (95%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/FastDataSource.java (91%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/FileDataSource.java (94%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/IDataSource.java (86%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/IStatus.java (92%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/LineCountingDataSource.java (79%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/RandomDataSource.java (78%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/TerminalTextUITest.java (94%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/test/ui/VT100DataSource.java (92%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/PipedInputStreamPerformanceTest.java (95%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm/internal/terminal => terminal/internal}/textcanvas/PipedStreamTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/model/AllTestSuite.java (96%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/model/StyleTest.java (98%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/model/TerminalColorUITest.java (90%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/test/AutomatedIntegrationSuite.java (94%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/test/AutomatedPluginTestSuite.java (83%) rename terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/{tm => }/terminal/test/AutomatedTestSuite.java (67%) diff --git a/debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF index afb8147c0de..4e2177825c5 100644 --- a/debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF @@ -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", diff --git a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java index 02c8e47f6c8..426b444e057 100644 --- a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java +++ b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java @@ -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 { diff --git a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java index 0c84f890bd0..ec82ff6c7a0 100644 --- a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java +++ b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java @@ -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 { diff --git a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java index 443e97c9a3c..7eabd5b00e0 100644 --- a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java +++ b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java @@ -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; diff --git a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java index 92573f41e58..24e2d4fbf5f 100644 --- a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java +++ b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java @@ -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; @@ -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; } diff --git a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java index 4e08bdabefb..a4f5b948c65 100644 --- a/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java +++ b/debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java @@ -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; diff --git a/terminal/features/org.eclipse.platform.terminal.feature/.project b/terminal/features/org.eclipse.platform.terminal.feature/.project index 459b2e77f7e..6740c81f09a 100644 --- a/terminal/features/org.eclipse.platform.terminal.feature/.project +++ b/terminal/features/org.eclipse.platform.terminal.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.platform.terminal.feature + org.eclipse.terminal.feature diff --git a/terminal/features/org.eclipse.platform.terminal.feature/feature.xml b/terminal/features/org.eclipse.platform.terminal.feature/feature.xml index 4b3ddb61d5c..94b6c6d51b0 100644 --- a/terminal/features/org.eclipse.platform.terminal.feature/feature.xml +++ b/terminal/features/org.eclipse.platform.terminal.feature/feature.xml @@ -1,6 +1,6 @@ @@ -18,40 +18,40 @@ - + - - + + diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/.project b/terminal/plugins/org.eclipse.tm.terminal.connector.local/.project index 696a343153f..b5311f712b4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.connector.local + org.eclipse.terminal.connector.local diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF index ef7450b6f49..64ef429e0ae 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF @@ -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 diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml index a6c9f688610..50b37c6ec35 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/plugin.xml @@ -14,19 +14,19 @@ - + - + @@ -34,10 +34,10 @@ - + + variable="org.eclipse.terminal.external.executable.configured"> @@ -77,10 +77,10 @@ - + + variable="org.eclipse.terminal.external.executable.configured"> @@ -120,10 +120,10 @@ - + + variable="org.eclipse.terminal.external.executable.configured"> @@ -166,16 +166,16 @@ @@ -183,7 +183,7 @@ @@ -192,8 +192,8 @@ + class="org.eclipse.terminal.connector.local.launcher.LocalLauncherHandler" + commandId="org.eclipse.terminal.connector.local.command.launch"> diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java index 967c0652186..6690a4ddbfb 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java @@ -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; @@ -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$ } /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/LocalWizardConfigurationPanel.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/LocalWizardConfigurationPanel.java index fd7d49911aa..78fd17402ee 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/LocalWizardConfigurationPanel.java @@ -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; @@ -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; @@ -114,7 +114,7 @@ public void setupData(Map data) { public void extractData(Map 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()); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/Messages.java similarity index 82% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/Messages.java index e579af85dd0..edc80d3fd1d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/Messages.java @@ -7,7 +7,7 @@ * * 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; @@ -15,7 +15,7 @@ * @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 diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java index 6a102666d10..97098c61f05 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.connector.local.launcher; +package org.eclipse.terminal.connector.local.launcher; import java.io.File; import java.net.InetAddress; @@ -35,23 +35,23 @@ import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -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.TerminalConnectorExtension; -import org.eclipse.tm.terminal.connector.local.activator.UIPlugin; -import org.eclipse.tm.terminal.connector.local.controls.LocalWizardConfigurationPanel; -import org.eclipse.tm.terminal.connector.process.ProcessSettings; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; -import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.connector.local.activator.UIPlugin; +import org.eclipse.terminal.connector.local.controls.LocalWizardConfigurationPanel; +import org.eclipse.terminal.connector.process.ProcessSettings; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys; +import org.eclipse.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; @@ -108,7 +108,7 @@ public void execute(Map properties, ITerminalService.Done done) // Initialize the local terminal working directory. if (!properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR)) { // By default, start the local terminal in the users home directory - String initialCwd = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences() + String initialCwd = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences() .getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD); String cwd = null; if (initialCwd == null || IPreferenceKeys.PREF_INITIAL_CWD_USER_HOME.equals(initialCwd) @@ -273,7 +273,7 @@ private final File defaultShell() { } } if (shell == null) { - shell = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences() + shell = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences() .getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX); if (shell == null || "".equals(shell)) { //$NON-NLS-1$ if (System.getenv("SHELL") != null && !"".equals(System.getenv("SHELL").trim())) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -294,7 +294,7 @@ public ITerminalConnector createTerminalConnector(Map properties // Check for the terminal connector id String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); if (connectorId == null) - connectorId = "org.eclipse.tm.terminal.connector.local.LocalConnector"; //$NON-NLS-1$ + connectorId = "org.eclipse.terminal.connector.local.LocalConnector"; //$NON-NLS-1$ // Extract the process properties using defaults String image; @@ -308,7 +308,7 @@ public ITerminalConnector createTerminalConnector(Map properties String arguments = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS); if (arguments == null && !Platform.OS_WIN32.equals(Platform.getOS())) { - arguments = org.eclipse.tm.terminal.view.ui.activator.UIPlugin.getScopedPreferences() + arguments = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences() .getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java similarity index 87% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java index 18a1c9acb70..5b36e1a7a49 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.local.launcher; +package org.eclipse.terminal.connector.local.launcher; import java.util.HashMap; import java.util.Map; @@ -21,9 +21,9 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPathEditorInput; import org.eclipse.ui.handlers.HandlerUtil; @@ -58,7 +58,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException { // Find the local terminal launcher delegate ILauncherDelegate delegate = null; for (ILauncherDelegate candidate : delegates) { - if ("org.eclipse.tm.terminal.connector.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$ + if ("org.eclipse.terminal.connector.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$ delegate = candidate; break; } diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalMementoHandler.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalMementoHandler.java index 393db3ff9aa..7860119dd0d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalMementoHandler.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.local.launcher; +package org.eclipse.terminal.connector.local.launcher; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/.project b/terminal/plugins/org.eclipse.tm.terminal.connector.process/.project index 92d9bc9fd90..79a0e28ce6e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.connector.process + org.eclipse.terminal.connector.process diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF index 8f27af122e3..dd2f9fd4351 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF @@ -1,24 +1,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.connector.process;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.connector.process;singleton:=true Bundle-Version: 4.10.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.connector.process.activator.UIPlugin +Bundle-Activator: org.eclipse.terminal.connector.process.activator.UIPlugin Bundle-Vendor: %providerName Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native, org.eclipse.cdt.utils.spawner;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.runtime;bundle-version="[3.33.0,4)", - 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.control;bundle-version="[5.6.0,6.0.0)", + 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.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.process, - org.eclipse.tm.terminal.connector.process.activator;x-internal:=true, - org.eclipse.tm.terminal.connector.process.help, - org.eclipse.tm.terminal.connector.process.nls;x-internal:=true +Export-Package: org.eclipse.terminal.connector.process, + org.eclipse.terminal.connector.process.activator;x-internal:=true, + org.eclipse.terminal.connector.process.help, + org.eclipse.terminal.connector.process.nls;x-internal:=true Automatic-Module-Name: org.eclipse.tm.terminal.connector.process diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml index 4b981ff8272..c818e08e5de 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/plugin.xml @@ -13,20 +13,20 @@ - + - + diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessConnector.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessConnector.java index 7b519189445..354dd83938b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessConnector.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Kaloyan Raev - Bug 485658 - NPE prevents displaying the actual error *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process; +package org.eclipse.terminal.connector.process; import java.io.File; import java.io.IOException; @@ -31,18 +31,18 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.emulator.VT100Emulator; -import org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.connector.process.activator.UIPlugin; -import org.eclipse.tm.terminal.connector.process.nls.Messages; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tm.terminal.view.core.utils.Env; -import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; -import org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector; +import org.eclipse.terminal.connector.process.activator.UIPlugin; +import org.eclipse.terminal.connector.process.nls.Messages; +import org.eclipse.terminal.internal.emulator.VT100Emulator; +import org.eclipse.terminal.internal.emulator.VT100TerminalControl; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.NullSettingsStore; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.terminal.view.core.utils.Env; +import org.eclipse.terminal.view.ui.manager.ConsoleManager; +import org.eclipse.terminal.view.ui.streams.AbstractStreamsConnector; /** * Process connector implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessLauncherDelegate.java similarity index 82% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessLauncherDelegate.java index 89c114365c6..7e8daf4b07c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessLauncherDelegate.java @@ -9,23 +9,23 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process; +package org.eclipse.terminal.connector.process; import java.util.Map; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; -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.TerminalConnectorExtension; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Process launcher delegate implementation. @@ -62,7 +62,7 @@ public ITerminalConnector createTerminalConnector(Map properties // Check for the terminal connector id String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); if (connectorId == null) - connectorId = "org.eclipse.tm.terminal.connector.process.ProcessConnector"; //$NON-NLS-1$ + connectorId = "org.eclipse.terminal.connector.process.ProcessConnector"; //$NON-NLS-1$ // Extract the process properties String image = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_PATH); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessMonitor.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessMonitor.java index f40cca74fd0..20b57cc9706 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessMonitor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessMonitor.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process; +package org.eclipse.terminal.connector.process; import org.eclipse.core.runtime.Assert; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettings.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettings.java index 51c30a8ca57..1f6092fbd85 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettings.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process; +package org.eclipse.terminal.connector.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.ui.internal.SettingsStore; /** * Process connector settings implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettingsPage.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettingsPage.java index 3560c2021bc..2cc8c7d5d08 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettingsPage.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process; +package org.eclipse.terminal.connector.process; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.core.runtime.Assert; @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.AbstractSettingsPage; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/activator/UIPlugin.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/activator/UIPlugin.java index 00a56ddb17e..72e48a0759b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/activator/UIPlugin.java @@ -9,14 +9,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process.activator; +package org.eclipse.terminal.connector.process.activator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; 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.tracing.TraceHandler; +import org.eclipse.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -52,7 +52,7 @@ public static String getUniqueIdentifier() { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tm.terminal.connector.process"; //$NON-NLS-1$ + return "org.eclipse.terminal.connector.process"; //$NON-NLS-1$ } /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/help/IContextHelpIds.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/help/IContextHelpIds.java index 7c6dcb752bf..786d6d720ec 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/help/IContextHelpIds.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/help/IContextHelpIds.java @@ -9,9 +9,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process.help; +package org.eclipse.terminal.connector.process.help; -import org.eclipse.tm.terminal.connector.process.activator.UIPlugin; +import org.eclipse.terminal.connector.process.activator.UIPlugin; /** * Context help id definitions. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.java index 9e53c53460b..b0a72c09bc5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.process.nls; +package org.eclipse.terminal.connector.process.nls; import org.eclipse.osgi.util.NLS; @@ -19,7 +19,7 @@ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.process.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.process.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/.project b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/.project index be963dbfb21..657f06a9abe 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.connector.ssh + org.eclipse.terminal.connector.ssh diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF index 7e4f489eb48..42f51f037ef 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF @@ -1,25 +1,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.connector.ssh;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.connector.ssh;singleton:=true Bundle-Version: 4.9.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin +Bundle-Activator: org.eclipse.terminal.connector.ssh.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.equinox.security;bundle-version="[1.4.600,2)", - 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.control;bundle-version="[5.6.0,6.0.0)", + org.eclipse.terminal.view.core;bundle-version="[4.11.0,5.0.0)", + org.eclipse.terminal.view.ui;bundle-version="[4.12.0,5.0.0)", + org.eclipse.terminal.control;bundle-version="[5.6.100,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)", com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)", org.eclipse.jsch.core;bundle-version="[1.5.600,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.connector.ssh.activator;x-internal:=true, - org.eclipse.tm.terminal.connector.ssh.connector, - org.eclipse.tm.terminal.connector.ssh.controls, - org.eclipse.tm.terminal.connector.ssh.launcher, - org.eclipse.tm.terminal.connector.ssh.nls;x-internal:=true +Export-Package: org.eclipse.terminal.connector.ssh.activator;x-internal:=true, + org.eclipse.terminal.connector.ssh.connector, + org.eclipse.terminal.connector.ssh.controls, + org.eclipse.terminal.connector.ssh.launcher, + org.eclipse.terminal.connector.ssh.nls;x-internal:=true Automatic-Module-Name: org.eclipse.tm.terminal.connector.ssh diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml index 5c9ea94f3c4..932ad7378d4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/plugin.xml @@ -13,18 +13,18 @@ - + + id="org.eclipse.terminal.connector.ssh.SshConnector" + class="org.eclipse.terminal.connector.ssh.connector.SshConnector"/> - + @@ -32,7 +32,7 @@ diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/activator/UIPlugin.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/activator/UIPlugin.java index ab8e0a59dec..7cfe65dcb29 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/activator/UIPlugin.java @@ -9,14 +9,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.activator; +package org.eclipse.terminal.connector.ssh.activator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jsch.core.IJSchService; import org.eclipse.swt.graphics.Image; -import org.eclipse.tm.terminal.connector.ssh.connector.SshConnection; -import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; +import org.eclipse.terminal.connector.ssh.connector.SshConnection; +import org.eclipse.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -55,7 +55,7 @@ public static String getUniqueIdentifier() { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tm.terminal.connector.ssh"; //$NON-NLS-1$ + return "org.eclipse.terminal.connector.ssh"; //$NON-NLS-1$ } /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshConstants.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshConstants.java index 0d4bd371467..1f6c1361e05 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshConstants.java @@ -12,7 +12,7 @@ * Martin Oberhuber (Wind River) - extracted from various team.cvs plugins * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; /** * Defines the constants used by the terminal.ssh Plugin diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshSettings.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshSettings.java index 65d2b0c69e4..ca69f7010ef 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/ISshSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/ISshSettings.java @@ -10,9 +10,9 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; public interface ISshSettings { diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java index d7f7b74b663..836564e811c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/KeyboardInteractiveDialog.java @@ -12,7 +12,7 @@ * IBM Corporation - ongoing maintenance * Martin Oberhuber (Wind River) - copied and adapted from team.cvs.ui *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnection.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnection.java index ee92426bfe1..014c9f57ff5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnection.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnection.java @@ -22,7 +22,7 @@ * Andrei Sobolev (Xored) - [250456] Ssh banner message causes IllegalArgumentException popup * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import java.io.IOException; import java.io.InputStream; @@ -37,10 +37,10 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin; +import org.eclipse.terminal.connector.ssh.activator.UIPlugin; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSchException; @@ -376,7 +376,6 @@ public void run() { private void connectFailed(String terminalText, String msg) { Logger.log(terminalText); fControl.displayTextInTerminal(terminalText); - // fControl.setMsg(msg); } } \ No newline at end of file diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnector.java similarity index 87% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnector.java index a402fdc8b70..c9477bc30da 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshConnector.java @@ -13,16 +13,16 @@ * Martin Oberhuber (Wind River) - [225792] Rename SshConnector.getTelnetSettings() to getSshSettings() * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import java.io.InputStream; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.NullSettingsStore; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSch; @@ -108,7 +108,7 @@ void setOutputStream(OutputStream outputStream) { * Return the SSH Settings. * * @return the settings for a concrete connection. - * @since org.eclipse.tm.terminal.ssh 2.0 renamed from getTelnetSettings() + * @since org.eclipse.terminal.ssh 2.0 renamed from getTelnetSettings() */ public ISshSettings getSshSettings() { return fSettings; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshMessages.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshMessages.java index 3e8bf0cc648..b4fa434771e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshMessages.java @@ -13,7 +13,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Martin Oberhuber (Wind River) - [206919] Improve SSH Terminal Error Reporting (Adopting code from org.eclipse.team.cvs.core) *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import java.lang.reflect.Field; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshMessages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshMessages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshMessages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettings.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettings.java index ea8ad058fbd..b648f08f20e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettings.java @@ -14,9 +14,9 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Bryan Hunt - [313991] cannot programatically pass password to SshConnector *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; public class SshSettings implements ISshSettings { protected String fHost; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettingsPage.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettingsPage.java index 043ea44c959..e90d47c3de1 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/SshSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/SshSettingsPage.java @@ -13,7 +13,7 @@ * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; +import org.eclipse.terminal.internal.provisional.api.AbstractSettingsPage; public class SshSettingsPage extends AbstractSettingsPage { private Text fHostText; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/UserValidationDialog.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/UserValidationDialog.java index 8047ac91579..214261144a7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/connector/UserValidationDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/connector/UserValidationDialog.java @@ -11,7 +11,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - copied from org.eclipse.team.cvs.ui *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.connector; +package org.eclipse.terminal.connector.ssh.connector; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java index 09eec0e1f7a..9a525b30571 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.controls; +package org.eclipse.terminal.connector.ssh.controls; import java.util.HashMap; import java.util.Map; @@ -29,18 +29,18 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.terminal.connector.ssh.connector.SshConnector; -import org.eclipse.tm.terminal.connector.ssh.connector.SshSettings; -import org.eclipse.tm.terminal.connector.ssh.connector.SshSettingsPage; -import org.eclipse.tm.terminal.connector.ssh.nls.Messages; -import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; -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.connector.ssh.connector.SshConnector; +import org.eclipse.terminal.connector.ssh.connector.SshSettings; +import org.eclipse.terminal.connector.ssh.connector.SshSettingsPage; +import org.eclipse.terminal.connector.ssh.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.AbstractSettingsPage; +import org.eclipse.terminal.internal.provisional.api.ISettingsPage; +import org.eclipse.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +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; /** * SSH wizard configuration panel implementation. @@ -64,9 +64,6 @@ public SshWizardConfigurationPanel(IConfigurationPanelContainer container) { super(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -107,9 +104,6 @@ public void onSettingsPageChanged(Control control) { setControl(panel); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) - */ @Override public void setupData(Map data) { if (data == null || sshSettings == null || sshSettingsPage == null) @@ -169,9 +163,6 @@ private String getDefaultUser() { return System.getProperty("user.name"); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) - */ @Override public void extractData(Map data) { if (data == null) @@ -179,7 +170,7 @@ public void extractData(Map data) { // set the terminal connector id for ssh data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, - "org.eclipse.tm.terminal.connector.ssh.SshConnector"); //$NON-NLS-1$ + "org.eclipse.terminal.connector.ssh.SshConnector"); //$NON-NLS-1$ sshSettingsPage.saveSettings(); data.put(ITerminalsConnectorConstants.PROP_IP_HOST, sshSettings.getHost()); @@ -191,9 +182,6 @@ public void extractData(Map data) { data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding()); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) - */ @Override protected void fillSettingsForHost(String host) { boolean saveUser = true; @@ -248,18 +236,12 @@ protected void fillSettingsForHost(String host) { } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { saveSettingsForHost(true); super.doSaveWidgetValues(settings, idPrefix); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) - */ @Override protected void saveSettingsForHost(boolean add) { boolean saveUser = userButton.getSelection(); @@ -378,9 +360,6 @@ private String accessSecurePassword(String host) { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#removeSecurePassword(java.lang.String) - */ @Override protected void removeSecurePassword(String host) { Assert.isNotNull(host); @@ -397,17 +376,11 @@ protected void removeSecurePassword(String host) { } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() - */ @Override public boolean isValid() { return isEncodingValid() && sshSettingsPage.validateSettings(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() - */ @Override protected String getHostFromSettings() { sshSettingsPage.saveSettings(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshLauncherDelegate.java similarity index 76% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshLauncherDelegate.java index 321a847a491..d381d05c9c4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshLauncherDelegate.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.launcher; +package org.eclipse.terminal.connector.ssh.launcher; import java.text.DateFormat; import java.util.Date; @@ -18,21 +18,21 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.util.NLS; -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.TerminalConnectorExtension; -import org.eclipse.tm.terminal.connector.ssh.connector.ISshSettings; -import org.eclipse.tm.terminal.connector.ssh.connector.SshSettings; -import org.eclipse.tm.terminal.connector.ssh.controls.SshWizardConfigurationPanel; -import org.eclipse.tm.terminal.connector.ssh.nls.Messages; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.connector.ssh.connector.ISshSettings; +import org.eclipse.terminal.connector.ssh.connector.SshSettings; +import org.eclipse.terminal.connector.ssh.controls.SshWizardConfigurationPanel; +import org.eclipse.terminal.connector.ssh.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * SSH launcher delegate implementation. @@ -42,25 +42,16 @@ public class SshLauncherDelegate extends AbstractLauncherDelegate { // The SSH terminal connection memento handler private final IMementoHandler mementoHandler = new SshMementoHandler(); - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() - */ @Override public boolean needsUserConfiguration() { return true; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) - */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { return new SshWizardConfigurationPanel(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); @@ -128,9 +119,6 @@ public T getAdapter(Class adapter) { return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) - */ @Override public ITerminalConnector createTerminalConnector(Map properties) { Assert.isNotNull(properties); @@ -138,7 +126,7 @@ public ITerminalConnector createTerminalConnector(Map properties // Check for the terminal connector id String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); if (connectorId == null) - connectorId = "org.eclipse.tm.terminal.connector.ssh.SshConnector"; //$NON-NLS-1$ + connectorId = "org.eclipse.terminal.connector.ssh.SshConnector"; //$NON-NLS-1$ // Extract the ssh properties String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshMementoHandler.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshMementoHandler.java index b7b5f4b65f1..d62f9b59723 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/launcher/SshMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/launcher/SshMementoHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.launcher; +package org.eclipse.terminal.connector.ssh.launcher; import java.util.Map; @@ -17,8 +17,8 @@ import org.eclipse.equinox.security.storage.ISecurePreferences; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** @@ -26,9 +26,6 @@ */ public class SshMementoHandler implements IMementoHandler { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void saveState(IMemento memento, Map properties) { Assert.isNotNull(memento); @@ -80,9 +77,6 @@ public void saveState(IMemento memento, Map properties) { */ } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void restoreState(IMemento memento, Map properties) { Assert.isNotNull(memento); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/nls/Messages.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/nls/Messages.java index 61978ceb6df..6db1efa2360 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/nls/Messages.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.ssh.nls; +package org.eclipse.terminal.connector.ssh.nls; import org.eclipse.osgi.util.NLS; @@ -20,7 +20,7 @@ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.ssh.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.ssh.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/nls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.project b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.project index 83045227a60..ffa7573cf13 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.connector.telnet + org.eclipse.terminal.connector.telnet diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/.api_filters b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/.api_filters deleted file mode 100644 index b44d5989d5e..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF index 6b6a09fe5e9..c8375b01a9a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF @@ -1,23 +1,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.connector.telnet;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.connector.telnet;singleton:=true Bundle-Version: 4.9.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.connector.telnet.activator.UIPlugin +Bundle-Activator: org.eclipse.terminal.connector.telnet.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.equinox.security;bundle-version="[1.4.600,2)", - 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.control;bundle-version="[5.6.0,6.0.0)", + 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.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.telnet.activator;x-internal:=true, - org.eclipse.tm.terminal.connector.telnet.connector, - org.eclipse.tm.terminal.connector.telnet.controls, - org.eclipse.tm.terminal.connector.telnet.launcher, - org.eclipse.tm.terminal.connector.telnet.nls;x-internal:=true +Export-Package: org.eclipse.terminal.connector.telnet.activator;x-internal:=true, + org.eclipse.terminal.connector.telnet.connector, + org.eclipse.terminal.connector.telnet.controls, + org.eclipse.terminal.connector.telnet.launcher, + org.eclipse.terminal.connector.telnet.nls;x-internal:=true Automatic-Module-Name: org.eclipse.tm.terminal.connector.telnet diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml index dc9d728cb06..9fe12af7952 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/plugin.xml @@ -13,18 +13,18 @@ - + + id="org.eclipse.terminal.connector.telnet.TelnetConnector" + class="org.eclipse.terminal.connector.telnet.connector.TelnetConnector"/> - + @@ -32,7 +32,7 @@ diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/activator/UIPlugin.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/activator/UIPlugin.java index b85e25876b3..4029891000f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/activator/UIPlugin.java @@ -10,12 +10,12 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.activator; +package org.eclipse.terminal.connector.telnet.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.tracing.TraceHandler; +import org.eclipse.terminal.view.core.tracing.TraceHandler; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -50,7 +50,7 @@ public static String getUniqueIdentifier() { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tm.terminal.connector.telnet"; //$NON-NLS-1$ + return "org.eclipse.terminal.connector.telnet"; //$NON-NLS-1$ } /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/ITelnetSettings.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/ITelnetSettings.java index b59413ca745..ed758e87d54 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/ITelnetSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/ITelnetSettings.java @@ -11,9 +11,9 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; /** * @noimplement This interface is not intended to be implemented by clients. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/NetworkPortMap.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/NetworkPortMap.java index 5fb593acd18..d306d9876db 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/NetworkPortMap.java @@ -16,7 +16,7 @@ * Michael Scharf (Wind River) - extracted from TerminalNetworkPortMap * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.util.ArrayList; import java.util.List; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetCodes.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetCodes.java index 21edea869da..f366a5244a7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetCodes.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetCodes.java @@ -14,7 +14,7 @@ * Michael Scharf (Wind River) - split into core, view and connector plugins * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; /** * This interface defines symbolic constants for numeric TELNET protocol command and diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnectWorker.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnectWorker.java index d2ab614884a..975e97f7df5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnectWorker.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnectWorker.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Uwe Stieber (Wind River) - [287158][terminal][telnet] Connect worker is giving up to early *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.net.ConnectException; import java.net.InetSocketAddress; @@ -25,9 +25,9 @@ import java.net.SocketTimeoutException; import java.net.UnknownHostException; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; class TelnetConnectWorker extends Thread { private final ITerminalControl fControl; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnection.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnection.java index 5fc89213ec5..a4ed67582fd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnection.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnection.java @@ -18,7 +18,7 @@ * Uwe Stieber (Wind River) - [281329] Telnet connection not handling "SocketException: Connection reset" correct * Nils Hagge (Siemens AG) - [276023] close socket streams after connection is disconnected *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.io.IOException; import java.io.InputStream; @@ -26,9 +26,9 @@ import java.net.Socket; import java.net.SocketException; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; /** * This class encapsulates a TELNET connection to a remote server. It processes diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnector.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnector.java index 13c994db808..c81894c92d6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetConnector.java @@ -20,7 +20,7 @@ * David Sciamma (Anyware-Tech) - [288254][telnet] local echo is always disabled * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.io.FilterOutputStream; import java.io.IOException; @@ -28,12 +28,12 @@ import java.io.OutputStream; import java.net.Socket; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.NullSettingsStore; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; public class TelnetConnector extends TerminalConnectorImpl { diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetMessages.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetMessages.java index b05c6f03e4e..b782105ad04 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetMessages.java @@ -11,7 +11,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import org.eclipse.osgi.util.NLS; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetMessages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetMessages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetMessages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetOption.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetOption.java index 3889188dc38..6fe970924f9 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetOption.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetOption.java @@ -18,13 +18,13 @@ * Martin Oberhuber (Wind River) - [267181] Fix telnet option negotiation loop * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.Logger; /** * This class represents a single TELNET protocol option at one endpoint of a TELNET diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetProperties.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetProperties.java index c96d7455845..6361a173260 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetProperties.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetProperties.java @@ -16,7 +16,7 @@ * Michael Scharf (Wind River) - extracted from TerminalProperties * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; public class TelnetProperties { private final NetworkPortMap fNetworkPortMap; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettings.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettings.java index 4ecf960ea5c..24e5c5e8264 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettings.java @@ -16,9 +16,9 @@ * Michael Scharf (Wind River) - extracted from TerminalSettings * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; /** * @noreference This class is not intended to be referenced by clients. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettingsPage.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettingsPage.java index 435a4f1296c..b31e2f4b39a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/TelnetSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/connector/TelnetSettingsPage.java @@ -18,7 +18,7 @@ * Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings * Martin Oberhuber (Wind River) - [401476] Strip whitespace around Telnet Port *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.connector; +package org.eclipse.terminal.connector.telnet.connector; import java.util.Arrays; import java.util.Collections; @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; +import org.eclipse.terminal.internal.provisional.api.AbstractSettingsPage; public class TelnetSettingsPage extends AbstractSettingsPage { /* default */ Text fHostText; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java index 9a968fd1a4d..cf2821ff2ed 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.controls; +package org.eclipse.terminal.connector.telnet.controls; import java.util.HashMap; import java.util.Map; @@ -20,15 +20,15 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; -import org.eclipse.tm.terminal.connector.telnet.connector.NetworkPortMap; -import org.eclipse.tm.terminal.connector.telnet.connector.TelnetConnector; -import org.eclipse.tm.terminal.connector.telnet.connector.TelnetSettings; -import org.eclipse.tm.terminal.connector.telnet.connector.TelnetSettingsPage; -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.connector.telnet.connector.NetworkPortMap; +import org.eclipse.terminal.connector.telnet.connector.TelnetConnector; +import org.eclipse.terminal.connector.telnet.connector.TelnetSettings; +import org.eclipse.terminal.connector.telnet.connector.TelnetSettingsPage; +import org.eclipse.terminal.internal.provisional.api.AbstractSettingsPage; +import org.eclipse.terminal.internal.provisional.api.ISettingsPage; +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; /** * telnet wizard configuration panel implementation. @@ -120,7 +120,7 @@ public void extractData(Map data) { // set the terminal connector id for ssh data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID, - "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"); //$NON-NLS-1$ + "org.eclipse.terminal.connector.telnet.TelnetConnector"); //$NON-NLS-1$ telnetSettingsPage.saveSettings(); data.put(ITerminalsConnectorConstants.PROP_IP_HOST, telnetSettings.getHost()); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java similarity index 81% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java index 5a16fc23415..36efec7db0c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.launcher; +package org.eclipse.terminal.connector.telnet.launcher; import java.text.DateFormat; import java.util.Date; @@ -18,20 +18,20 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.util.NLS; -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.TerminalConnectorExtension; -import org.eclipse.tm.terminal.connector.telnet.connector.TelnetSettings; -import org.eclipse.tm.terminal.connector.telnet.controls.TelnetWizardConfigurationPanel; -import org.eclipse.tm.terminal.connector.telnet.nls.Messages; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.connector.telnet.connector.TelnetSettings; +import org.eclipse.terminal.connector.telnet.controls.TelnetWizardConfigurationPanel; +import org.eclipse.terminal.connector.telnet.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Telnet launcher delegate implementation. @@ -115,7 +115,7 @@ public ITerminalConnector createTerminalConnector(Map properties // Check for the terminal connector id String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); if (connectorId == null) - connectorId = "org.eclipse.tm.terminal.connector.telnet.TelnetConnector"; //$NON-NLS-1$ + connectorId = "org.eclipse.terminal.connector.telnet.TelnetConnector"; //$NON-NLS-1$ // Extract the telnet properties String host = (String) properties.get(ITerminalsConnectorConstants.PROP_IP_HOST); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetMementoHandler.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetMementoHandler.java index ae5d921041e..28d04341b65 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/launcher/TelnetMementoHandler.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.launcher; +package org.eclipse.terminal.connector.telnet.launcher; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; import org.eclipse.ui.IMemento; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/nls/Messages.java similarity index 87% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/nls/Messages.java index d223e942a6c..6b1947eb034 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/nls/Messages.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [366374] [TERMINALS][TELNET] Add Telnet terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.connector.telnet.nls; +package org.eclipse.terminal.connector.telnet.nls; import org.eclipse.osgi.util.NLS; @@ -20,7 +20,7 @@ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.telnet.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.telnet.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/terminal/connector/telnet/nls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/.project b/terminal/plugins/org.eclipse.tm.terminal.control/.project index 11e18c380e4..7349edb2e70 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.control/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.control + org.eclipse.terminal.control diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF index 2a130b4f10b..2f203df49a2 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.control; singleton:=true Bundle-Version: 5.6.100.qualifier -Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin +Bundle-Activator: org.eclipse.terminal.internal.control.impl.TerminalPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -11,15 +11,15 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.tm.internal.terminal.connector;x-internal:=true, - org.eclipse.tm.internal.terminal.control, - org.eclipse.tm.internal.terminal.control.actions, - org.eclipse.tm.internal.terminal.control.impl;x-internal:=true, - org.eclipse.tm.internal.terminal.emulator;x-internal:=true, - org.eclipse.tm.internal.terminal.model;x-internal:=true, - org.eclipse.tm.internal.terminal.preferences, - org.eclipse.tm.internal.terminal.provisional.api, - org.eclipse.tm.internal.terminal.provisional.api.provider, - org.eclipse.tm.internal.terminal.textcanvas;x-internal:=true, - org.eclipse.tm.terminal.model -Automatic-Module-Name: org.eclipse.tm.terminal.control +Export-Package: org.eclipse.terminal.internal.connector;x-internal:=true, + org.eclipse.terminal.internal.control, + org.eclipse.terminal.internal.control.actions, + org.eclipse.terminal.internal.control.impl;x-internal:=true, + org.eclipse.terminal.internal.emulator;x-internal:=true, + org.eclipse.terminal.internal.model;x-internal:=true, + org.eclipse.terminal.internal.preferences, + org.eclipse.terminal.internal.provisional.api, + org.eclipse.terminal.internal.provisional.api.provider, + org.eclipse.terminal.internal.textcanvas;x-internal:=true, + org.eclipse.terminal.model +Automatic-Module-Name: org.eclipse.terminal.control diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml index ee9eaaf0a03..a32544ece25 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml @@ -26,13 +26,13 @@ name="%terminal.context.name.terminal" description="%terminal.context.description.terminal" parentId="org.eclipse.ui.contexts.window" - id="org.eclipse.tm.terminal.TerminalContext" + id="org.eclipse.terminal.TerminalContext" /> + id="org.eclipse.terminal.EditContext" /> @@ -42,29 +42,29 @@ point="org.eclipse.ui.commands"> @@ -82,88 +82,88 @@ keys. --> @@ -231,14 +231,14 @@ --> @@ -246,13 +246,13 @@ + class="org.eclipse.terminal.internal.preferences.TerminalPreferencePage" + id="org.eclipse.terminal.TerminalPreferencePage"> - + diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd b/terminal/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd index 8a0862cf413..c1d9fc3eb10 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd +++ b/terminal/plugins/org.eclipse.tm.terminal.control/schema/connectors.exsd @@ -1,9 +1,9 @@ - + - + @@ -55,7 +55,7 @@ A class extending TerminalConnectorImpl - + diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalConnector.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalConnector.java index 3737a5cde3f..b3868ebfea6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalConnector.java @@ -13,21 +13,21 @@ * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import java.io.OutputStream; import java.util.Optional; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -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.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.control.impl.TerminalMessages; +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.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; /** * An {@link ITerminalConnector} instance, also known as terminal connection @@ -47,14 +47,12 @@ * @noinstantiate This class is not intended to be instantiated by clients. * Clients can get terminal connector instances through the * {@link TerminalConnectorExtension} class. - * @since org.eclipse.tm.terminal 2.0 */ public class TerminalConnector implements ITerminalConnector { /** * Creates an instance of TerminalConnectorImpl. This is used to lazily load * classed defined in extensions. * - * @since org.eclipse.tm.terminal 2.0 */ public interface Factory { /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStream.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStream.java index ea4b24273a0..eba2b3f8613 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStream.java @@ -10,7 +10,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import java.io.ByteArrayOutputStream; import java.io.FilterOutputStream; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/CommandInputFieldWithHistory.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/CommandInputFieldWithHistory.java index 7c51a7445fc..0495f292830 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/CommandInputFieldWithHistory.java @@ -15,7 +15,7 @@ * Michael Scharf (Wing River) - [236458] Fix 168197 lost the last entry * Anton Leherbauer (Wind River) - [220971] The optional terminal input line has redraw problems when resizing *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; import java.util.ArrayList; import java.util.HashSet; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ICommandInputField.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ICommandInputField.java index 874247b3fb3..18da156c60f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ICommandInputField.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Composite; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener.java similarity index 84% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener.java index e529aeeddf2..f37c7c31316 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener.java @@ -11,10 +11,10 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.TerminalState; /** * Provided by a view implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener2.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener2.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener2.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener2.java index 30f22f82ba0..4c08cbc0a5d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener2.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener2.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; /** * Terminal listener allowing to listen to terminal selection changes. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener3.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener3.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener3.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener3.java index 6cbf1711f47..a3ab8463a89 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalListener3.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalListener3.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; /** * Terminal listener allowing to listen to terminal selection changes. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener.java index 0de6ff105ae..5c6f772a4aa 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener.java @@ -9,9 +9,9 @@ * Contributors: * Davy Landman (CWI) - [475267][api] Initial definition of interface *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; /** * Terminal specific version of {@link org.eclipse.swt.events.MouseListener} diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener2.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener2.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener2.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener2.java index e33a663ab5a..93f510880a3 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalMouseListener2.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalMouseListener2.java @@ -6,9 +6,9 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; /** * Extension of {@link ITerminalMouseListener} for consumers that need the stateMask for a button mouse action. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalViewControl.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalViewControl.java index 526ce961e5c..4d26610df4b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/ITerminalViewControl.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically * Davy Landman (CWI) - [475267][api] Allow custom mouse listeners ******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; @@ -22,10 +22,10 @@ import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Control; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -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.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; /** * @author Michael Scharf @@ -39,7 +39,6 @@ public interface ITerminalViewControl { * characters. * * @see ITerminalControl#setEncoding(String) - * @since org.eclipse.tm.terminal 2.0 * @deprecated Use {@link #setCharset(Charset)} and do the error handling in the UI code. */ @Deprecated @@ -59,7 +58,6 @@ public interface ITerminalViewControl { * * @return the current Encoding of the Terminal. * @see ITerminalControl#getEncoding() - * @since org.eclipse.tm.terminal 2.0 * @deprecated Use {@link #getCharset()} and call {@link Charset#name()} on the result */ @Deprecated diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/TerminalViewControlFactory.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/TerminalViewControlFactory.java index b04fb597701..11140d6b958 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/TerminalViewControlFactory.java @@ -10,11 +10,11 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control; +package org.eclipse.terminal.internal.control; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.emulator.VT100TerminalControl; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; public class TerminalViewControlFactory { /** @@ -34,7 +34,7 @@ public static ITerminalViewControl makeControl(ITerminalListener target, Composi * @param wndParent The Window parent to embed the Terminal in. * @param connectors Provided connectors. * @param useCommonPrefs If true, the Terminal widget will pick up settings - * from the org.eclipse.tm.terminal.TerminalPreferencePage Preference page. + * from the org.eclipse.terminal.TerminalPreferencePage Preference page. * Otherwise, clients need to maintain settings themselves. * @since 3.2 */ diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/AbstractTerminalAction.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/AbstractTerminalAction.java index 776f8ede4c1..ec6b41945db 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/AbstractTerminalAction.java @@ -17,13 +17,13 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Anna Dushistova (MontaVista) - Adapted from TerminalAction *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; public abstract class AbstractTerminalAction extends Action { private final ITerminalViewControl fTarget; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ActionMessages.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ActionMessages.java index b613258f390..359da2eb535 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ActionMessages.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; import org.eclipse.osgi.util.NLS; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ActionMessages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ActionMessages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ImageConsts.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ImageConsts.java index 5d3852f41b7..77085dc91ce 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/ImageConsts.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; public interface ImageConsts { public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$ diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionClearAll.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionClearAll.java index fb3e4a244de..855173cf38c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionClearAll.java @@ -18,9 +18,9 @@ * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin * Uwe Stieber (Wind River) - [260372] [terminal] Certain terminal actions are enabled if no target terminal control is available ********************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.ITerminalViewControl; public class TerminalActionClearAll extends AbstractTerminalAction { public TerminalActionClearAll() { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCopy.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCopy.java index d504de61786..6d4bdaf8624 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCopy.java @@ -18,16 +18,16 @@ * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin * Uwe Stieber (Wind River) - [260372] [terminal] Certain terminal actions are enabled if no target terminal control is available *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.ITerminalViewControl; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; public class TerminalActionCopy extends AbstractTerminalAction { public TerminalActionCopy() { super(TerminalActionCopy.class.getName()); - setActionDefinitionId("org.eclipse.tm.terminal.copy"); //$NON-NLS-1$ + setActionDefinitionId("org.eclipse.terminal.copy"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); setupAction(ActionMessages.COPY, ActionMessages.COPY, si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), @@ -36,7 +36,7 @@ public TerminalActionCopy() { public TerminalActionCopy(ITerminalViewControl target) { super(target, TerminalActionCopy.class.getName()); - setActionDefinitionId("org.eclipse.tm.terminal.copy"); //$NON-NLS-1$ + setActionDefinitionId("org.eclipse.terminal.copy"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); setupAction(ActionMessages.COPY, ActionMessages.COPY, si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY), diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCut.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCut.java index 172c5f3ac35..d2ae228a1ce 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionCut.java @@ -17,9 +17,9 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Uwe Stieber (Wind River) - [260372] [terminal] Certain terminal actions are enabled if no target terminal control is available *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.ITerminalViewControl; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionPaste.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionPaste.java index 2003f8e9270..179895267f9 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionPaste.java @@ -20,18 +20,18 @@ * Uwe Stieber (Wind River) - [294719] [terminal] SWT Widget disposed in TerminalActionPaste * Martin Oberhuber (Wind River) - [296212] Cannot paste text into terminal on some Linux hosts *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; public class TerminalActionPaste extends AbstractTerminalAction { public TerminalActionPaste() { super(TerminalActionPaste.class.getName()); - setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$ + setActionDefinitionId("org.eclipse.terminal.paste"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), @@ -40,7 +40,7 @@ public TerminalActionPaste() { public TerminalActionPaste(ITerminalViewControl target) { super(target, TerminalActionPaste.class.getName()); - setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$ + setActionDefinitionId("org.eclipse.terminal.paste"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionSelectAll.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionSelectAll.java index 23a6ebaa4d1..7638f1ee7d8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/actions/TerminalActionSelectAll.java @@ -18,10 +18,10 @@ * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin * Uwe Stieber (Wind River) - [260372] [terminal] Certain terminal actions are enabled if no target terminal control is available *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.actions; +package org.eclipse.terminal.internal.control.actions; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.ITerminalViewControl; public class TerminalActionSelectAll extends AbstractTerminalAction { public TerminalActionSelectAll() { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/ITerminalControlForText.java similarity index 82% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/ITerminalControlForText.java index fc492dea59d..2e7c44d6be4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/ITerminalControlForText.java @@ -10,13 +10,13 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Anton Leherbauer (Wind River) - [458398] Add support for normal/application cursor keys mode *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.impl; +package org.eclipse.terminal.internal.control.impl; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalState; /** * need a better name! diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.java index 2826d00fc31..5e03d74150d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.java @@ -10,7 +10,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.impl; +package org.eclipse.terminal.internal.control.impl; import org.eclipse.osgi.util.NLS; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java index f8a46ccda47..9b096fda6a7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin *******************************************************************************/ -package org.eclipse.tm.internal.terminal.control.impl; +package org.eclipse.terminal.internal.control.impl; import java.net.MalformedURLException; import java.net.URL; @@ -25,13 +25,13 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.tm.internal.terminal.control.actions.ImageConsts; +import org.eclipse.terminal.internal.control.actions.ImageConsts; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; public class TerminalPlugin extends AbstractUIPlugin { private static TerminalPlugin plugin; - public static final String PLUGIN_ID = "org.eclipse.tm.terminal.control"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.terminal.control"; //$NON-NLS-1$ public static final String HELP_VIEW = PLUGIN_ID + ".terminal_view"; //$NON-NLS-1$ /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/EditActionAccelerators.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/EditActionAccelerators.java index af825928674..a137438ee9e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/EditActionAccelerators.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import java.util.HashMap; import java.util.Map; @@ -21,8 +21,8 @@ import org.eclipse.ui.keys.IBindingService; class EditActionAccelerators { - private static final String COPY_COMMAND_ID = "org.eclipse.tm.terminal.copy"; //$NON-NLS-1$ - private static final String PASTE_COMMAND_ID = "org.eclipse.tm.terminal.paste"; //$NON-NLS-1$ + private static final String COPY_COMMAND_ID = "org.eclipse.terminal.copy"; //$NON-NLS-1$ + private static final String PASTE_COMMAND_ID = "org.eclipse.terminal.paste"; //$NON-NLS-1$ private final Map commandIdsByAccelerator = new HashMap<>(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/IVT100EmulatorBackend.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/IVT100EmulatorBackend.java index d1e82188a9b..08ad52bd45c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/IVT100EmulatorBackend.java @@ -11,9 +11,9 @@ * Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode * Anton Leherbauer (Wind River) - [458402] Add support for scroll up/down and scroll region *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.TerminalStyle; /** * diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/LoggingOutputStream.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/LoggingOutputStream.java index 24c50555b26..ed035097530 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/LoggingOutputStream.java @@ -8,13 +8,13 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.Logger; public class LoggingOutputStream extends FilterOutputStream { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100BackendTraceDecorator.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100BackendTraceDecorator.java index 013beb1c189..a67cbff2f48 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100BackendTraceDecorator.java @@ -11,11 +11,11 @@ * Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode * Anton Leherbauer (Wind River) - [458402] Add support for scroll up/down and scroll region *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import java.io.PrintStream; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.TerminalStyle; public class VT100BackendTraceDecorator implements IVT100EmulatorBackend { final IVT100EmulatorBackend fBackend; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java index bc7245740f7..0043f51c344 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java @@ -27,16 +27,16 @@ * Anton Leherbauer (Wind River) - [458398] Add support for normal/application cursor keys mode * Anton Leherbauer (Wind River) - [458402] Add support for scroll up/down and scroll region *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.BLUE; +import static org.eclipse.terminal.model.TerminalColor.CYAN; +import static org.eclipse.terminal.model.TerminalColor.GREEN; +import static org.eclipse.terminal.model.TerminalColor.MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.WHITE; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; import java.io.IOException; import java.io.Reader; @@ -45,13 +45,13 @@ import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.graphics.RGB; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.control.impl.ITerminalControlForText; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.impl.ITerminalControlForText; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.TerminalStyle; /** * This class processes character data received from the remote host and @@ -255,7 +255,7 @@ public void fontChanged() { // /** // * This method executes in the Display thread to process data received from - // * the remote host by class {@link org.eclipse.tm.internal.terminal.telnet.TelnetConnection} and + // * the remote host by class {@link org.eclipse.internal.terminal.telnet.TelnetConnection} and // * other implementors of {@link ITerminalConnector}, like the // * SerialPortHandler. // *

diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackend.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackend.java index 14d79198ce1..b5072e16415 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackend.java @@ -12,10 +12,10 @@ * Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode * Anton Leherbauer (Wind River) - [458402] Add support for scroll up/down and scroll region *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.TerminalStyle; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java index ec5bfa0078c..e350264c3b8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java @@ -43,7 +43,7 @@ * Anton Leherbauer (Wind River) - [420928] Terminal widget leaks memory * Davy Landman (CWI) - [475267][api] Allow custom mouse listeners *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import java.io.IOException; import java.io.InputStreamReader; @@ -95,30 +95,30 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.control.ICommandInputField; -import org.eclipse.tm.internal.terminal.control.ITerminalListener; -import org.eclipse.tm.internal.terminal.control.ITerminalListener2; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.control.ITerminalMouseListener; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.impl.ITerminalControlForText; -import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.preferences.ITerminalConstants; -import org.eclipse.tm.internal.terminal.preferences.TerminalColorPresets; -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.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.textcanvas.PipedInputStream; -import org.eclipse.tm.internal.terminal.textcanvas.PollingTextCanvasModel; -import org.eclipse.tm.internal.terminal.textcanvas.TextCanvas; -import org.eclipse.tm.internal.terminal.textcanvas.TextLineRenderer; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.TerminalColor; -import org.eclipse.tm.terminal.model.TerminalTextDataFactory; +import org.eclipse.terminal.internal.control.ICommandInputField; +import org.eclipse.terminal.internal.control.ITerminalListener; +import org.eclipse.terminal.internal.control.ITerminalListener2; +import org.eclipse.terminal.internal.control.ITerminalListener3; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.ITerminalMouseListener; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.impl.ITerminalControlForText; +import org.eclipse.terminal.internal.control.impl.TerminalMessages; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.preferences.ITerminalConstants; +import org.eclipse.terminal.internal.preferences.TerminalColorPresets; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.textcanvas.PipedInputStream; +import org.eclipse.terminal.internal.textcanvas.PollingTextCanvasModel; +import org.eclipse.terminal.internal.textcanvas.TextCanvas; +import org.eclipse.terminal.internal.textcanvas.TextLineRenderer; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.TerminalColor; +import org.eclipse.terminal.model.TerminalTextDataFactory; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.contexts.IContextActivation; import org.eclipse.ui.contexts.IContextService; @@ -193,7 +193,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC * so we send 0x7f to do that. */ private boolean convertBackspace = Boolean - .parseBoolean(System.getProperty("org.eclipse.tm.terminal.control.convertBackspace", "true")); //$NON-NLS-1$ //$NON-NLS-2$ + .parseBoolean(System.getProperty("org.eclipse.terminal.control.convertBackspace", "true")); //$NON-NLS-1$ //$NON-NLS-2$ /** * Instantiate a Terminal widget. @@ -207,13 +207,13 @@ public VT100TerminalControl(ITerminalListener target, Composite wndParent, ITerm } /** - * Instantiate a Terminal widget using the org.eclipse.tm.terminal.TerminalPreferencePage Preference page's + * Instantiate a Terminal widget using the org.eclipse.terminal.TerminalPreferencePage Preference page's * default preference store. * @param target Callback for notifying the owner of Terminal state changes. * @param wndParent The Window parent to embed the Terminal in. * @param connectors Provided connectors. * @param useCommonPrefs If true, the Terminal widget will pick up settings - * from the org.eclipse.tm.terminal.TerminalPreferencePage Preference page. + * from the org.eclipse.terminal.TerminalPreferencePage Preference page. * Otherwise, clients need to maintain settings themselves. * @since 3.2 */ @@ -902,7 +902,7 @@ public void focusGained(FocusEvent event) { captureKeyEvents(true); IContextService contextService = PlatformUI.getWorkbench().getAdapter(IContextService.class); - editContextActivation = contextService.activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$ + editContextActivation = contextService.activateContext("org.eclipse.terminal.EditContext"); //$NON-NLS-1$ } @Override @@ -931,7 +931,7 @@ protected void captureKeyEvents(boolean capture) { // 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.terminal.TerminalContext"); //$NON-NLS-1$ } else if (!capture && terminalContextActivation != null) { contextService.deactivateContext(terminalContextActivation); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/ISnapshotChanges.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/ISnapshotChanges.java index 9f51f2150ac..216fa275922 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/ISnapshotChanges.java @@ -10,9 +10,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public interface ISnapshotChanges { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SnapshotChanges.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SnapshotChanges.java index c1b4638c5dc..517c0da6ec8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SnapshotChanges.java @@ -10,9 +10,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; /** * Collects the changes of the {@link ITerminalTextData} diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextData.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextData.java index 54f637a78ab..a142ef8578a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextData.java @@ -9,12 +9,12 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * This is a decorator to make all access to diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SystemDefaultColors.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SystemDefaultColors.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SystemDefaultColors.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SystemDefaultColors.java index 930a97a1e73..4e6783902f3 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SystemDefaultColors.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/SystemDefaultColors.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import java.util.function.Supplier; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextData.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextData.java index 675bfd66de2..7fda7915ef2 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextData.java @@ -12,17 +12,17 @@ * Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1 * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * This class is thread safe. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScroll.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScroll.java index 519fad0a3e1..319b88908ec 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScroll.java @@ -9,12 +9,12 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * This class is optimized for scrolling the entire {@link #getHeight()}. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshot.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshot.java index 26a6982c871..ecddf228a88 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshot.java @@ -9,16 +9,16 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * The public methods of this class have to be called from one thread! diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataStore.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataStore.java index f0472aba928..295fe95f79b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataStore.java @@ -9,17 +9,17 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * This class is thread safe. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataWindow.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataWindow.java index 31e6d625901..7894c2cdfae 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataWindow.java @@ -9,12 +9,12 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; /** * This class stores the data only within a window {@link #setWindow(int, int)} and diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/ITerminalConstants.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/ITerminalConstants.java index 9f87a310388..d3d34a76197 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/ITerminalConstants.java @@ -12,9 +12,9 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget *******************************************************************************/ -package org.eclipse.tm.internal.terminal.preferences; +package org.eclipse.terminal.internal.preferences; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.model.TerminalColor; /** * Constants for Terminal Preferences. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorPresets.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorPresets.java similarity index 66% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorPresets.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorPresets.java index 108ac7de0c2..811b81e6878 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorPresets.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorPresets.java @@ -7,28 +7,28 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.preferences; - -import static org.eclipse.tm.terminal.model.TerminalColor.BACKGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_RED; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_YELLOW; -import static org.eclipse.tm.terminal.model.TerminalColor.CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.FOREGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.SELECTION_BACKGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.SELECTION_FOREGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +package org.eclipse.terminal.internal.preferences; + +import static org.eclipse.terminal.model.TerminalColor.BACKGROUND; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.BLUE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_BLACK; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_BLUE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_CYAN; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_GREEN; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_RED; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_WHITE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_YELLOW; +import static org.eclipse.terminal.model.TerminalColor.CYAN; +import static org.eclipse.terminal.model.TerminalColor.FOREGROUND; +import static org.eclipse.terminal.model.TerminalColor.GREEN; +import static org.eclipse.terminal.model.TerminalColor.MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.SELECTION_BACKGROUND; +import static org.eclipse.terminal.model.TerminalColor.SELECTION_FOREGROUND; +import static org.eclipse.terminal.model.TerminalColor.WHITE; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; import java.util.ArrayList; import java.util.EnumMap; @@ -38,9 +38,9 @@ import java.util.stream.Collectors; import org.eclipse.swt.graphics.RGB; -import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -import org.eclipse.tm.internal.terminal.model.SystemDefaultColors; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.internal.control.impl.TerminalMessages; +import org.eclipse.terminal.internal.model.SystemDefaultColors; +import org.eclipse.terminal.model.TerminalColor; /** * @since 5.0 diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorsFieldEditor.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorsFieldEditor.java similarity index 83% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorsFieldEditor.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorsFieldEditor.java index 9611c600946..95be36ad994 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalColorsFieldEditor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalColorsFieldEditor.java @@ -7,28 +7,28 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.preferences; - -import static org.eclipse.tm.terminal.model.TerminalColor.BACKGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_RED; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.BRIGHT_YELLOW; -import static org.eclipse.tm.terminal.model.TerminalColor.CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.FOREGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.SELECTION_BACKGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.SELECTION_FOREGROUND; -import static org.eclipse.tm.terminal.model.TerminalColor.WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +package org.eclipse.terminal.internal.preferences; + +import static org.eclipse.terminal.model.TerminalColor.BACKGROUND; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.BLUE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_BLACK; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_BLUE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_CYAN; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_GREEN; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_RED; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_WHITE; +import static org.eclipse.terminal.model.TerminalColor.BRIGHT_YELLOW; +import static org.eclipse.terminal.model.TerminalColor.CYAN; +import static org.eclipse.terminal.model.TerminalColor.FOREGROUND; +import static org.eclipse.terminal.model.TerminalColor.GREEN; +import static org.eclipse.terminal.model.TerminalColor.MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.SELECTION_BACKGROUND; +import static org.eclipse.terminal.model.TerminalColor.SELECTION_FOREGROUND; +import static org.eclipse.terminal.model.TerminalColor.WHITE; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; import java.util.EnumMap; @@ -46,8 +46,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.internal.control.impl.TerminalMessages; +import org.eclipse.terminal.model.TerminalColor; /** * A field editor that can be used for editing terminal colors. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferenceInitializer.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferenceInitializer.java index d6d737459b4..05e330c9d2e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferenceInitializer.java @@ -13,15 +13,15 @@ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget * Martin Oberhuber (Wind River) - [436612] Restore Eclipse 3.4 compatibility *******************************************************************************/ -package org.eclipse.tm.internal.terminal.preferences; +package org.eclipse.terminal.internal.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.resource.StringConverter; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.preferences.TerminalColorPresets.Preset; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.preferences.TerminalColorPresets.Preset; +import org.eclipse.terminal.model.TerminalColor; /** * Terminal Preference Initializer. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferencePage.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferencePage.java index 27888302669..62e3d9a4378 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferencePage.java @@ -17,14 +17,14 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget *******************************************************************************/ -package org.eclipse.tm.internal.terminal.preferences; +package org.eclipse.terminal.internal.preferences; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IntegerFieldEditor; -import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.control.impl.TerminalMessages; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/AbstractSettingsPage.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/AbstractSettingsPage.java index 971e30e05f1..74d41b7cf2d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/AbstractSettingsPage.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.ListenerList; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsPage.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsPage.java index 33e895a0578..6391af0b6f1 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsPage.java @@ -11,7 +11,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsStore.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsStore.java index 71cfc58164b..58afcce0969 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ISettingsStore.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; /** * A simple interface to a store to persist the state of a connection. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalConnector.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalConnector.java index d1a5fe55f70..cca8349fc97 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalConnector.java @@ -13,20 +13,20 @@ * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import java.io.OutputStream; import java.util.Optional; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; /** * A contributed connection type to manage a single connection. * * Implementations of this class are contributed through the - * org.eclipse.tm.terminal.control.connectors extension point. This + * org.eclipse.terminal.control.connectors extension point. This * class gives access to the static markup of a terminal connector extension as * well as providing the lifecycle management for the dynamically loaded * {@link TerminalConnectorImpl} instance, which performs the actual @@ -54,20 +54,17 @@ public interface ITerminalConnector extends IAdaptable { /** * @return an ID of this connector. The id from the plugin.xml. - * @since org.eclipse.tm.terminal 2.0 */ String getId(); /** * @return null the name (as specified in the plugin.xml) - * @since org.eclipse.tm.terminal 2.0 */ String getName(); /** * @return True if the connector is not visible in user * selections. - * @since org.eclipse.tm.terminal 3.0.1 */ boolean isHidden(); @@ -75,7 +72,6 @@ public interface ITerminalConnector extends IAdaptable { * @return true if the {@link TerminalConnectorImpl} has been initialized. * If there was an initialization error, {@link #getInitializationErrorMessage()} * returns the error message. - * @since org.eclipse.tm.terminal 2.0 */ boolean isInitialized(); @@ -84,7 +80,6 @@ public interface ITerminalConnector extends IAdaptable { * If the connector was initialized successfully, null is * returned. Otherwise an error message describing the problem is returned. * @return null or a localized error message. - * @since org.eclipse.tm.terminal 2.0 */ String getInitializationErrorMessage(); @@ -101,7 +96,6 @@ public interface ITerminalConnector extends IAdaptable { /** * @return true if a local echo is needed. - * TODO:Michael Scharf: this should be handed within the connection.... */ boolean isLocalEcho(); @@ -116,7 +110,6 @@ public interface ITerminalConnector extends IAdaptable { * @return the terminal to remote stream (bytes written to this stream will * be sent to the remote site). For the stream in the other direction (remote to * terminal see {@link ITerminalControl#getRemoteToTerminalOutputStream()} - * @since org.eclipse.tm.terminal 2.0 */ OutputStream getTerminalToRemoteStream(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalControl.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalControl.java index 9fe9ac195eb..c606d674751 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/ITerminalControl.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend * Anton Leherbauer (Wind River) - [433751] Add option to enable VT100 line wrapping mode *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import java.io.OutputStream; import java.io.UnsupportedEncodingException; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; /** * Represents the terminal view as seen by a terminal connection. @@ -84,7 +84,6 @@ public interface ITerminalControl { * from the remote side e.g. by evaluating an environment variable such as * LANG on UNIX systems. * - * @since org.eclipse.tm.terminal 2.0 * @deprecated Use {@link #setCharset(Charset)} and do the error handling in the UI code. */ @Deprecated @@ -125,7 +124,6 @@ public interface ITerminalControl { * properly initialized. * * @return the current Encoding of the Terminal. - * @since org.eclipse.tm.terminal 2.0 * @deprecated Use {@link #getCharset()} and call {@link Charset#name()} on the result */ @Deprecated diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/Logger.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/Logger.java index 785e417117c..2c972e4af1b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/Logger.java @@ -13,7 +13,7 @@ * Michael Scharf (Wind River) - split into core, view and connector plugins * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import java.io.FileOutputStream; import java.io.PrintStream; @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; /** * A simple logger class. Every method in this class is static, so they can be @@ -44,11 +44,11 @@ *

*/ public final class Logger { - 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$ + public static final String TRACE_DEBUG_LOG = "org.eclipse.terminal.control/debug/log"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG_CHAR = "org.eclipse.terminal.control/debug/log/char"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG_VT100BACKEND = "org.eclipse.terminal.control/debug/log/VT100Backend"; //$NON-NLS-1$ /** @since 5.2 */ - public static final String TRACE_DEBUG_LOG_HOVER = "org.eclipse.tm.terminal.control/debug/log/hover"; //$NON-NLS-1$ + public static final String TRACE_DEBUG_LOG_HOVER = "org.eclipse.terminal.control/debug/log/hover"; //$NON-NLS-1$ private static PrintStream logStream; private static StackWalker walker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/NullSettingsStore.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/NullSettingsStore.java index dc7d3b668ec..28d2f798a82 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/NullSettingsStore.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; /** * A settings store implementation doing nothing. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalConnectorExtension.java similarity index 84% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalConnectorExtension.java index 1db1bbb54eb..d5c5d428950 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalConnectorExtension.java @@ -12,15 +12,15 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.RegistryFactory; -import org.eclipse.tm.internal.terminal.connector.TerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.connector.TerminalConnector; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; /** * A factory to get {@link ITerminalConnector} instances. @@ -58,15 +58,14 @@ static private ITerminalConnector makeConnector(final IConfigurationElement conf * terminal connector is not yet instantiated to any real connection. * * @param id the id of the terminal connector in the - * org.eclipse.tm.terminal.control.connectors + * org.eclipse.terminal.control.connectors * extension point * @return a new ITerminalConnector with id or null if there * is no extension with that id. - * @since org.eclipse.tm.terminal 2.0 */ public static ITerminalConnector makeTerminalConnector(String id) { IConfigurationElement[] config = RegistryFactory.getRegistry() - .getConfigurationElementsFor("org.eclipse.tm.terminal.control.connectors"); //$NON-NLS-1$ + .getConfigurationElementsFor("org.eclipse.terminal.control.connectors"); //$NON-NLS-1$ for (int i = 0; i < config.length; i++) { if (id.equals(config[i].getAttribute("id"))) { //$NON-NLS-1$ return makeConnector(config[i]); @@ -83,13 +82,12 @@ public static ITerminalConnector makeTerminalConnector(String id) { * time. * * @return a new list of {@link ITerminalConnector} instances defined in the - * org.eclipse.tm.terminal.control.connectors + * org.eclipse.terminal.control.connectors * extension point - * @since org.eclipse.tm.terminal 2.0 return value is ITerminalConnector[] */ public static ITerminalConnector[] makeTerminalConnectors() { IConfigurationElement[] config = RegistryFactory.getRegistry() - .getConfigurationElementsFor("org.eclipse.tm.terminal.control.connectors"); //$NON-NLS-1$ + .getConfigurationElementsFor("org.eclipse.terminal.control.connectors"); //$NON-NLS-1$ List result = new ArrayList<>(); for (int i = 0; i < config.length; i++) { result.add(makeConnector(config[i])); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalState.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalState.java index 2304d0a6be1..e74d7e6baf6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/TerminalState.java @@ -12,7 +12,7 @@ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api; +package org.eclipse.terminal.internal.provisional.api; /** * Represent the sate of a terminal connection. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/provider/TerminalConnectorImpl.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/provider/TerminalConnectorImpl.java index c19296bb725..fd8f80d0418 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/provisional/api/provider/TerminalConnectorImpl.java @@ -11,22 +11,21 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl *******************************************************************************/ -package org.eclipse.tm.internal.terminal.provisional.api.provider; +package org.eclipse.terminal.internal.provisional.api.provider; import java.io.OutputStream; import java.util.Optional; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; /** * Abstract base class for all terminal connector implementations to be - * registered via the org.eclipse.tm.terminal.control.connectors + * registered via the org.eclipse.terminal.control.connectors * extension point. * - * @since org.eclipse.tm.terminal 2.0 */ public abstract class TerminalConnectorImpl { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java index 0d0e151a1a8..65c9590fae6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java @@ -12,18 +12,18 @@ * Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1 * Anton Leherbauer (Wind River) - [219589] Copy an entire line selection *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.eclipse.swt.graphics.Point; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.TextRange; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.TextRange; abstract public class AbstractTextCanvasModel implements ITextCanvasModel { private static final boolean DEBUG_HOVER = TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_HOVER); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/GridCanvas.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/GridCanvas.java index c727d9910f4..4340ba90fa7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/GridCanvas.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.GC; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ILinelRenderer.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ILinelRenderer.java index a02b67fcfa9..1b5d7f844b0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ILinelRenderer.java @@ -12,7 +12,7 @@ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.util.Map; @@ -20,7 +20,7 @@ import org.eclipse.swt.graphics.Device; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.RGB; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.model.TerminalColor; /** * diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModel.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModel.java index 01beac0789d..1b8761e8f8e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModel.java @@ -10,10 +10,10 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import org.eclipse.swt.graphics.Point; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; public interface ITextCanvasModel { void addCellCanvasModelListener(ITextCanvasModelListener listener); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModelListener.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModelListener.java index 4d6251844ca..fd34adc2fe7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/ITextCanvasModelListener.java @@ -10,7 +10,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; /** */ diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PipedInputStream.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PipedInputStream.java index 9b50a19c3be..0baa090a261 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PipedInputStream.java @@ -13,7 +13,7 @@ * Pawel Piech (Wind River) - [333613] "Job found still running" after shutdown *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.io.IOException; import java.io.InputStream; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PollingTextCanvasModel.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PollingTextCanvasModel.java index d2fe910e5de..5bc81c3271b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/PollingTextCanvasModel.java @@ -9,10 +9,10 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [420928] Terminal widget leaks memory *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; /** * @author Michael.Scharf@scharf-software.com diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/StyleMap.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/StyleMap.java index 330070cdafb..48577fd1ea7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/StyleMap.java @@ -17,7 +17,7 @@ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically * Martin Oberhuber (Wind River) - [475422] Fix display on MacOSX Retina *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.util.EnumMap; import java.util.Map; @@ -28,10 +28,10 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.preferences.ITerminalConstants; -import org.eclipse.tm.internal.terminal.preferences.TerminalColorPresets; -import org.eclipse.tm.terminal.model.TerminalColor; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.internal.preferences.ITerminalConstants; +import org.eclipse.terminal.internal.preferences.TerminalColorPresets; +import org.eclipse.terminal.model.TerminalColor; +import org.eclipse.terminal.model.TerminalStyle; /** * The split between responsibilities of StyleMap and TerminalStyle are not always clear. Generally diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextCanvas.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextCanvas.java index 0d7e8bda732..35d5b9ea497 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextCanvas.java @@ -21,7 +21,7 @@ * Anton Leherbauer (Wind River) - [434749] UnhandledEventLoopException when copying to clipboard while the selection is empty * Davy Landman (CWI) - [475267][api] Allow custom mouse listeners *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.util.ArrayList; import java.util.List; @@ -42,9 +42,9 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.internal.terminal.control.ITerminalMouseListener; -import org.eclipse.tm.internal.terminal.control.ITerminalMouseListener2; -import org.eclipse.tm.terminal.model.TerminalColor; +import org.eclipse.terminal.internal.control.ITerminalMouseListener; +import org.eclipse.terminal.internal.control.ITerminalMouseListener2; +import org.eclipse.terminal.model.TerminalColor; /** * A cell oriented Canvas. Maintains a list of "cells". diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java index 845ee499581..227636b5ccc 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java @@ -14,7 +14,7 @@ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.util.Map; @@ -26,12 +26,12 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalColor; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalColor; +import org.eclipse.terminal.model.TerminalStyle; /** * diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/VirtualCanvas.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/VirtualCanvas.java index dbc09c87e01..101b686d206 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/internal/textcanvas/VirtualCanvas.java @@ -9,7 +9,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ScrollBar; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; /** * A Canvas showing a virtual object. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextData.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextData.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextData.java index 3f6759c2752..f972bbbe28b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextData.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextData.java @@ -12,7 +12,7 @@ * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; /** * A writable matrix of characters and {@link TerminalStyle}. This is intended to be the diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataReadOnly.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataReadOnly.java index 4e5de356412..9809e17ef37 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataReadOnly.java @@ -12,7 +12,7 @@ * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; /** * @noimplement This interface is not intended to be implemented by clients. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataSnapshot.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataSnapshot.java index 573fe657c5b..d49e9fb42b5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/ITerminalTextDataSnapshot.java @@ -11,7 +11,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; /** * This class maintains a snapshot of an instance of {@link ITerminalTextData}. diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/LineSegment.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/LineSegment.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/LineSegment.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/LineSegment.java index 548dc705891..fbb685490ca 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/LineSegment.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/LineSegment.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; public class LineSegment { private final String fText; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalColor.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalColor.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalColor.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalColor.java index 0bc12ebabdb..41835122502 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalColor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalColor.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.resource.ColorDescriptor; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalStyle.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalStyle.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java index d81d4b8466e..11604238d01 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalStyle.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; import java.util.Collections; import java.util.LinkedHashMap; @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.swt.graphics.RGB; -import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; +import org.eclipse.terminal.internal.control.impl.TerminalPlugin; +import org.eclipse.terminal.internal.provisional.api.Logger; /** * @author scharf diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalTextDataFactory.java similarity index 80% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalTextDataFactory.java index 25729aa3426..2d6efd8cdfd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TerminalTextDataFactory.java @@ -8,10 +8,10 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; -import org.eclipse.tm.internal.terminal.model.SynchronizedTerminalTextData; -import org.eclipse.tm.internal.terminal.model.TerminalTextData; +import org.eclipse.terminal.internal.model.SynchronizedTerminalTextData; +import org.eclipse.terminal.internal.model.TerminalTextData; public class TerminalTextDataFactory { static public ITerminalTextData makeTerminalTextData() { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TextRange.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TextRange.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TextRange.java rename to terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TextRange.java index b73576f4c3c..04a3a71d37c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/TextRange.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/terminal/model/TextRange.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; import org.eclipse.swt.graphics.Point; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/.project b/terminal/plugins/org.eclipse.tm.terminal.view.core/.project index f6e4e7e96a0..2b93fca1494 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.core + org.eclipse.terminal.view.core diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF index 41e2eb4c581..bf8217ae738 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.core;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.view.core;singleton:=true Bundle-Version: 4.11.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator +Bundle-Activator: org.eclipse.terminal.view.core.activator.CoreBundleActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.core, - org.eclipse.tm.terminal.view.core.activator;x-internal:=true, - org.eclipse.tm.terminal.view.core.interfaces, - org.eclipse.tm.terminal.view.core.interfaces.constants, - org.eclipse.tm.terminal.view.core.internal;x-internal:=true, - org.eclipse.tm.terminal.view.core.nls;x-internal:=true, - org.eclipse.tm.terminal.view.core.preferences, - org.eclipse.tm.terminal.view.core.tracing, - org.eclipse.tm.terminal.view.core.utils +Export-Package: org.eclipse.terminal.view.core, + org.eclipse.terminal.view.core.activator;x-internal:=true, + org.eclipse.terminal.view.core.interfaces, + org.eclipse.terminal.view.core.interfaces.constants, + org.eclipse.terminal.view.core.internal;x-internal:=true, + org.eclipse.terminal.view.core.nls;x-internal:=true, + org.eclipse.terminal.view.core.preferences, + org.eclipse.terminal.view.core.tracing, + org.eclipse.terminal.view.core.utils Automatic-Module-Name: org.eclipse.tm.terminal.view.core diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.view.core/plugin.xml index b60ca296396..f3434ac77c0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/plugin.xml @@ -16,7 +16,7 @@ - + - + This extension point is used to contribute terminal context properties providers. The context properties provider allows querying desired properties for a given context. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalContextPropertiesProviderFactory.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalContextPropertiesProviderFactory.java index 633c0a8cb12..6b97df4d440 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalContextPropertiesProviderFactory.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core; +package org.eclipse.terminal.view.core; import java.util.ArrayList; import java.util.List; @@ -28,9 +28,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tm.terminal.view.core.nls.Messages; +import org.eclipse.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.terminal.view.core.nls.Messages; /** * Terminal context properties provider factory. @@ -180,7 +180,7 @@ private static Proxy getProxy(IConfigurationElement config) { */ private static void loadContributions() { IExtensionPoint ep = Platform.getExtensionRegistry() - .getExtensionPoint("org.eclipse.tm.terminal.view.core.contextPropertiesProviders"); //$NON-NLS-1$ + .getExtensionPoint("org.eclipse.terminal.view.core.contextPropertiesProviders"); //$NON-NLS-1$ if (ep != null) { IExtension[] extensions = ep.getExtensions(); if (extensions != null) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalServiceFactory.java similarity index 78% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalServiceFactory.java index 595046ffdb8..dc69a9bc0c8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/TerminalServiceFactory.java @@ -9,14 +9,14 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core; +package org.eclipse.terminal.view.core; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.nls.Messages; +import org.eclipse.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.nls.Messages; import org.osgi.framework.Bundle; /** @@ -30,10 +30,10 @@ public final class TerminalServiceFactory { static { // Tries to instantiate the terminal service implementation // from the o.e.tm.terminal.view.ui bundle - Bundle bundle = Platform.getBundle("org.eclipse.tm.terminal.view.ui"); //$NON-NLS-1$ + Bundle bundle = Platform.getBundle("org.eclipse.terminal.view.ui"); //$NON-NLS-1$ if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) { try { - Class clazz = bundle.loadClass("org.eclipse.tm.terminal.view.ui.services.TerminalService"); //$NON-NLS-1$ + Class clazz = bundle.loadClass("org.eclipse.terminal.view.ui.services.TerminalService"); //$NON-NLS-1$ instance = (ITerminalService) clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { if (Platform.inDebugMode()) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/activator/CoreBundleActivator.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/activator/CoreBundleActivator.java index 4184e1b9438..3ab4b634be0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/activator/CoreBundleActivator.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.activator; +package org.eclipse.terminal.view.core.activator; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -37,7 +37,7 @@ public static String getUniqueIdentifier() { if (getContext() != null && getContext().getBundle() != null) { return getContext().getBundle().getSymbolicName(); } - return "org.eclipse.tm.terminal.view.core"; //$NON-NLS-1$ + return "org.eclipse.terminal.view.core"; //$NON-NLS-1$ } @Override diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java index eefca07d8fd..baab9162a22 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalContextPropertiesProvider.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces; +package org.eclipse.terminal.view.core.interfaces; import java.util.Map; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalService.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalService.java index e28f1b42298..bb88434eabf 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalService.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalService.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces; +package org.eclipse.terminal.view.core.interfaces; import java.util.Map; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java index b48a1113adf..24e2ba95aa8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalServiceOutputStreamMonitorListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces; +package org.eclipse.terminal.view.core.interfaces; /** * An interface to be implemented by listeners who want to listen diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalTabListener.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalTabListener.java index bd3a034680b..6a3325ab570 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/ITerminalTabListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/ITerminalTabListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces; +package org.eclipse.terminal.view.core.interfaces; /** * Listener to implement and to register to get notified about diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java index 55daaeecbc7..6c86866607d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/IContextPropertiesConstants.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces.constants; +package org.eclipse.terminal.view.core.interfaces.constants; /** * Defines the terminal context properties constants. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java index f6888a22629..4ecea4a71ab 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ILineSeparatorConstants.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces.constants; +package org.eclipse.terminal.view.core.interfaces.constants; /** * Line separator constants. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java index 4d60d49c31b..f59e0f4d69e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/interfaces/constants/ITerminalsConnectorConstants.java @@ -10,12 +10,12 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.interfaces.constants; +package org.eclipse.terminal.view.core.interfaces.constants; import java.io.InputStream; import java.io.OutputStream; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; /** * Defines the terminals connector constants. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/internal/PropertyTester.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/internal/PropertyTester.java index 7e0f46ce6db..0a98d68c7bf 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/internal/PropertyTester.java @@ -9,9 +9,9 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.internal; +package org.eclipse.terminal.view.core.internal; -import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.terminal.view.core.TerminalContextPropertiesProviderFactory; /** * Property tester implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/nls/Messages.java similarity index 87% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/nls/Messages.java index 2d778f3b126..758e0c83f4d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/nls/Messages.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.nls; +package org.eclipse.terminal.view.core.nls; import org.eclipse.osgi.util.NLS; @@ -19,7 +19,7 @@ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.core.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.terminal.view.core.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/nls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/nls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/preferences/ScopedEclipsePreferences.java similarity index 99% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/preferences/ScopedEclipsePreferences.java index 34a730e77d9..d54d598db53 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/preferences/ScopedEclipsePreferences.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.preferences; +package org.eclipse.terminal.view.core.preferences; import java.io.OutputStream; import java.util.Map; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/tracing/TraceHandler.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/tracing/TraceHandler.java index 98945b613c2..ab4cba9af02 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/tracing/TraceHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/tracing/TraceHandler.java @@ -9,12 +9,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.tracing; +package org.eclipse.terminal.view.core.tracing; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.terminal.view.core.activator.CoreBundleActivator; /** * Helper class to handle tracing using the platforms debug capabilities. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/utils/Env.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java rename to terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/utils/Env.java index 4b081c81e8a..38f2fe38149 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/utils/Env.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/terminal/view/core/utils/Env.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.core.utils; +package org.eclipse.terminal.view.core.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/.project b/terminal/plugins/org.eclipse.tm.terminal.view.ui/.project index 3686758258d..0ccdcc4444a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/.project +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.view.ui + org.eclipse.terminal.view.ui diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/.settings/.api_filters b/terminal/plugins/org.eclipse.tm.terminal.view.ui/.settings/.api_filters deleted file mode 100644 index 3d478ee8e78..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/.settings/.api_filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index ffd82e14cf2..649b08e14b5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.view.ui;singleton:=true Bundle-Version: 4.12.0.qualifier -Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin +Bundle-Activator: org.eclipse.terminal.view.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.core.resources;bundle-version="[3.22.200,4)";resolution:=optional, 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.0,5.0.0)", - org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", + org.eclipse.terminal.view.core;bundle-version="[4.10.0,5.0.0)", + org.eclipse.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.ui.ide;bundle-version="[3.22.600,4)";resolution:=optional, org.eclipse.ui.editors;bundle-version="[3.20.0,4)";resolution:=optional, @@ -19,25 +19,25 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.tm.terminal.view.ui.actions, - org.eclipse.tm.terminal.view.ui.activator;x-internal:=true, - org.eclipse.tm.terminal.view.ui.controls, - org.eclipse.tm.terminal.view.ui.help, - org.eclipse.tm.terminal.view.ui.interfaces, - org.eclipse.tm.terminal.view.ui.interfaces.tracing;x-internal:=true, - org.eclipse.tm.terminal.view.ui.internal;x-internal:=true, - org.eclipse.tm.terminal.view.ui.internal.dialogs;x-internal:=true, - org.eclipse.tm.terminal.view.ui.internal.handler;x-internal:=true, - org.eclipse.tm.terminal.view.ui.launcher, - org.eclipse.tm.terminal.view.ui.listeners, - org.eclipse.tm.terminal.view.ui.local.showin;x-internal:=true, - org.eclipse.tm.terminal.view.ui.local.showin.detectors;x-internal:=true, - org.eclipse.tm.terminal.view.ui.manager, - org.eclipse.tm.terminal.view.ui.nls;x-internal:=true, - org.eclipse.tm.terminal.view.ui.panels, - org.eclipse.tm.terminal.view.ui.preferences;x-internal:=true, - org.eclipse.tm.terminal.view.ui.services, - org.eclipse.tm.terminal.view.ui.streams, - org.eclipse.tm.terminal.view.ui.tabs, - org.eclipse.tm.terminal.view.ui.view +Export-Package: org.eclipse.terminal.view.ui.actions, + org.eclipse.terminal.view.ui.activator;x-internal:=true, + org.eclipse.terminal.view.ui.controls, + org.eclipse.terminal.view.ui.help, + org.eclipse.terminal.view.ui.interfaces, + org.eclipse.terminal.view.ui.interfaces.tracing;x-internal:=true, + org.eclipse.terminal.view.ui.internal;x-internal:=true, + org.eclipse.terminal.view.ui.internal.dialogs;x-internal:=true, + org.eclipse.terminal.view.ui.internal.handler;x-internal:=true, + org.eclipse.terminal.view.ui.launcher, + org.eclipse.terminal.view.ui.listeners, + org.eclipse.terminal.view.ui.local.showin;x-internal:=true, + org.eclipse.terminal.view.ui.local.showin.detectors;x-internal:=true, + org.eclipse.terminal.view.ui.manager, + org.eclipse.terminal.view.ui.nls;x-internal:=true, + org.eclipse.terminal.view.ui.panels, + org.eclipse.terminal.view.ui.preferences;x-internal:=true, + org.eclipse.terminal.view.ui.services, + org.eclipse.terminal.view.ui.streams, + org.eclipse.terminal.view.ui.tabs, + org.eclipse.terminal.view.ui.view Automatic-Module-Name: org.eclipse.tm.terminal.view.ui diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml index 184de9de390..dd1883ca0cb 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml @@ -18,16 +18,16 @@ @@ -35,7 +35,7 @@ @@ -51,10 +51,10 @@ --> - + - + - + - + - + - + - + - + - + - + - + @@ -211,13 +211,13 @@ + class="org.eclipse.terminal.view.ui.local.showin.DynamicContributionItems" + id="org.eclipse.terminal.connector.local.LocalLauncherDynamicContributionItems"> @@ -243,7 +243,7 @@ + variable="org.eclipse.terminal.external.executable.configured"> @@ -258,13 +258,13 @@ + class="org.eclipse.terminal.view.ui.local.showin.DynamicContributionItems" + id="org.eclipse.terminal.connector.local.LocalLauncherDynamicContributionItems"> @@ -290,7 +290,7 @@ + variable="org.eclipse.terminal.external.executable.configured"> @@ -305,13 +305,13 @@ + class="org.eclipse.terminal.view.ui.local.showin.DynamicContributionItems" + id="org.eclipse.terminal.connector.local.LocalLauncherDynamicContributionItems"> @@ -337,7 +337,7 @@ + variable="org.eclipse.terminal.external.executable.configured"> @@ -352,98 +352,98 @@ + class="org.eclipse.terminal.view.ui.internal.handler.LaunchTerminalCommandHandler" + commandId="org.eclipse.terminal.view.ui.command.launch"> + class="org.eclipse.terminal.view.ui.internal.handler.LaunchTerminalCommandHandler" + commandId="org.eclipse.terminal.view.ui.command.launchToolbar"> + class="org.eclipse.terminal.view.ui.internal.handler.LaunchTerminalCommandHandler" + commandId="org.eclipse.terminal.view.ui.command.launchConsole"> + class="org.eclipse.terminal.view.ui.internal.handler.DisconnectTerminalCommandHandler" + commandId="org.eclipse.terminal.view.ui.command.disconnect"> - - + + + class="org.eclipse.terminal.view.ui.internal.handler.MaximizeViewHandler" + commandId="org.eclipse.terminal.maximize"> - + + class="org.eclipse.terminal.view.ui.internal.handler.QuickAccessHandler" + commandId="org.eclipse.terminal.quickaccess"> - + + class="org.eclipse.terminal.view.ui.internal.handler.NewTerminalViewHandler" + commandId="org.eclipse.terminal.view.ui.command.newview"> - + @@ -456,88 +456,88 @@ + activityId="org.eclipse.terminal.view.ui.activity.views" + categoryId="org.eclipse.terminal.view.ui.category"> + id="org.eclipse.terminal.view.ui.activity.views"> + activityId="org.eclipse.terminal.view.ui.activity.maintoolbar" + categoryId="org.eclipse.terminal.view.ui.category"> + id="org.eclipse.terminal.view.ui.activity.maintoolbar"> @@ -546,22 +546,22 @@ - + + provider="org.eclipse.terminal.view.ui.internal.ExternalExecutablesState"> diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/AbstractAction.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/AbstractAction.java index 31967001c57..8c0c0fa6119 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/AbstractAction.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ParameterizedCommand; @@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/InvertColorsAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/InvertColorsAction.java similarity index 80% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/InvertColorsAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/InvertColorsAction.java index 2ea1e97337f..5356dd1df07 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/InvertColorsAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/InvertColorsAction.java @@ -9,16 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; /** * @since 4.8 diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/NewTerminalViewAction.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/NewTerminalViewAction.java index 7d61839b9e7..6bbc094db09 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/NewTerminalViewAction.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ParameterizedCommand; @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.action.IAction; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.handlers.IHandlerService; @@ -53,7 +53,7 @@ public NewTerminalViewAction(ITerminalsView view) { @Override public void run() { ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class); - Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.command.newview") //$NON-NLS-1$ + Command command = service != null ? service.getCommand("org.eclipse.terminal.view.ui.command.newview") //$NON-NLS-1$ : null; if (command != null && command.isDefined() && command.isEnabled()) { try { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/RenameTerminalAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/RenameTerminalAction.java similarity index 82% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/RenameTerminalAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/RenameTerminalAction.java index 9eeae1df516..35891ba0734 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/RenameTerminalAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/RenameTerminalAction.java @@ -9,17 +9,17 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.Window; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; /** * @since 4.8 diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/SelectEncodingAction.java similarity index 81% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/SelectEncodingAction.java index 8b7177a2d32..e5737471256 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/SelectEncodingAction.java @@ -9,18 +9,18 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.Window; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.internal.dialogs.EncodingSelectionDialog; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.internal.dialogs.EncodingSelectionDialog; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; /** * Terminal control select encoding action implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/TabScrollLockAction.java similarity index 78% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/TabScrollLockAction.java index 25e1b3352ca..6ac73261a49 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/TabScrollLockAction.java @@ -9,15 +9,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.jface.action.IAction; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.terminal.view.ui.nls.Messages; /** * Terminal console tab scroll lock action. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/ToggleCommandFieldAction.java similarity index 81% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/ToggleCommandFieldAction.java index 13efde8f3b9..8399dc859a7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/actions/ToggleCommandFieldAction.java @@ -9,19 +9,19 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.actions; +package org.eclipse.terminal.view.ui.actions; import org.eclipse.jface.action.IAction; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabCommandFieldHandler; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabCommandFieldHandler; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; /** * Toggle command input field. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/activator/UIPlugin.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/activator/UIPlugin.java index 0fb148e3a6a..747e804edbe 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/activator/UIPlugin.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.activator; +package org.eclipse.terminal.view.ui.activator; import java.net.URL; import java.util.ArrayList; @@ -25,14 +25,14 @@ import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; -import org.eclipse.tm.terminal.view.core.tracing.TraceHandler; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.listeners.WorkbenchWindowListener; -import org.eclipse.tm.terminal.view.ui.view.TerminalsView; -import org.eclipse.tm.terminal.view.ui.view.TerminalsViewMementoHandler; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.terminal.view.core.tracing.TraceHandler; +import org.eclipse.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.terminal.view.ui.listeners.WorkbenchWindowListener; +import org.eclipse.terminal.view.ui.view.TerminalsView; +import org.eclipse.terminal.view.ui.view.TerminalsViewMementoHandler; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.IWindowListener; @@ -81,7 +81,7 @@ public static String getUniqueIdentifier() { if (getDefault() != null && getDefault().getBundle() != null) { return getDefault().getBundle().getSymbolicName(); } - return "org.eclipse.tm.terminal.view.ui"; //$NON-NLS-1$ + return "org.eclipse.terminal.view.ui"; //$NON-NLS-1$ } /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/ConfigurationPanelControl.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/ConfigurationPanelControl.java index e95b8dc05ba..ae066c43118 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/ConfigurationPanelControl.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.controls; +package org.eclipse.terminal.view.ui.controls; import java.util.HashMap; import java.util.Hashtable; @@ -24,9 +24,9 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.panels.AbstractConfigurationPanel; /** * Base control to deal with wizard or property page controls diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/NoteCompositeHelper.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/NoteCompositeHelper.java index d66ffe8e44b..a45753cd8db 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/controls/NoteCompositeHelper.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.controls; +package org.eclipse.terminal.view.ui.controls; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.JFaceResources; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.nls.Messages; /** * A helper class to create a composite with a highlighted note diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/help/IContextHelpIds.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/help/IContextHelpIds.java index 0fb521ca456..b8575e7bad0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/help/IContextHelpIds.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/help/IContextHelpIds.java @@ -10,9 +10,9 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.help; +package org.eclipse.terminal.view.ui.help; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.activator.UIPlugin; /** * UI Context help id definitions. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanel.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanel.java index 23859039434..6477d467095 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanel.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; import java.util.Map; @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; +import org.eclipse.terminal.view.ui.panels.AbstractConfigurationPanel; /** * Terminal launcher configuration panel. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanelContainer.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanelContainer.java index c6f4e13319f..0c217f3157b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IConfigurationPanelContainer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IConfigurationPanelContainer.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; /** * A container to deal with configuration panels. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IExternalExecutablesProperties.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IExternalExecutablesProperties.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IExternalExecutablesProperties.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IExternalExecutablesProperties.java index 3b4507e7469..1b861107bd4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IExternalExecutablesProperties.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IExternalExecutablesProperties.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - [460496] Moved from o.e.tm.t.connector.local.showin.interfaces *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; /** * External executables data property names. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ILauncherDelegate.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ILauncherDelegate.java index f6d23cc366e..ceddf599105 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ILauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ILauncherDelegate.java @@ -9,16 +9,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; import java.util.Map; import org.eclipse.core.expressions.Expression; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Terminal launcher delegate. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IMementoHandler.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IMementoHandler.java index c1f5e9bf26d..e9803e3c081 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IMementoHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; import java.util.Map; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IPreferenceKeys.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IPreferenceKeys.java index b37439f813f..5de9374814f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IPreferenceKeys.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IPreferenceKeys.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; /** * Terminal plug-in preference key definitions. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ITerminalsView.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ITerminalsView.java index 4d6f6750490..6b5b21327d2 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ITerminalsView.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ITerminalsView.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; import org.eclipse.ui.IViewPart; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IUIConstants.java similarity index 85% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IUIConstants.java index e18dcbef38a..3cec84d64fd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/IUIConstants.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; /** * Terminal common UI constants. @@ -21,6 +21,6 @@ public interface IUIConstants { /** * The view id of the terminals view. */ - public static final String ID = "org.eclipse.tm.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ImageConsts.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ImageConsts.java index 352228af88b..72d763714a1 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/ImageConsts.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces; +package org.eclipse.terminal.view.ui.interfaces; /** * Image registry constants. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/tracing/ITraceIds.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/tracing/ITraceIds.java index d4062007595..cb8f260a603 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/tracing/ITraceIds.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/interfaces/tracing/ITraceIds.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.interfaces.tracing; +package org.eclipse.terminal.view.ui.interfaces.tracing; /** * Core plug-in trace slot identifiers. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/ExternalExecutablesState.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/ExternalExecutablesState.java index 3cec5ce117f..3a8cefedfa9 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/ExternalExecutablesState.java @@ -9,12 +9,12 @@ * Contributors: * Dirk Fauth - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal; +package org.eclipse.terminal.view.ui.internal; import java.util.HashMap; import java.util.Map; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesManager; import org.eclipse.ui.AbstractSourceProvider; import org.eclipse.ui.ISources; @@ -22,7 +22,7 @@ * SourceProvider that provides a state to determine whether external executables are configured or not. */ public class ExternalExecutablesState extends AbstractSourceProvider { - public final static String CONFIGURED_STATE = "org.eclipse.tm.terminal.external.executable.configured"; //$NON-NLS-1$ + public final static String CONFIGURED_STATE = "org.eclipse.terminal.external.executable.configured"; //$NON-NLS-1$ private boolean enabled; public ExternalExecutablesState() { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/PropertyTester.java similarity index 83% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/PropertyTester.java index 0b5052bccda..5e4219cf94f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/PropertyTester.java @@ -9,16 +9,16 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal; +package org.eclipse.terminal.view.ui.internal; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; /** * Terminal property tester implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/SettingsStore.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/SettingsStore.java index 116e1dd4dd5..710df2d4d54 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/SettingsStore.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal; +package org.eclipse.terminal.view.ui.internal; import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; /** * Simple default Terminal settings store implementation keeping the settings diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java index 96b9c9016df..150261c656a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.dialogs; +package org.eclipse.terminal.view.ui.internal.dialogs; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; @@ -23,10 +23,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.terminal.view.ui.help.IContextHelpIds; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; +import org.eclipse.terminal.view.ui.help.IContextHelpIds; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.panels.AbstractExtendedConfigurationPanel; import org.eclipse.ui.PlatformUI; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java similarity index 88% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java index 4b09e67c9eb..d1a220c535f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/ErrorSettingsPanel.java @@ -6,15 +6,15 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.dialogs; +package org.eclipse.terminal.view.ui.internal.dialogs; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.panels.AbstractConfigurationPanel; /** * An empty configuration panel implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java index 935b111da4e..2f54a67be78 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -11,7 +11,7 @@ * Max Weninger (Wind River) - [361352] [TERMINALS][SSH] Add SSH terminal support * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.dialogs; +package org.eclipse.terminal.view.ui.internal.dialogs; import java.util.ArrayList; import java.util.Arrays; @@ -39,21 +39,21 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl; -import org.eclipse.tm.terminal.view.ui.help.IContextHelpIds; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.view.core.interfaces.ITerminalService.Done; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.controls.ConfigurationPanelControl; +import org.eclipse.terminal.view.ui.help.IContextHelpIds; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesManager; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; @@ -436,7 +436,7 @@ protected List getTerminals() { label2delegate.put(label, delegate); items.add(label); - if ("org.eclipse.tm.terminal.connector.local.launcher.local".equals(delegate.getId())) { //$NON-NLS-1$ + if ("org.eclipse.terminal.connector.local.launcher.local".equals(delegate.getId())) { //$NON-NLS-1$ localLauncher = delegate; } } @@ -465,7 +465,7 @@ protected List getTerminals() { label2delegate.put(label, delegate); items.add(label); - if ("org.eclipse.tm.terminal.connector.local.launcher.local".equals(delegate.getId())) { //$NON-NLS-1$ + if ("org.eclipse.terminal.connector.local.launcher.local".equals(delegate.getId())) { //$NON-NLS-1$ localLauncher = delegate; } } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java index 7d481c28785..0adbeabaa1f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java similarity index 89% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java index d895f88a364..eb3e6d6fad7 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; import org.eclipse.ui.handlers.HandlerUtil; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java similarity index 86% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java index 953ae023459..697b4214d0f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import java.text.DateFormat; import java.util.Date; @@ -24,15 +24,15 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; -import org.eclipse.tm.terminal.view.ui.internal.dialogs.LaunchTerminalSettingsDialog; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.terminal.view.ui.internal.dialogs.LaunchTerminalSettingsDialog; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.handlers.HandlerUtil; /** @@ -43,9 +43,6 @@ public class LaunchTerminalCommandHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { String commandId = event.getCommand().getId(); - // "org.eclipse.tm.terminal.view.ui.command.launchToolbar" - // "org.eclipse.tm.terminal.view.ui.command.launch" - long start = System.currentTimeMillis(); if (UIPlugin.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_LAUNCH_TERMINAL_COMMAND_HANDLER)) { @@ -60,7 +57,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException { Shell shell = HandlerUtil.getActiveShell(event); // Get the current selection ISelection selection = HandlerUtil.getCurrentSelection(event); - if (commandId.equals("org.eclipse.tm.terminal.view.ui.command.launchConsole")) { //$NON-NLS-1$ + if (commandId.equals("org.eclipse.terminal.view.ui.command.launchConsole")) { //$NON-NLS-1$ LaunchTerminalSettingsDialog dialog = new LaunchTerminalSettingsDialog(shell, start); if (dialog.open() == Window.OK) { // Get the terminal settings from the dialog @@ -76,7 +73,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException { } return null; } - if (commandId.equals("org.eclipse.tm.terminal.view.ui.command.launchToolbar")) { //$NON-NLS-1$ + if (commandId.equals("org.eclipse.terminal.view.ui.command.launchToolbar")) { //$NON-NLS-1$ if (UIPlugin.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_LAUNCH_TERMINAL_COMMAND_HANDLER)) { UIPlugin.getTraceHandler().trace("(a) Attempt to open launch terminal settings dialog after " //$NON-NLS-1$ + (System.currentTimeMillis() - start) + " ms.", //$NON-NLS-1$ diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/MaximizeViewHandler.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/MaximizeViewHandler.java index f9230a597bd..3a80a14680e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/MaximizeViewHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/NewTerminalViewHandler.java similarity index 79% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/NewTerminalViewHandler.java index d73e6a386aa..1b8c2b7471c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/NewTerminalViewHandler.java @@ -9,12 +9,12 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; -import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; +import org.eclipse.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.terminal.view.ui.manager.ConsoleManager; /** * New Terminal View handler implementation @@ -26,7 +26,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException { String secondaryId = ConsoleManager.getInstance().getNextTerminalSecondaryId(IUIConstants.ID); ConsoleManager.getInstance().showConsoleView(IUIConstants.ID, secondaryId); - triggerCommand("org.eclipse.tm.terminal.view.ui.command.launchToolbar", null); //$NON-NLS-1$ + triggerCommand("org.eclipse.terminal.view.ui.command.launchToolbar", null); //$NON-NLS-1$ return null; } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/QuickAccessHandler.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/QuickAccessHandler.java index 48658dc8e95..307c491da8d 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/QuickAccessHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.internal.handler; +package org.eclipse.terminal.view.ui.internal.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/AbstractLauncherDelegate.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/AbstractLauncherDelegate.java index a1e608e5cee..b5563133107 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/AbstractLauncherDelegate.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.launcher; +package org.eclipse.terminal.view.ui.launcher; import java.util.Map; @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.nls.Messages; /** * Abstract launcher delegate implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/LauncherDelegateManager.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/LauncherDelegateManager.java index c84517baa69..46bf25d34b5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/LauncherDelegateManager.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.launcher; +package org.eclipse.terminal.view.ui.launcher; import java.util.ArrayList; import java.util.Arrays; @@ -34,9 +34,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; import org.eclipse.osgi.util.NLS; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerService; @@ -166,14 +166,14 @@ public int hashCode() { * The comparator assure that extension are read in a predictable order. *

* The order of the extensions is defined as following:
- *

  • Extensions contributed by our own plug-ins (org.eclipse.tm.terminal.*) + *
    • Extensions contributed by our own plug-ins (org.eclipse.terminal.*) * in ascending alphabetic order and
      • *
    • Extensions contributed by any other plug-in in ascending alphabetic order.
      • *
    • Extensions contributed by the same plug-in in ascending alphabetic order by the * extensions unique id
      • */ /* default */ static class ExtensionPointComparator implements Comparator { - private final static String OWN_PLUGINS_PATTERN = "org.eclipse.tm.terminal."; //$NON-NLS-1$ + private final static String OWN_PLUGINS_PATTERN = "org.eclipse.terminal."; //$NON-NLS-1$ @Override public int compare(IExtension o1, IExtension o2) { @@ -383,7 +383,7 @@ protected void loadExtensions() { return; IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint point = registry.getExtensionPoint("org.eclipse.tm.terminal.view.ui.launcherDelegates"); //$NON-NLS-1$ + IExtensionPoint point = registry.getExtensionPoint("org.eclipse.terminal.view.ui.launcherDelegates"); //$NON-NLS-1$ if (point != null) { IExtension[] extensions = getExtensionsSorted(point); for (IExtension extension : extensions) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/AbstractWindowListener.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/AbstractWindowListener.java index 827ef1cd2bd..f2e032c2c99 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/AbstractWindowListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.listeners; +package org.eclipse.terminal.view.ui.listeners; import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IPartService; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchPartListener.java similarity index 91% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchPartListener.java index b8dff58b0fe..472c98227bf 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchPartListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.listeners; +package org.eclipse.terminal.view.ui.listeners; import java.util.HashMap; import java.util.Map; @@ -51,7 +51,7 @@ public void partHidden(IWorkbenchPartReference partRef) { @Override public void partActivated(IWorkbenchPartReference partRef) { - if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ + if ("org.eclipse.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { IContextService service = part.getSite().getService(IContextService.class); @@ -69,7 +69,7 @@ public void partActivated(IWorkbenchPartReference partRef) { @Override public void partDeactivated(IWorkbenchPartReference partRef) { - if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ + if ("org.eclipse.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { IContextService service = part.getSite().getService(IContextService.class); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchWindowListener.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchWindowListener.java index dd7bd71ac6f..8b871336cf1 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/listeners/WorkbenchWindowListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.listeners; +package org.eclipse.terminal.view.ui.listeners; import org.eclipse.ui.IPartListener2; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/DynamicContributionItems.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/DynamicContributionItems.java index 4a74ae51157..1477dd1b88b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/DynamicContributionItems.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.terminal.view.ui.local.showin; import java.util.ArrayList; import java.util.HashMap; @@ -24,10 +24,10 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.graphics.ImageData; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; @@ -49,7 +49,7 @@ public void initialize(IServiceLocator serviceLocator) { // Get the local terminal launcher delegate delegate = LauncherDelegateManager.getInstance() - .getLauncherDelegate("org.eclipse.tm.terminal.connector.local.launcher.local", false); //$NON-NLS-1$ + .getLauncherDelegate("org.eclipse.terminal.connector.local.launcher.local", false); //$NON-NLS-1$ } @Override diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesDialog.java similarity index 98% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesDialog.java index 81f03e6a5e8..a4e101295df 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesDialog.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.terminal.view.ui.local.showin; import java.io.File; import java.util.HashMap; @@ -34,9 +34,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.terminal.view.ui.help.IContextHelpIds; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.help.IContextHelpIds; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesManager.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesManager.java index ca5c403a086..55c192d6d47 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesManager.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.terminal.view.ui.local.showin; import java.io.File; import java.io.FileReader; @@ -28,10 +28,10 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.internal.ExternalExecutablesState; -import org.eclipse.tm.terminal.view.ui.local.showin.detectors.DetectGitBash; -import org.eclipse.tm.terminal.view.ui.local.showin.detectors.DetectWSL; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.internal.ExternalExecutablesState; +import org.eclipse.terminal.view.ui.local.showin.detectors.DetectGitBash; +import org.eclipse.terminal.view.ui.local.showin.detectors.DetectWSL; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.services.ISourceProviderService; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesUtils.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesUtils.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesUtils.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesUtils.java index a62211cae62..04eabd9aaf2 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesUtils.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/ExternalExecutablesUtils.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.terminal.view.ui.local.showin; import java.io.File; import java.util.Optional; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/IDetectExternalExecutable.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/IDetectExternalExecutable.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/IDetectExternalExecutable.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/IDetectExternalExecutable.java index 4fd8083ed7a..52fed8d19b6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/IDetectExternalExecutable.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/IDetectExternalExecutable.java @@ -8,12 +8,12 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin; +package org.eclipse.terminal.view.ui.local.showin; import java.util.List; import java.util.Map; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; public interface IDetectExternalExecutable { /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectGitBash.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectGitBash.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectGitBash.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectGitBash.java index 4d056b449c9..c3250c014e0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectGitBash.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectGitBash.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.detectors; +package org.eclipse.terminal.view.ui.local.showin.detectors; import java.io.File; import java.util.Collections; @@ -19,9 +19,9 @@ import java.util.function.Predicate; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesUtils; -import org.eclipse.tm.terminal.view.ui.local.showin.IDetectExternalExecutable; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesUtils; +import org.eclipse.terminal.view.ui.local.showin.IDetectExternalExecutable; public class DetectGitBash implements IDetectExternalExecutable { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectWSL.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectWSL.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectWSL.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectWSL.java index 8d98d53f786..22be6728a5b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/detectors/DetectWSL.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/local/showin/detectors/DetectWSL.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.local.showin.detectors; +package org.eclipse.terminal.view.ui.local.showin.detectors; import java.io.BufferedReader; import java.io.IOException; @@ -30,8 +30,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.local.showin.IDetectExternalExecutable; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.local.showin.IDetectExternalExecutable; public class DetectWSL implements IDetectExternalExecutable { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/manager/ConsoleManager.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/manager/ConsoleManager.java index 8dec9dc5528..451575311d5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/manager/ConsoleManager.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.manager; +package org.eclipse.terminal.view.ui.manager; import java.util.ArrayList; import java.util.Arrays; @@ -25,16 +25,16 @@ import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; -import org.eclipse.tm.terminal.view.ui.view.TerminalsView; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.view.ui.view.TerminalsView; import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IPartService; import org.eclipse.ui.IPerspectiveDescriptor; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/nls/Messages.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/nls/Messages.java index 6f96f5d05da..8f33f12aece 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/nls/Messages.java @@ -11,7 +11,7 @@ * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.nls; +package org.eclipse.terminal.view.ui.nls; import java.lang.reflect.Field; @@ -23,7 +23,7 @@ public class Messages extends NLS { // The plug-in resource bundle name - private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.nls.Messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.terminal.view.ui.nls.Messages"; //$NON-NLS-1$ /** * Static constructor. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/nls/Messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractConfigurationPanel.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractConfigurationPanel.java index 0e619ff1c38..570b9bc09a6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractConfigurationPanel.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.panels; +package org.eclipse.terminal.view.ui.panels; import java.util.Map; @@ -17,8 +17,8 @@ import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; /** * Abstract terminal launcher configuration panel implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java index 97286553051..67ff389140f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.panels; +package org.eclipse.terminal.view.ui.panels; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; @@ -43,12 +43,12 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; -import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; -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.nls.Messages; +import org.eclipse.terminal.view.core.TerminalContextPropertiesProviderFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; +import org.eclipse.terminal.view.core.interfaces.constants.IContextPropertiesConstants; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; @@ -138,7 +138,7 @@ public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { HashMap attr = deSerialize(hostString[1]); hostSettingsMap.put(hostName, attr); } else { - hostSettingsMap.put(hostName, new HashMap()); + hostSettingsMap.put(hostName, new HashMap<>()); } } } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencePage.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencePage.java index c5d79fa380e..26c16629a5f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencePage.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.preferences; +package org.eclipse.terminal.view.ui.preferences; import java.io.File; import java.net.URI; @@ -60,14 +60,14 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.controls.NoteCompositeHelper; -import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties; -import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesDialog; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager; -import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesUtils; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.controls.NoteCompositeHelper; +import org.eclipse.terminal.view.ui.interfaces.IExternalExecutablesProperties; +import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesDialog; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesManager; +import org.eclipse.terminal.view.ui.local.showin.ExternalExecutablesUtils; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.osgi.framework.Bundle; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencesInitializer.java similarity index 83% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencesInitializer.java index 60580e93617..85df3dfd250 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/preferences/PreferencesInitializer.java @@ -10,12 +10,12 @@ * Wind River Systems - initial API and implementation * Dirk Fauth - Bug 460496 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.preferences; +package org.eclipse.terminal.view.ui.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.tm.terminal.view.core.preferences.ScopedEclipsePreferences; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; +import org.eclipse.terminal.view.core.preferences.ScopedEclipsePreferences; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys; /** * Terminal default preferences initializer. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/services/TerminalService.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/services/TerminalService.java index 817d8b1099e..2f7e159a4c8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/services/TerminalService.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.services; +package org.eclipse.terminal.view.ui.services; import java.util.HashMap; import java.util.Map; @@ -22,16 +22,16 @@ import org.eclipse.core.runtime.Status; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; -import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.view.core.activator.CoreBundleActivator; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.ITerminalTabListener; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.view.ui.manager.ConsoleManager; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/AbstractStreamsConnector.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/AbstractStreamsConnector.java index 686c7065713..dab5d3c78e6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/AbstractStreamsConnector.java @@ -9,15 +9,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; import org.eclipse.ui.services.IDisposable; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/InputStreamMonitor.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/InputStreamMonitor.java index 4ec791360bb..f7a4c0d08c6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/InputStreamMonitor.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import java.io.IOException; import java.io.OutputStream; @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.services.IDisposable; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/OutputStreamMonitor.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/OutputStreamMonitor.java index 36848d49620..13284b2e48a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/OutputStreamMonitor.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import java.io.BufferedInputStream; import java.io.IOException; @@ -22,12 +22,12 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ILineSeparatorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.tracing.ITraceIds; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.tracing.ITraceIds; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.services.IDisposable; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsConnector.java similarity index 87% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsConnector.java index 58176078a33..a0fb0cf0939 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsConnector.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.NullSettingsStore; +import org.eclipse.terminal.internal.provisional.api.TerminalState; import org.eclipse.ui.services.IDisposable; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsLauncherDelegate.java similarity index 78% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsLauncherDelegate.java index 6e61ed4dd14..bc5fb0fb7d8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsLauncherDelegate.java @@ -9,24 +9,24 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import java.util.Map; import org.eclipse.core.runtime.Assert; -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.TerminalConnectorExtension; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel; -import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; -import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel; +import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer; +import org.eclipse.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate; /** * Streams launcher delegate implementation. @@ -62,7 +62,7 @@ public ITerminalConnector createTerminalConnector(Map properties // Check for the terminal connector id String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID); if (connectorId == null) - connectorId = "org.eclipse.tm.terminal.connector.streams.StreamsConnector"; //$NON-NLS-1$ + connectorId = "org.eclipse.terminal.connector.streams.StreamsConnector"; //$NON-NLS-1$ // Extract the streams properties OutputStream stdin = (OutputStream) properties.get(ITerminalsConnectorConstants.PROP_STREAMS_STDIN); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsSettings.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsSettings.java index 09aecaa893a..2ade886d8b9 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsSettings.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/StreamsSettings.java @@ -9,15 +9,15 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.streams; +package org.eclipse.terminal.view.ui.streams; import java.io.InputStream; import java.io.OutputStream; import org.eclipse.core.runtime.Assert; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; -import org.eclipse.tm.terminal.view.ui.internal.SettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener; +import org.eclipse.terminal.view.ui.internal.SettingsStore; /** * Streams connector settings implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/OpenFileMouseHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/OpenFileMouseHandler.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/OpenFileMouseHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/OpenFileMouseHandler.java index ed993c0819d..0b3425aa467 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/OpenFileMouseHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/OpenFileMouseHandler.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import java.io.File; import java.net.MalformedURLException; @@ -31,11 +31,11 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; -import org.eclipse.tm.internal.terminal.control.ITerminalMouseListener2; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.internal.control.ITerminalMouseListener2; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.view.ui.activator.UIPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabCommandFieldHandler.java similarity index 93% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabCommandFieldHandler.java index 87dc00ac1fd..cf92e9abdae 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabCommandFieldHandler.java @@ -9,13 +9,13 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.CommandInputFieldWithHistory; +import org.eclipse.terminal.internal.control.ITerminalViewControl; import org.eclipse.ui.services.IDisposable; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabDisposeListener.java similarity index 90% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabDisposeListener.java index 9cd937e46ba..18bd8f4db05 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabDisposeListener.java @@ -9,17 +9,17 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Control; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.terminal.view.core.TerminalServiceFactory; -import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService; -import org.eclipse.tm.terminal.view.ui.services.TerminalService; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.view.core.TerminalServiceFactory; +import org.eclipse.terminal.view.core.interfaces.ITerminalService; +import org.eclipse.terminal.view.ui.services.TerminalService; /** * Terminal tab default dispose listener implementation. diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderManager.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderManager.java index 725f73b5999..24a9140ac65 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderManager.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; @@ -46,17 +46,17 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; 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.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.control.ITerminalListener; +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.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.terminal.view.ui.nls.Messages; import org.eclipse.ui.PlatformUI; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderMenuHandler.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderMenuHandler.java index 53d29bc5fcd..0baa9bbd098 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderMenuHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import java.util.ArrayList; import java.util.List; @@ -28,18 +28,18 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Menu; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionClearAll; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionSelectAll; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.actions.InvertColorsAction; -import org.eclipse.tm.terminal.view.ui.actions.RenameTerminalAction; -import org.eclipse.tm.terminal.view.ui.actions.SelectEncodingAction; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.control.actions.TerminalActionClearAll; +import org.eclipse.terminal.internal.control.actions.TerminalActionCopy; +import org.eclipse.terminal.internal.control.actions.TerminalActionPaste; +import org.eclipse.terminal.internal.control.actions.TerminalActionSelectAll; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.actions.InvertColorsAction; +import org.eclipse.terminal.view.ui.actions.RenameTerminalAction; +import org.eclipse.terminal.view.ui.actions.SelectEncodingAction; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.ui.IWorkbenchActionConstants; /** diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderSelectionListener.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderSelectionListener.java index ec893f04a60..410b7b7bed3 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderSelectionListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.events.SelectionEvent; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderToolbarHandler.java similarity index 92% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderToolbarHandler.java index aba67ceb51a..7c7a05840e4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabFolderToolbarHandler.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import java.util.ArrayList; import java.util.List; @@ -24,17 +24,17 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionClearAll; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy; -import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.ui.actions.AbstractAction; -import org.eclipse.tm.terminal.view.ui.actions.NewTerminalViewAction; -import org.eclipse.tm.terminal.view.ui.actions.TabScrollLockAction; -import org.eclipse.tm.terminal.view.ui.actions.ToggleCommandFieldAction; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.internal.control.actions.AbstractTerminalAction; +import org.eclipse.terminal.internal.control.actions.TerminalActionClearAll; +import org.eclipse.terminal.internal.control.actions.TerminalActionCopy; +import org.eclipse.terminal.internal.control.actions.TerminalActionPaste; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.ui.actions.AbstractAction; +import org.eclipse.terminal.view.ui.actions.NewTerminalViewAction; +import org.eclipse.terminal.view.ui.actions.TabScrollLockAction; +import org.eclipse.terminal.view.ui.actions.ToggleCommandFieldAction; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchActionConstants; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabTerminalListener.java similarity index 94% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabTerminalListener.java index 96946641d71..d74a1fe1f46 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/tabs/TabTerminalListener.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.tabs; +package org.eclipse.terminal.view.ui.tabs; import java.util.Map; @@ -18,10 +18,10 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.internal.control.ITerminalListener3; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.nls.Messages; /** * Terminal tab default terminal listener implementation. @@ -202,7 +202,7 @@ public void setTerminalTitle(final String title, final TerminalTitleRequestor re } /** - * @see org.eclipse.tm.internal.terminal.control.ITerminalListener2#setTerminalSelectionChanged() + * @see org.eclipse.internal.terminal.control.ITerminalListener2#setTerminalSelectionChanged() * @since 4.1 */ @Override diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/OldTerminalsViewHandler.java similarity index 96% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/OldTerminalsViewHandler.java index 4a940ab6ba8..4ec2a48d910 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/OldTerminalsViewHandler.java @@ -9,10 +9,10 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.view; +package org.eclipse.terminal.view.ui.view; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; +import org.eclipse.terminal.view.ui.interfaces.IUIConstants; import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchPage; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsView.java similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsView.java index a69e5f17662..3477ee6ee35 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsView.java @@ -10,7 +10,7 @@ * Wind River Systems - initial API and implementation * Max Weninger (Wind River) - [361363] [TERMINALS] Implement "Pin&Clone" for the "Terminals" view *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.view; +package org.eclipse.terminal.view.ui.view; import java.io.File; import java.util.ArrayList; @@ -54,12 +54,12 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; -import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderMenuHandler; -import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; +import org.eclipse.terminal.view.ui.activator.UIPlugin; +import org.eclipse.terminal.view.ui.interfaces.ITerminalsView; +import org.eclipse.terminal.view.ui.nls.Messages; +import org.eclipse.terminal.view.ui.tabs.TabFolderManager; +import org.eclipse.terminal.view.ui.tabs.TabFolderMenuHandler; +import org.eclipse.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.ui.IMemento; import org.eclipse.ui.ISources; import org.eclipse.ui.IViewSite; @@ -697,7 +697,7 @@ public boolean show(ShowInContext context) { selection = new StructuredSelection(elements); ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class); Command command = service != null - ? service.getCommand("org.eclipse.tm.terminal.connector.local.command.launch") //$NON-NLS-1$ + ? service.getCommand("org.eclipse.terminal.connector.local.command.launch") //$NON-NLS-1$ : null; if (command != null && command.isDefined() && command.isEnabled()) { try { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsViewMementoHandler.java similarity index 95% rename from terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java rename to terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsViewMementoHandler.java index 1058954d17c..ff4f7159b5a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/terminal/view/ui/view/TerminalsViewMementoHandler.java @@ -9,7 +9,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.view.ui.view; +package org.eclipse.terminal.view.ui.view; import java.util.ArrayList; import java.util.HashMap; @@ -19,11 +19,11 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; -import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate; -import org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler; -import org.eclipse.tm.terminal.view.ui.launcher.LauncherDelegateManager; +import org.eclipse.terminal.internal.control.ITerminalViewControl; +import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; +import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate; +import org.eclipse.terminal.view.ui.interfaces.IMementoHandler; +import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager; import org.eclipse.ui.IMemento; import org.eclipse.ui.PlatformUI; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/.project b/terminal/tests/org.eclipse.tm.terminal.test/.project index 492f603b4c0..f0f8431b95c 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/.project +++ b/terminal/tests/org.eclipse.tm.terminal.test/.project @@ -1,6 +1,6 @@ - org.eclipse.tm.terminal.test + org.eclipse.terminal.test diff --git a/terminal/tests/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/tests/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF index 09aacf4da05..da9c53707ee 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF +++ b/terminal/tests/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF @@ -1,25 +1,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true +Bundle-SymbolicName: org.eclipse.terminal.test;singleton:=true Bundle-Version: 4.6.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="[4.13.2,5)", - org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", + org.eclipse.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.ui;bundle-version="[3.207.200,4)", org.opentest4j;bundle-version="[1.3.0,2)" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.tm.internal.terminal.connector;x-internal:=true, - org.eclipse.tm.internal.terminal.emulator;x-internal:=true, - org.eclipse.tm.internal.terminal.model;x-internal:=true, - org.eclipse.tm.internal.terminal.speedtest;x-internal:=true, - org.eclipse.tm.internal.terminal.test.terminalcanvas;x-internal:=true, - org.eclipse.tm.internal.terminal.test.ui;x-internal:=true, - org.eclipse.tm.internal.terminal.textcanvas;x-internal:=true, - org.eclipse.tm.terminal.model, - org.eclipse.tm.terminal.test +Export-Package: org.eclipse.terminal.internal.connector;x-internal:=true, + org.eclipse.terminal.internal.emulator;x-internal:=true, + org.eclipse.terminal.internal.model;x-internal:=true, + org.eclipse.terminal.internal.speedtest;x-internal:=true, + org.eclipse.terminal.internal.test.terminalcanvas;x-internal:=true, + org.eclipse.terminal.internal.test.ui;x-internal:=true, + org.eclipse.terminal.internal.textcanvas;x-internal:=true, + org.eclipse.terminal.model, + org.eclipse.terminal.test Import-Package: org.junit.jupiter.api;version="[5.9.3,6.0.0)", org.junit.jupiter.api.function;version="[5.9.3,6.0.0)" Automatic-Module-Name: org.eclipse.tm.terminal.test diff --git a/terminal/tests/org.eclipse.tm.terminal.test/plugin.xml b/terminal/tests/org.eclipse.tm.terminal.test/plugin.xml index def334de009..6bd27e5d88b 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/plugin.xml +++ b/terminal/tests/org.eclipse.tm.terminal.test/plugin.xml @@ -17,7 +17,7 @@ diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorFactoryTest.java similarity index 94% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorFactoryTest.java index 120c444eb21..8ac04894aad 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorFactoryTest.java @@ -14,7 +14,7 @@ * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point * Anton Leherbauer (Wind River) - [433751] Add option to enable VT100 line wrapping mode *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import java.io.OutputStream; import java.nio.charset.Charset; @@ -22,11 +22,11 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorPluginTest.java similarity index 86% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorPluginTest.java index b5899dcd8e1..7e1d60b7fde 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorPluginTest.java @@ -12,12 +12,12 @@ * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import org.eclipse.core.runtime.Platform; -import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.ConnectorMock; -import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.SimpleFactory; -import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.TerminalControlMock; +import org.eclipse.terminal.internal.connector.TerminalConnectorTest.ConnectorMock; +import org.eclipse.terminal.internal.connector.TerminalConnectorTest.SimpleFactory; +import org.eclipse.terminal.internal.connector.TerminalConnectorTest.TerminalControlMock; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorTest.java similarity index 93% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorTest.java index 4bfa869f861..d725ba6c06b 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalConnectorTest.java @@ -14,19 +14,19 @@ * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point * Anton Leherbauer (Wind River) - [433751] Add option to enable VT100 line wrapping mode *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import java.io.OutputStream; import java.nio.charset.Charset; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.connector.TerminalConnector.Factory; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.connector.TerminalConnector.Factory; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStreamTest.java similarity index 99% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStreamTest.java index 04e3a2769b8..bde1fe6bc50 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStreamTest.java @@ -10,7 +10,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.connector; +package org.eclipse.terminal.internal.connector; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTestSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/AllTestSuite.java similarity index 95% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTestSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/AllTestSuite.java index 8a99236f846..9b9695cf1a4 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTestSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/AllTestSuite.java @@ -10,7 +10,7 @@ * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import junit.framework.Test; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/MockTerminalControlForText.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/MockTerminalControlForText.java similarity index 80% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/MockTerminalControlForText.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/MockTerminalControlForText.java index b8c81ccd1a1..8ab28d7c5b5 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/MockTerminalControlForText.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/MockTerminalControlForText.java @@ -7,17 +7,17 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.control.impl.ITerminalControlForText; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.impl.ITerminalControlForText; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalState; public class MockTerminalControlForText implements ITerminalControlForText { private List allTitles = new ArrayList<>(); diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackendTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackendTest.java index de6bec1f900..3ecb2fdab45 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorBackendTest.java @@ -14,16 +14,16 @@ * Anton Leherbauer (Wind River) - [458218] Add support for ANSI insert mode * Anton Leherbauer (Wind River) - [458402] Add support for scroll up/down and scroll region *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.WHITE; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.WHITE; -import org.eclipse.tm.internal.terminal.model.TerminalTextDataStore; -import org.eclipse.tm.internal.terminal.model.TerminalTextTestHelper; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.internal.model.TerminalTextDataStore; +import org.eclipse.terminal.internal.model.TerminalTextTestHelper; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.TerminalStyle; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorTest.java index 66aa5941f0c..b6c9db66352 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/emulator/VT100EmulatorTest.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.emulator; +package org.eclipse.terminal.internal.emulator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,9 +19,9 @@ import java.util.List; import java.util.StringJoiner; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.TerminalTextDataFactory; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.TerminalTextDataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AbstractITerminalTextDataTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AbstractITerminalTextDataTest.java index ac7399229d3..29e32c00a7a 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AbstractITerminalTextDataTest.java @@ -9,12 +9,12 @@ * Michael Scharf (Wind River) - initial API and implementation * Anton Leherbauer (Wind River) - [453393] Add support for copying wrapped lines without line break *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTestSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AllTestSuite.java similarity index 97% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTestSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AllTestSuite.java index 123de062d5e..f2bf7ad9f51 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTestSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/AllTestSuite.java @@ -10,7 +10,7 @@ * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import junit.framework.Test; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SnapshotChangesTest.java similarity index 99% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SnapshotChangesTest.java index 9a95ba2f8e8..84a140fc292 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SnapshotChangesTest.java @@ -10,9 +10,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextDataTest.java similarity index 88% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextDataTest.java index cca7990c9fc..c43dd6bb98b 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/SynchronizedTerminalTextDataTest.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public class SynchronizedTerminalTextDataTest extends AbstractITerminalTextDataTest { @Override diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollMaxHeightTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollMaxHeightTest.java similarity index 88% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollMaxHeightTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollMaxHeightTest.java index c21c2d55c6d..b01abe1752b 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollMaxHeightTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollMaxHeightTest.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public class TerminalTextDataFastScrollMaxHeightTest extends AbstractITerminalTextDataTest { @Override diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollTest.java similarity index 87% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollTest.java index 5a0bb80a773..90e116b4b62 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataFastScrollTest.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public class TerminalTextDataFastScrollTest extends AbstractITerminalTextDataTest { @Override diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataPerformanceTest.java similarity index 96% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataPerformanceTest.java index 6bfbb44237c..262bc14b12e 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataPerformanceTest.java @@ -8,11 +8,11 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.TerminalStyle; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotTest.java similarity index 99% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotTest.java index 56b9b145b42..5ee8a9df098 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotTest.java @@ -8,12 +8,12 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.TerminalStyle; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotWindowTest.java similarity index 96% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotWindowTest.java index c0988c78369..88b500de9b5 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataSnapshotWindowTest.java @@ -8,11 +8,11 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataStoreTest.java similarity index 87% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataStoreTest.java index 29e7ef4c0c0..53fe7c2622d 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataStoreTest.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public class TerminalTextDataStoreTest extends AbstractITerminalTextDataTest { @Override diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataTest.java similarity index 87% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataTest.java index ade4d22d761..95e775dd556 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataTest.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; public class TerminalTextDataTest extends AbstractITerminalTextDataTest { @Override diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataWindowTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataWindowTest.java index d681687a7ef..10c315061a0 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextDataWindowTest.java @@ -11,13 +11,13 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; import java.util.ArrayList; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.LineSegment; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.LineSegment; +import org.eclipse.terminal.model.TerminalStyle; public class TerminalTextDataWindowTest extends AbstractITerminalTextDataTest { int fOffset; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextTestHelper.java similarity index 93% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextTestHelper.java index 205d304614f..f86956a5162 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/model/TerminalTextTestHelper.java @@ -11,11 +11,11 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1 *******************************************************************************/ -package org.eclipse.tm.internal.terminal.model; +package org.eclipse.terminal.internal.model; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataReadOnly; +import org.eclipse.terminal.model.TerminalStyle; public class TerminalTextTestHelper { static public String toSimple(ITerminalTextDataReadOnly term) { diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnection.java similarity index 90% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnection.java index ea670329ddb..c2db9283113 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnection.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.speedtest; +package org.eclipse.terminal.internal.speedtest; import java.io.BufferedReader; import java.io.IOException; @@ -17,10 +17,10 @@ import java.io.OutputStream; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.TerminalState; public class SpeedTestConnection extends Thread { private static int fgNo; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnector.java similarity index 83% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnector.java index b2b1c33f88c..b978353c08f 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestConnector.java @@ -11,7 +11,7 @@ * Michael Scharf (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [225853][api] Provide more default functionality in TerminalConnectorImpl *******************************************************************************/ -package org.eclipse.tm.internal.terminal.speedtest; +package org.eclipse.terminal.internal.speedtest; import java.io.BufferedInputStream; import java.io.FileInputStream; @@ -19,13 +19,13 @@ import java.io.InputStream; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.Logger; -import org.eclipse.tm.internal.terminal.provisional.api.NullSettingsStore; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ITerminalControl; +import org.eclipse.terminal.internal.provisional.api.Logger; +import org.eclipse.terminal.internal.provisional.api.NullSettingsStore; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.internal.provisional.api.provider.TerminalConnectorImpl; public class SpeedTestConnector extends TerminalConnectorImpl { final SpeedTestSettings fSettings = new SpeedTestSettings(); diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestSettings.java similarity index 93% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestSettings.java index 8283cf4a927..4ca57982ed2 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/speedtest/SpeedTestSettings.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.speedtest; +package org.eclipse.terminal.internal.speedtest; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; +import org.eclipse.terminal.internal.provisional.api.ISettingsStore; public class SpeedTestSettings { String fInputFile = ""; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Main.java similarity index 94% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Main.java index fd1061db108..046b6aae4a9 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Main.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.terminalcanvas; +package org.eclipse.terminal.internal.test.terminalcanvas; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Snippet48.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Snippet48.java index 5bd030dc582..0229f53854e 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/Snippet48.java @@ -10,7 +10,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.terminalcanvas; +package org.eclipse.terminal.internal.test.terminalcanvas; /* * Canvas example snippet: scroll an image (flicker free, no double buffering) diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/TerminalTextCanvas.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/TerminalTextCanvas.java index 13f6dd07678..47053550eb8 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/TerminalTextCanvas.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.terminalcanvas; +package org.eclipse.terminal.internal.test.terminalcanvas; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.GC; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java similarity index 99% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java index ed610faa10a..ecd278f5891 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/terminalcanvas/VirtualCanvas.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.terminalcanvas; +package org.eclipse.terminal.internal.test.terminalcanvas; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/AbstractLineOrientedDataSource.java similarity index 88% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/AbstractLineOrientedDataSource.java index 923b7f8387c..b904c530c12 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/AbstractLineOrientedDataSource.java @@ -8,10 +8,10 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.TerminalStyle; /** * Adds line by line diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/DataReader.java similarity index 95% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/DataReader.java index f40ea9c4875..626da0f5b47 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/DataReader.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; class DataReader implements Runnable { final Thread fThread; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FastDataSource.java similarity index 91% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FastDataSource.java index a2b38d1e0ab..681ac91ac12 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FastDataSource.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.TerminalStyle; final class FastDataSource extends AbstractLineOrientedDataSource { char lines[][] = new char[][] { diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FileDataSource.java similarity index 94% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FileDataSource.java index 669fe792c4e..9df79a0e43f 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/FileDataSource.java @@ -8,13 +8,13 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.TerminalStyle; /** * Reads the file in an infinite loop. diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IDataSource.java similarity index 86% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IDataSource.java index 93f25146100..cb36ddd696d 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IDataSource.java @@ -8,9 +8,9 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextData; interface IDataSource { /** diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IStatus.java similarity index 92% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IStatus.java index 02f8319878f..8f9b8e76ddc 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/IStatus.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; public interface IStatus { void setStatus(String message); diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/LineCountingDataSource.java similarity index 79% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/LineCountingDataSource.java index 5baef90f258..30e59a49948 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/LineCountingDataSource.java @@ -8,14 +8,14 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.BLUE; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.TerminalStyle; final class LineCountingDataSource extends AbstractLineOrientedDataSource { TerminalStyle styleNormal = TerminalStyle.getStyle(BLACK, RED); diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/RandomDataSource.java similarity index 78% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/RandomDataSource.java index a13bf7c3101..4e475f61017 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/RandomDataSource.java @@ -8,17 +8,17 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.GREEN; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; import java.util.Random; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.TerminalStyle; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.TerminalStyle; public class RandomDataSource implements IDataSource { Random fRandom = new Random(); diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/TerminalTextUITest.java similarity index 94% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/TerminalTextUITest.java index 483a1feaaee..fe77ec7c513 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/TerminalTextUITest.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; import java.io.File; import java.util.ArrayList; @@ -29,13 +29,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.tm.internal.terminal.textcanvas.ITextCanvasModel; -import org.eclipse.tm.internal.terminal.textcanvas.PollingTextCanvasModel; -import org.eclipse.tm.internal.terminal.textcanvas.TextCanvas; -import org.eclipse.tm.internal.terminal.textcanvas.TextLineRenderer; -import org.eclipse.tm.terminal.model.ITerminalTextData; -import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; -import org.eclipse.tm.terminal.model.TerminalTextDataFactory; +import org.eclipse.terminal.internal.textcanvas.ITextCanvasModel; +import org.eclipse.terminal.internal.textcanvas.PollingTextCanvasModel; +import org.eclipse.terminal.internal.textcanvas.TextCanvas; +import org.eclipse.terminal.internal.textcanvas.TextLineRenderer; +import org.eclipse.terminal.model.ITerminalTextData; +import org.eclipse.terminal.model.ITerminalTextDataSnapshot; +import org.eclipse.terminal.model.TerminalTextDataFactory; /** * adjust columns when table gets resized.... diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/VT100DataSource.java similarity index 92% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/VT100DataSource.java index 6ec10f847da..c0a38d9b8c7 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/test/ui/VT100DataSource.java @@ -12,7 +12,7 @@ * Martin Oberhuber (Wind River) - [204796] Terminal should allow setting the encoding to use * Anton Leherbauer (Wind River) - [458398] Add support for normal/application cursor keys mode *******************************************************************************/ -package org.eclipse.tm.internal.terminal.test.ui; +package org.eclipse.terminal.internal.test.ui; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,12 +25,12 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; -import org.eclipse.tm.internal.terminal.control.ITerminalListener3.TerminalTitleRequestor; -import org.eclipse.tm.internal.terminal.control.impl.ITerminalControlForText; -import org.eclipse.tm.internal.terminal.emulator.VT100Emulator; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; -import org.eclipse.tm.terminal.model.ITerminalTextData; +import org.eclipse.terminal.internal.control.ITerminalListener3.TerminalTitleRequestor; +import org.eclipse.terminal.internal.control.impl.ITerminalControlForText; +import org.eclipse.terminal.internal.emulator.VT100Emulator; +import org.eclipse.terminal.internal.provisional.api.ITerminalConnector; +import org.eclipse.terminal.internal.provisional.api.TerminalState; +import org.eclipse.terminal.model.ITerminalTextData; /** * Reads the file in an infinite loop. diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedInputStreamPerformanceTest.java similarity index 95% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedInputStreamPerformanceTest.java index 2b6a82d59ac..fa64e7532e9 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedInputStreamPerformanceTest.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.io.OutputStream; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedStreamTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedStreamTest.java index c18fdfd3e4e..054810a7528 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/internal/textcanvas/PipedStreamTest.java @@ -10,7 +10,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.internal.terminal.textcanvas; +package org.eclipse.terminal.internal.textcanvas; import java.io.IOException; import java.io.InputStream; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTestSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/AllTestSuite.java similarity index 96% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTestSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/AllTestSuite.java index 4a665936a4b..fa3b9b0a37c 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTestSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/AllTestSuite.java @@ -10,7 +10,7 @@ * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; import junit.framework.JUnit4TestAdapter; import junit.framework.Test; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/StyleTest.java similarity index 98% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/StyleTest.java index cdc11a8ac13..73f974c976b 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/StyleTest.java @@ -8,7 +8,7 @@ * Contributors: * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.model; +package org.eclipse.terminal.model; import junit.framework.TestCase; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/TerminalColorUITest.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java similarity index 90% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/TerminalColorUITest.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java index cf0bf3781ce..509cfd5c5cb 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/TerminalColorUITest.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/model/TerminalColorUITest.java @@ -5,16 +5,16 @@ * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ *******************************************************************************/ -package org.eclipse.tm.terminal.model; - -import static org.eclipse.tm.terminal.model.TerminalColor.BLACK; -import static org.eclipse.tm.terminal.model.TerminalColor.BLUE; -import static org.eclipse.tm.terminal.model.TerminalColor.CYAN; -import static org.eclipse.tm.terminal.model.TerminalColor.GREEN; -import static org.eclipse.tm.terminal.model.TerminalColor.MAGENTA; -import static org.eclipse.tm.terminal.model.TerminalColor.RED; -import static org.eclipse.tm.terminal.model.TerminalColor.WHITE; -import static org.eclipse.tm.terminal.model.TerminalColor.YELLOW; +package org.eclipse.terminal.model; + +import static org.eclipse.terminal.model.TerminalColor.BLACK; +import static org.eclipse.terminal.model.TerminalColor.BLUE; +import static org.eclipse.terminal.model.TerminalColor.CYAN; +import static org.eclipse.terminal.model.TerminalColor.GREEN; +import static org.eclipse.terminal.model.TerminalColor.MAGENTA; +import static org.eclipse.terminal.model.TerminalColor.RED; +import static org.eclipse.terminal.model.TerminalColor.WHITE; +import static org.eclipse.terminal.model.TerminalColor.YELLOW; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedIntegrationSuite.java similarity index 94% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedIntegrationSuite.java index 62d717b80f5..6a2d2cdcca4 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedIntegrationSuite.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tm.terminal.test; +package org.eclipse.terminal.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTestSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedPluginTestSuite.java similarity index 83% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTestSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedPluginTestSuite.java index e6504581091..ec19cdae290 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTestSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedPluginTestSuite.java @@ -11,7 +11,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.test; +package org.eclipse.terminal.test; import junit.framework.Test; import junit.framework.TestCase; @@ -27,8 +27,8 @@ public class AutomatedPluginTestSuite extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(AutomatedPluginTestSuite.class.getName()); //These tests require Eclipse Platform to be up - suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorPluginTest.class); - suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorFactoryTest.class); + suite.addTestSuite(org.eclipse.terminal.internal.connector.TerminalConnectorPluginTest.class); + suite.addTestSuite(org.eclipse.terminal.internal.connector.TerminalConnectorFactoryTest.class); //These tests must run as plain JUnit because they require access //to "package" protected methods diff --git a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTestSuite.java b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedTestSuite.java similarity index 67% rename from terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTestSuite.java rename to terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedTestSuite.java index 2383462921a..e5f0ef9a8f7 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTestSuite.java +++ b/terminal/tests/org.eclipse.tm.terminal.test/src/org/eclipse/terminal/test/AutomatedTestSuite.java @@ -10,7 +10,7 @@ * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.tm.terminal.test; +package org.eclipse.terminal.test; import junit.framework.Test; import junit.framework.TestCase; @@ -21,7 +21,7 @@ */ public class AutomatedTestSuite extends TestCase { - public static final String PI_TERMINAL_TESTS = "org.eclipse.tm.terminal.test"; //$NON-NLS-1$ + public static final String PI_TERMINAL_TESTS = "org.eclipse.terminal.test"; //$NON-NLS-1$ public AutomatedTestSuite() { super(null); @@ -36,11 +36,11 @@ public AutomatedTestSuite(String name) { */ public static Test suite() { TestSuite suite = new TestSuite(AutomatedTestSuite.class.getName()); - suite.addTest(org.eclipse.tm.internal.terminal.emulator.AllTestSuite.suite()); - suite.addTest(org.eclipse.tm.internal.terminal.model.AllTestSuite.suite()); - suite.addTest(org.eclipse.tm.terminal.model.AllTestSuite.suite()); - suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.class); - suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalToRemoteInjectionOutputStreamTest.class); + suite.addTest(org.eclipse.terminal.internal.emulator.AllTestSuite.suite()); + suite.addTest(org.eclipse.terminal.internal.model.AllTestSuite.suite()); + suite.addTest(org.eclipse.terminal.model.AllTestSuite.suite()); + suite.addTestSuite(org.eclipse.terminal.internal.connector.TerminalConnectorTest.class); + suite.addTestSuite(org.eclipse.terminal.internal.connector.TerminalToRemoteInjectionOutputStreamTest.class); return suite; } } diff --git a/terminal/tests/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch b/terminal/tests/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch index a8d7a4e206d..3f8e2e103f2 100644 --- a/terminal/tests/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch +++ b/terminal/tests/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch @@ -1,16 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +