diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java index 5b1590cbc0c..5202a7f3bb1 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java @@ -13,10 +13,12 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; @@ -26,7 +28,6 @@ import org.eclipse.rse.core.model.ISubSystemConfigurationCategories; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.widgets.SystemHostCombo; @@ -128,7 +129,7 @@ public class SystemRemoteCommandEntryForm extends Composite // ---------------------------------------- // register with system registry for events // ---------------------------------------- - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); } private void runCommand() @@ -139,7 +140,7 @@ public class SystemRemoteCommandEntryForm extends Composite IHost sysConn = sysConnCombo.getHost(); if ( sysConn != null ) { - //SubSystem[] cmdSubSystems = RSEUIPlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); + //SubSystem[] cmdSubSystems = RSECorePlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); IRemoteCmdSubSystem currSubSystem = null; String subSystemName = subSysCombo.getText(); @@ -213,7 +214,7 @@ public class SystemRemoteCommandEntryForm extends Composite IHost sysConn = sysConnCombo.getHost(); if ( sysConn != null ) { - //subSystems = RSEUIPlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); + //subSystems = RSECorePlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); subSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); for (int i = 0; i < subSystems.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java index 402d5bbdc74..fe6f4a4f069 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java @@ -30,6 +30,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -149,7 +150,7 @@ public class SystemCommandAction extends SystemBaseAction public void run() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.connectedStatusChange(_ss, true, false); } } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java index 97f6ded0719..d45bdbfd66f 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.actions; @@ -54,7 +55,7 @@ public class SystemTerminateShellAction extends SystemBaseShellAction public void run() { // DKM - need to deselect in tree - //SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + //ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); //registry.fireEvent(new SystemResourceChangeEvent()) List selected = new ArrayList(); selected.addAll(_selected); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/propertypages/ShellServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/propertypages/ShellServicesPropertyPage.java index a70385e6096..e324caf94a3 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/propertypages/ShellServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/propertypages/ShellServicesPropertyPage.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.propertypages; @@ -21,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -28,7 +30,6 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.propertypages.ServicesPropertyPage; import org.eclipse.rse.ui.widgets.services.FactoryServiceElement; import org.eclipse.rse.ui.widgets.services.ServiceElement; @@ -83,7 +84,7 @@ public class ShellServicesPropertyPage extends ServicesPropertyPage protected IShellServiceSubSystemConfiguration[] getShellServiceSubSystemConfigurations(IRSESystemType systemType) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, false); for (int i = 0; i < factories.length; i++) diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java index 4243443cbe9..5b68f6b3c5a 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java @@ -31,7 +31,6 @@ import org.eclipse.rse.internal.shells.ui.actions.SystemExportShellOutputAction; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; @@ -119,7 +118,7 @@ public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigur { if (_activeShellImageDescriptor == null) { - _activeShellImageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELLLIVE_ID); + _activeShellImageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELLLIVE_ID); } return _activeShellImageDescriptor; } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java index 0dc3dabd378..5ecbcbd4af6 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; @@ -38,6 +39,8 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; +import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeListener; @@ -318,10 +321,8 @@ public class SystemCommandsViewPart SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$ - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); - - registry.addSystemResourceChangeListener(this); RestoreStateRunnable restore = new RestoreStateRunnable(); @@ -340,7 +341,7 @@ public class SystemCommandsViewPart selectionService.removeSelectionListener(this); _folder.dispose(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.removeSystemResourceChangeListener(this); super.dispose(); } @@ -513,7 +514,7 @@ public class SystemCommandsViewPart { boolean hasItem = false; - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IHost[] connections = registry.getHosts(); for (int i = 0; i < connections.length; i++) @@ -639,7 +640,7 @@ public class SystemCommandsViewPart protected void initDefaultCommandShells() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IHost[] connections = registry.getHosts(); CommandsViewPage curpage = _folder.getCurrentTabItem(); @@ -705,7 +706,7 @@ public class SystemCommandsViewPart Object source = event.getSource(); if (source instanceof IRemoteCmdSubSystem) { - Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); + Shell shell = SystemBasePlugin.getActiveWorkbenchShell(); shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source)); } else if (source instanceof IRemoteCommandShell) @@ -752,7 +753,7 @@ public class SystemCommandsViewPart else if (parent instanceof ISubSystem) { // DKM - for now assuming only 1 cmd subsystem - //SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + //SystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); //registry.getCmdSubSystems() cmdSS = RemoteCommandHelpers.getCmdSubSystem(((ISubSystem)parent).getHost()); } @@ -767,7 +768,7 @@ public class SystemCommandsViewPart Object source = event.getSource(); if (source instanceof IRemoteCmdSubSystem) { - Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); + Shell shell = SystemBasePlugin.getActiveWorkbenchShell(); shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source)); } } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java index 3b2cb00e469..5ffed447e5d 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui ********************************************************************************/ package org.eclipse.rse.shells.ui; @@ -24,6 +25,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -38,7 +40,6 @@ import org.eclipse.rse.subsystems.shells.core.model.RemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.RemoteCmdSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.swt.widgets.Shell; @@ -74,7 +75,7 @@ public class RemoteCommandHelpers public static IRemoteCmdSubSystem getCmdSubSystem(IHost connection) { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] sses = sr.getSubSystems(connection); for (int i = 0; i < sses.length; i++) { @@ -90,7 +91,7 @@ public class RemoteCommandHelpers public static IRemoteCmdSubSystem[] getCmdSubSystems(IHost connection) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] sses = sr.getSubSystems(connection); for (int i = 0; i < sses.length; i++) {