mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

[174945] Remove obsolete icons from rse.shells.ui

Browse source
This commit is contained in:
Martin Oberhuber 2007-05-11 18:08:15 +00:00
parent 97acafc9eb
commit 891420a8af
7 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java
View file

@ -13,10 +13,12 @@
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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) - [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; package org.eclipse.rse.internal.shells.ui;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; 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.shells.ui.RemoteCommandHelpers;
import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand; import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; 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.SystemWidgetHelpers;
import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.model.ISystemShellProvider;
import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.rse.ui.widgets.SystemHostCombo;
@ -128,7 +129,7 @@ public class SystemRemoteCommandEntryForm extends Composite
// ---------------------------------------- // ----------------------------------------
// register with system registry for events // register with system registry for events
// ---------------------------------------- // ----------------------------------------
RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this);
} }
private void runCommand() private void runCommand()
@ -139,7 +140,7 @@ public class SystemRemoteCommandEntryForm extends Composite
IHost sysConn = sysConnCombo.getHost(); IHost sysConn = sysConnCombo.getHost();
if ( sysConn != null ) 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[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn);
IRemoteCmdSubSystem currSubSystem = null; IRemoteCmdSubSystem currSubSystem = null;
String subSystemName = subSysCombo.getText(); String subSystemName = subSysCombo.getText();
@ -213,7 +214,7 @@ public class SystemRemoteCommandEntryForm extends Composite
IHost sysConn = sysConnCombo.getHost(); IHost sysConn = sysConnCombo.getHost();
if ( sysConn != null ) 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); subSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn);
for (int i = 0; i < subSystems.length; i++) for (int i = 0; i < subSystems.length; i++)
{ {

3
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java
View file

@ -30,6 +30,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -149,7 +150,7 @@ public class SystemCommandAction extends SystemBaseAction
public void run() public void run()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.connectedStatusChange(_ss, true, false); registry.connectedStatusChange(_ss, true, false);
} }
} }

3
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java
View file

