Skip to content

Commit b278883

Browse files
laeubilaeubi
committed
Reduce number of internal and util packages in the terminal view
The terminal.view/ui currently contains a rather complex separation in their packages for utility and internal classes. To make this more consistent and easier to maintain this reorganize it to use less exported and internal packages especially for cases these only contain one single type per package.
1 parent b5ae681 commit b278883

File tree

59 files changed

+115
-140
lines changed

Some content is hidden

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

59 files changed

+115
-140
lines changed

‎terminal/bundles/org.eclipse.terminal.connector.local/META-INF/MANIFEST.MF

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
1111
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
1212
org.eclipse.terminal.view.core.interfaces;version="[1.0.0,2.0.0)",
1313
org.eclipse.terminal.view.core.interfaces.constants;version="[1.0.0,2.0.0)",
14-
org.eclipse.terminal.view.core.preferences;version="[1.0.0,2.0.0)",
15-
org.eclipse.terminal.view.core.tracing;version="[1.0.0,2.0.0)",
14+
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
1615
org.eclipse.terminal.view.ui.interfaces;version="[1.0.0,2.0.0)",
1716
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)",
1817
org.eclipse.terminal.view.ui.panels;version="[1.0.0,2.0.0)"
@@ -25,7 +24,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
2524
Bundle-RequiredExecutionEnvironment: JavaSE-17
2625
Bundle-ActivationPolicy: lazy
2726
Bundle-Localization: plugin
28-
Export-Package: org.eclipse.terminal.connector.local.activator;x-internal:=true,
29-
org.eclipse.terminal.connector.local.controls;version="1.0.0",
27+
Export-Package: org.eclipse.terminal.connector.local.controls;version="1.0.0",
3028
org.eclipse.terminal.connector.local.launcher;version="1.0.0"
3129
Automatic-Module-Name: org.eclipse.terminal.connector.local

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.eclipse.jface.resource.ImageDescriptor;
1515
import org.eclipse.jface.resource.ImageRegistry;
1616
import org.eclipse.swt.graphics.Image;
17-
import org.eclipse.terminal.view.core.preferences.ScopedEclipsePreferences;
18-
import org.eclipse.terminal.view.core.tracing.TraceHandler;
17+
import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
18+
import org.eclipse.terminal.view.core.utils.TraceHandler;
1919
import org.eclipse.ui.plugin.AbstractUIPlugin;
2020
import org.osgi.framework.BundleContext;
2121

‎terminal/bundles/org.eclipse.terminal.connector.process/META-INF/MANIFEST.MF

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
99
org.eclipse.cdt.utils.spawner;mandatory:=native,
1010
org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
1111
org.eclipse.terminal.connector.provider;version="[1.0.0,2.0.0)",
12-
org.eclipse.terminal.internal.emulator,
1312
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
1413
org.eclipse.terminal.view.core.interfaces;version="[1.0.0,2.0.0)",
1514
org.eclipse.terminal.view.core.interfaces.constants;version="[1.0.0,2.0.0)",
16-
org.eclipse.terminal.view.core.tracing;version="[1.0.0,2.0.0)",
1715
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
1816
org.eclipse.terminal.view.ui.interfaces;version="[1.0.0,2.0.0)",
1917
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)",
2018
org.eclipse.terminal.view.ui.manager;version="[1.0.0,2.0.0)",
21-
org.eclipse.terminal.view.ui.nls,
2219
org.eclipse.terminal.view.ui.streams;version="[1.0.0,2.0.0)"
2320
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
2421
org.eclipse.core.resources;bundle-version="[3.22.200,4)";resolution:=optional,
@@ -28,7 +25,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
2825
Bundle-ActivationPolicy: lazy
2926
Bundle-Localization: plugin
3027
Export-Package: org.eclipse.terminal.connector.process;version="1.0.0",
31-
org.eclipse.terminal.connector.process.activator;x-internal:=true,
32-
org.eclipse.terminal.connector.process.help;version="1.0.0",
33-
org.eclipse.terminal.connector.process.nls;x-internal:=true
28+
org.eclipse.terminal.connector.process.help;version="1.0.0"
3429
Automatic-Module-Name: org.eclipse.terminal.connector.process

‎terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessConnector.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import org.eclipse.terminal.connector.TerminalState;
3838
import org.eclipse.terminal.connector.process.activator.UIPlugin;
3939
import org.eclipse.terminal.connector.process.nls.Messages;
40-
import org.eclipse.terminal.internal.emulator.VT100Emulator;
41-
import org.eclipse.terminal.internal.emulator.VT100TerminalControl;
4240
import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants;
4341
import org.eclipse.terminal.view.core.utils.Env;
4442
import org.eclipse.terminal.view.ui.manager.ConsoleManager;
@@ -47,7 +45,6 @@
4745
/**
4846
* Process connector implementation.
4947
*/
50-
@SuppressWarnings("restriction")
5148
public class ProcessConnector extends AbstractStreamsConnector {
5249
// Reference to the process settings
5350
private final ProcessSettings settings;
@@ -114,10 +111,8 @@ public void connect(ITerminalControl control) {
114111
if (PTY.isSupported(PTY.Mode.TERMINAL)) {
115112
try {
116113
pty = new PTY(PTY.Mode.TERMINAL);
117-
114+
control.updateTerminalDimensions();
118115
// Initialize the terminal size
119-
VT100Emulator text = ((VT100TerminalControl) control).getTerminalText();
120-
text.fontChanged();
121116
} catch (IOException e) {
122117
// PTY not supported
123118
}

‎terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessSettingsPage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@
2828
import org.eclipse.swt.widgets.Shell;
2929
import org.eclipse.swt.widgets.Text;
3030
import org.eclipse.terminal.connector.AbstractSettingsPage;
31-
import org.eclipse.terminal.view.ui.nls.Messages;
31+
import org.eclipse.terminal.connector.process.nls.Messages;
3232
import org.eclipse.ui.PlatformUI;
3333
import org.osgi.framework.Bundle;
3434

3535
/**
3636
* Process connector settings page implementation.
3737
*/
38-
@SuppressWarnings("restriction")
3938
public class ProcessSettingsPage extends AbstractSettingsPage {
4039
private Text processImageSelectorControl;
4140
private Button processImageSelectorControlButton;

‎terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/activator/UIPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.jface.resource.ImageDescriptor;
1717
import org.eclipse.jface.resource.ImageRegistry;
1818
import org.eclipse.swt.graphics.Image;
19-
import org.eclipse.terminal.view.core.tracing.TraceHandler;
19+
import org.eclipse.terminal.view.core.utils.TraceHandler;
2020
import org.eclipse.ui.plugin.AbstractUIPlugin;
2121
import org.osgi.framework.BundleContext;
2222

‎terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,10 @@ public class Messages extends NLS {
3333

3434
public static String ProcessConnector_error_title;
3535
public static String ProcessConnector_error_creatingProcess;
36+
public static String ProcessSettingsPage_dialogTitle;
37+
public static String ProcessSettingsPage_processImagePathSelectorControl_label;
38+
public static String ProcessSettingsPage_processImagePathSelectorControl_button;
39+
public static String ProcessSettingsPage_processArgumentsControl_label;
40+
public static String ProcessSettingsPage_processWorkingDirControl_label;
41+
public static String ProcessSettingsPage_localEchoSelectorControl_label;
3642
}

‎terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@
1212

1313
ProcessConnector_error_title=Error
1414
ProcessConnector_error_creatingProcess=Failed to execute ''{0}''.\n\nPossibly caused by:\n{1}
15+
16+
ProcessSettingsPage_dialogTitle=Select Process Image
17+
ProcessSettingsPage_processImagePathSelectorControl_label=Image Path:
18+
ProcessSettingsPage_processImagePathSelectorControl_button=Browse
19+
ProcessSettingsPage_processArgumentsControl_label=Arguments:
20+
ProcessSettingsPage_processWorkingDirControl_label=Working Dir:
21+
ProcessSettingsPage_localEchoSelectorControl_label=Local Echo

‎terminal/bundles/org.eclipse.terminal.connector.ssh/META-INF/MANIFEST.MF

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
1414
Bundle-RequiredExecutionEnvironment: JavaSE-17
1515
Bundle-ActivationPolicy: lazy
1616
Bundle-Localization: plugin
17-
Export-Package: org.eclipse.terminal.connector.ssh.activator;x-internal:=true,
18-
org.eclipse.terminal.connector.ssh.connector,
17+
Export-Package: org.eclipse.terminal.connector.ssh.connector,
1918
org.eclipse.terminal.connector.ssh.controls,
20-
org.eclipse.terminal.connector.ssh.launcher,
21-
org.eclipse.terminal.connector.ssh.nls;x-internal:=true
19+
org.eclipse.terminal.connector.ssh.launcher
2220
Automatic-Module-Name: org.eclipse.terminal.connector.ssh
2321
Import-Package: org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
2422
org.eclipse.terminal.connector.provider;version="[1.0.0,2.0.0)",
2523
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
2624
org.eclipse.terminal.view.core.interfaces;version="[1.0.0,2.0.0)",
2725
org.eclipse.terminal.view.core.interfaces.constants;version="[1.0.0,2.0.0)",
28-
org.eclipse.terminal.view.core.tracing;version="[1.0.0,2.0.0)",
26+
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
2927
org.eclipse.terminal.view.ui.interfaces;version="[1.0.0,2.0.0)",
3028
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)",
3129
org.eclipse.terminal.view.ui.panels;version="[1.0.0,2.0.0)"

‎terminal/bundles/org.eclipse.terminal.connector.ssh/src/org/eclipse/terminal/connector/ssh/activator/UIPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.jsch.core.IJSchService;
1717
import org.eclipse.swt.graphics.Image;
1818
import org.eclipse.terminal.connector.ssh.connector.SshConnection;
19-
import org.eclipse.terminal.view.core.tracing.TraceHandler;
19+
import org.eclipse.terminal.view.core.utils.TraceHandler;
2020
import org.eclipse.ui.plugin.AbstractUIPlugin;
2121
import org.osgi.framework.BundleContext;
2222
import org.osgi.util.tracker.ServiceTracker;

0 commit comments

Comments
 (0)