Skip to content

Commit 0996e32

Browse files
laeubilaeubi
committed
Reduce the number of subpackages for public API
Currently there are a quite complex distinction between "the package", "the interfaces" and "the constants" so consumers need to properly import most of the time three packages. This now reduces this by moving the interfaces and constant holders into the main package, so less package versions to maintain and less to import.
1 parent b278883 commit 0996e32

File tree

102 files changed

+345
-338
lines changed

Some content is hidden

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

102 files changed

+345
-338
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
99
org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
1010
org.eclipse.terminal.connector.process;version="[1.0.0,2.0.0)",
1111
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
12-
org.eclipse.terminal.view.core.interfaces;version="[1.0.0,2.0.0)",
13-
org.eclipse.terminal.view.core.interfaces.constants;version="[1.0.0,2.0.0)",
1412
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
15-
org.eclipse.terminal.view.ui.interfaces;version="[1.0.0,2.0.0)",
16-
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)",
17-
org.eclipse.terminal.view.ui.panels;version="[1.0.0,2.0.0)"
13+
org.eclipse.terminal.view.ui;version="[1.0.0,2.0.0)",
14+
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)"
1815
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
1916
org.eclipse.core.resources;bundle-version="[3.22.200,4)",
2017
org.eclipse.core.runtime;bundle-version="[3.33.0,4)",

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
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.ITerminalService;
1718
import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
1819
import org.eclipse.terminal.view.core.utils.TraceHandler;
1920
import org.eclipse.ui.plugin.AbstractUIPlugin;
2021
import org.osgi.framework.BundleContext;
22+
import org.osgi.util.tracker.ServiceTracker;
2123

2224
/**
2325
* The activator class controls the plug-in life cycle
@@ -117,4 +119,15 @@ public static Image getImage(String key) {
117119
public static ImageDescriptor getImageDescriptor(String key) {
118120
return getDefault().getImageRegistry().getDescriptor(key);
119121
}
122+
123+
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
124+
125+
public static synchronized ITerminalService getTerminalService() {
126+
if (serviceTracker == null) {
127+
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
128+
null);
129+
serviceTracker.open();
130+
}
131+
return serviceTracker.getService();
132+
}
120133
}

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/LocalWizardConfigurationPanel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.eclipse.swt.layout.GridLayout;
2828
import org.eclipse.swt.widgets.Composite;
2929
import org.eclipse.swt.widgets.Label;
30-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
31-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
32-
import org.eclipse.terminal.view.ui.panels.AbstractExtendedConfigurationPanel;
30+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
31+
import org.eclipse.terminal.view.ui.launcher.AbstractExtendedConfigurationPanel;
32+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
3333
import org.eclipse.ui.ISelectionService;
3434
import org.eclipse.ui.PlatformUI;
3535
import org.eclipse.ui.WorkbenchEncoding;

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,15 @@
4242
import org.eclipse.terminal.connector.local.activator.UIPlugin;
4343
import org.eclipse.terminal.connector.local.controls.LocalWizardConfigurationPanel;
4444
import org.eclipse.terminal.connector.process.ProcessSettings;
45-
import org.eclipse.terminal.view.core.TerminalServiceFactory;
46-
import org.eclipse.terminal.view.core.interfaces.ITerminalService;
47-
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
48-
import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants;
49-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
50-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel;
51-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
52-
import org.eclipse.terminal.view.ui.interfaces.IMementoHandler;
53-
import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys;
45+
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
46+
import org.eclipse.terminal.view.core.ITerminalService;
47+
import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
48+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
49+
import org.eclipse.terminal.view.ui.IMementoHandler;
50+
import org.eclipse.terminal.view.ui.IPreferenceKeys;
5451
import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate;
52+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanel;
53+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
5554
import org.eclipse.ui.ISelectionService;
5655
import org.eclipse.ui.PlatformUI;
5756
import org.eclipse.ui.WorkbenchEncoding;
@@ -223,7 +222,7 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
223222
}
224223

225224
// Get the terminal service
226-
ITerminalService terminal = TerminalServiceFactory.getService();
225+
ITerminalService terminal = UIPlugin.getTerminalService();
227226
// If not available, we cannot fulfill this request
228227
if (terminal != null) {
229228
terminal.openConsole(properties, done);

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.eclipse.jface.viewers.ISelection;
2222
import org.eclipse.jface.viewers.IStructuredSelection;
2323
import org.eclipse.jface.viewers.StructuredSelection;
24-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
25-
import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate;
24+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
25+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
2626
import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager;
2727
import org.eclipse.ui.IEditorInput;
2828
import org.eclipse.ui.IPathEditorInput;

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalMementoHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import java.util.Map;
1515

1616
import org.eclipse.core.runtime.Assert;
17-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
18-
import org.eclipse.terminal.view.ui.interfaces.IMementoHandler;
17+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
18+
import org.eclipse.terminal.view.ui.IMementoHandler;
1919
import org.eclipse.ui.IMemento;
2020

2121
/**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ Import-Package: org.eclipse.cdt.utils.pty;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)",
1212
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
13-
org.eclipse.terminal.view.core.interfaces;version="[1.0.0,2.0.0)",
14-
org.eclipse.terminal.view.core.interfaces.constants;version="[1.0.0,2.0.0)",
1513
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
16-
org.eclipse.terminal.view.ui.interfaces;version="[1.0.0,2.0.0)",
14+
org.eclipse.terminal.view.ui;version="[1.0.0,2.0.0)",
1715
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)",
18-
org.eclipse.terminal.view.ui.manager;version="[1.0.0,2.0.0)",
1916
org.eclipse.terminal.view.ui.streams;version="[1.0.0,2.0.0)"
2017
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
2118
org.eclipse.core.resources;bundle-version="[3.22.200,4)";resolution:=optional,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
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.view.core.interfaces.constants.ILineSeparatorConstants;
40+
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
4141
import org.eclipse.terminal.view.core.utils.Env;
42-
import org.eclipse.terminal.view.ui.manager.ConsoleManager;
42+
import org.eclipse.terminal.view.ui.launcher.ConsoleManager;
4343
import org.eclipse.terminal.view.ui.streams.AbstractStreamsConnector;
4444

4545
/**

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import org.eclipse.terminal.connector.ITerminalConnector;
2020
import org.eclipse.terminal.connector.InMemorySettingsStore;
2121
import org.eclipse.terminal.connector.TerminalConnectorExtension;
22-
import org.eclipse.terminal.view.core.TerminalServiceFactory;
23-
import org.eclipse.terminal.view.core.interfaces.ITerminalService;
24-
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
25-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
26-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel;
27-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
22+
import org.eclipse.terminal.connector.process.activator.UIPlugin;
23+
import org.eclipse.terminal.view.core.ITerminalService;
24+
import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
25+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
2826
import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate;
27+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanel;
28+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
2929

3030
/**
3131
* Process launcher delegate implementation.
@@ -47,7 +47,7 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
4747
Assert.isNotNull(properties);
4848

4949
// Get the terminal service
50-
ITerminalService terminal = TerminalServiceFactory.getService();
50+
ITerminalService terminal = UIPlugin.getTerminalService();
5151
// If not available, we cannot fulfill this request
5252
if (terminal != null) {
5353
terminal.openConsole(properties, done);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.eclipse.core.runtime.Assert;
1616
import org.eclipse.terminal.connector.ISettingsStore;
1717
import org.eclipse.terminal.connector.InMemorySettingsStore;
18-
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
18+
import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
1919

2020
/**
2121
* Process connector settings implementation.

0 commit comments

Comments
 (0)