@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * 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; package org.eclipse.rse.internal.shells.ui.actions;
@ -54,7 +55,7 @@ public class SystemTerminateShellAction extends SystemBaseShellAction
public void run() public void run()
{ {
// DKM - need to deselect in tree // DKM - need to deselect in tree
//SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); //ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
//registry.fireEvent(new SystemResourceChangeEvent()) //registry.fireEvent(new SystemResourceChangeEvent())
List selected = new ArrayList(); List selected = new ArrayList();
selected.addAll(_selected); selected.addAll(_selected);

5
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/propertypages/ShellServicesPropertyPage.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by 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; package org.eclipse.rse.internal.shells.ui.propertypages;
@ -21,6 +22,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.rse.core.IRSESystemType; 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.DummyHost;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; 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.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem; 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.propertypages.ServicesPropertyPage;
import org.eclipse.rse.ui.widgets.services.FactoryServiceElement; import org.eclipse.rse.ui.widgets.services.FactoryServiceElement;
import org.eclipse.rse.ui.widgets.services.ServiceElement; import org.eclipse.rse.ui.widgets.services.ServiceElement;
@ -83,7 +84,7 @@ public class ShellServicesPropertyPage extends ServicesPropertyPage
protected IShellServiceSubSystemConfiguration[] getShellServiceSubSystemConfigurations(IRSESystemType systemType) protected IShellServiceSubSystemConfiguration[] getShellServiceSubSystemConfigurations(IRSESystemType systemType)
{ {
List results = new ArrayList(); List results = new ArrayList();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, false); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, false);
for (int i = 0; i < factories.length; i++) for (int i = 0; i < factories.length; i++)

3
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java
View file

@ -31,7 +31,6 @@ import org.eclipse.rse.internal.shells.ui.actions.SystemExportShellOutputAction;
import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.shells.ui.RemoteCommandHelpers;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; 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.SystemMenuManager;
import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -119,7 +118,7 @@ public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigur
{ {
if (_activeShellImageDescriptor == null) if (_activeShellImageDescriptor == null)
{ {
_activeShellImageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELLLIVE_ID); _activeShellImageDescriptor = ShellsUIPlugin.getDefault().getImageDescriptor(ShellsUIPlugin.ICON_SYSTEM_SHELLLIVE_ID);
} }
return _activeShellImageDescriptor; return _activeShellImageDescriptor;
} }

19
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java
View file

@ -14,6 +14,7 @@
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * 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) - [168975] Move RSE Events API to Core
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * 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; 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.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer; 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.ISystemResourceChangeEvent;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.rse.core.events.ISystemResourceChangeListener;
@ -318,10 +321,8 @@ public class SystemCommandsViewPart
SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$ SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.addSystemResourceChangeListener(this); registry.addSystemResourceChangeListener(this);
RestoreStateRunnable restore = new RestoreStateRunnable(); RestoreStateRunnable restore = new RestoreStateRunnable();
@ -340,7 +341,7 @@ public class SystemCommandsViewPart
selectionService.removeSelectionListener(this); selectionService.removeSelectionListener(this);
_folder.dispose(); _folder.dispose();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.removeSystemResourceChangeListener(this); registry.removeSystemResourceChangeListener(this);
super.dispose(); super.dispose();
} }
@ -513,7 +514,7 @@ public class SystemCommandsViewPart
{ {
boolean hasItem = false; boolean hasItem = false;
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
IHost[] connections = registry.getHosts(); IHost[] connections = registry.getHosts();
for (int i = 0; i < connections.length; i++) for (int i = 0; i < connections.length; i++)
@ -639,7 +640,7 @@ public class SystemCommandsViewPart
protected void initDefaultCommandShells() protected void initDefaultCommandShells()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
IHost[] connections = registry.getHosts(); IHost[] connections = registry.getHosts();
CommandsViewPage curpage = _folder.getCurrentTabItem(); CommandsViewPage curpage = _folder.getCurrentTabItem();
@ -705,7 +706,7 @@ public class SystemCommandsViewPart
Object source = event.getSource(); Object source = event.getSource();
if (source instanceof IRemoteCmdSubSystem) if (source instanceof IRemoteCmdSubSystem)
{ {
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); Shell shell = SystemBasePlugin.getActiveWorkbenchShell();
shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source)); shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source));
} }
else if (source instanceof IRemoteCommandShell) else if (source instanceof IRemoteCommandShell)
@ -752,7 +753,7 @@ public class SystemCommandsViewPart
else if (parent instanceof ISubSystem) else if (parent instanceof ISubSystem)
{ {
// DKM - for now assuming only 1 cmd subsystem // DKM - for now assuming only 1 cmd subsystem
//SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); //SystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
//registry.getCmdSubSystems() //registry.getCmdSubSystems()
cmdSS = RemoteCommandHelpers.getCmdSubSystem(((ISubSystem)parent).getHost()); cmdSS = RemoteCommandHelpers.getCmdSubSystem(((ISubSystem)parent).getHost());
} }
@ -767,7 +768,7 @@ public class SystemCommandsViewPart
Object source = event.getSource(); Object source = event.getSource();
if (source instanceof IRemoteCmdSubSystem) if (source instanceof IRemoteCmdSubSystem)
{ {
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); Shell shell = SystemBasePlugin.getActiveWorkbenchShell();
shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source)); shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((IRemoteCmdSubSystem) source));
} }
} }

7
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by 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) - [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; 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.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; 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.IRemoteCmdSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.RemoteCmdSubSystem; 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.rse.ui.messages.SystemMessageDialog;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -74,7 +75,7 @@ public class RemoteCommandHelpers
public static IRemoteCmdSubSystem getCmdSubSystem(IHost connection) public static IRemoteCmdSubSystem getCmdSubSystem(IHost connection)
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISubSystem[] sses = sr.getSubSystems(connection); ISubSystem[] sses = sr.getSubSystems(connection);
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {
@ -90,7 +91,7 @@ public class RemoteCommandHelpers
public static IRemoteCmdSubSystem[] getCmdSubSystems(IHost connection) public static IRemoteCmdSubSystem[] getCmdSubSystems(IHost connection)
{ {
List results = new ArrayList(); List results = new ArrayList();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISubSystem[] sses = sr.getSubSystems(connection); ISubSystem[] sses = sr.getSubSystems(connection);
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {