mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

[186773][api] split ISystemRegistryUI from ISystemRegistry

Browse source
This commit is contained in:
Martin Oberhuber 2007-05-14 13:05:23 +00:00
parent a05c47c834
commit 5ba7489961
157 changed files with 694 additions and 540 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
View file

@ -10,6 +10,7 @@
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.discovery; package org.eclipse.rse.internal.discovery;
@ -32,7 +33,6 @@ import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction;
import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Pair;
import org.eclipse.tm.discovery.model.Service; import org.eclipse.tm.discovery.model.Service;
@ -93,7 +93,7 @@ public class ServiceDiscoveryWizard extends Wizard {
IConfigurationElement[] ce = ep.getConfigurationElements(); IConfigurationElement[] ce = ep.getConfigurationElements();
SystemRefreshAllAction systemRefreshAllAction = new SystemRefreshAllAction(null); SystemRefreshAllAction systemRefreshAllAction = new SystemRefreshAllAction(null);
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
String[] addresses = serviceDiscoveryPage.getAddresses(); String[] addresses = serviceDiscoveryPage.getAddresses();
for (int i = 0; i < addresses.length; i++) { for (int i = 0; i < addresses.length; i++) {
@ -109,7 +109,7 @@ public class ServiceDiscoveryWizard extends Wizard {
IRSESystemType discoveryType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_DISCOVERY_ID); IRSESystemType discoveryType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_DISCOVERY_ID);
conn = registry.createHost(discoveryType, "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$ conn = registry.createHost(discoveryType, "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$
} catch (Exception e) { } catch (Exception e) {
RSEUIPlugin.getTheSystemRegistry().deleteHost(conn); RSECorePlugin.getTheSystemRegistry().deleteHost(conn);
return false; return false;
} }
@ -187,7 +187,7 @@ public class ServiceDiscoveryWizard extends Wizard {
} }
} }
RSEUIPlugin.getTheSystemRegistry().expandHost(conn); RSECorePlugin.getTheSystemRegistry().expandHost(conn);
} }
systemRefreshAllAction.run(); systemRefreshAllAction.run();

2
rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html
View file

@ -209,7 +209,7 @@ class in the <samp>org.eclipse.rse.core</samp> plugin.
<p>A UI-enabled extension of the system registry is available through the <p>A UI-enabled extension of the system registry is available through the
<A href="../reference/api/org/eclipse/rse/ui/model/ISystemRegistryUI.html">ISystemRegistryUI</A> interface. <A href="../reference/api/org/eclipse/rse/ui/model/ISystemRegistryUI.html">ISystemRegistryUI</A> interface.
This interface is available by calling the static method This interface is available by calling the static method
<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistry()">getTheSystemRegistry()</A> in the <A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">getTheSystemRegistryUI()</A> in the
<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html">RSEUIPlugin</A> <A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html">RSEUIPlugin</A>
class in the <samp>org.eclipse.rse.ui</samp> plugin. class in the <samp>org.eclipse.rse.ui</samp> plugin.
</p> </p>

6
rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html
View file

@ -123,12 +123,12 @@ To get the system registry, use the
</p> </p>
<p>At times, you may want to post events in a dispatch thread rather than using the <p>At times, you may want to post events in a dispatch thread rather than using the
original client's thread; or you may want to pass the originating viewer's ID original client's thread; or you may need access to the System Clipboard.
with the resource change event. Such operations are only possible when the UI Such operations are only possible when the UI
is loaded, and therefore you need to use is loaded, and therefore you need to use
<samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String, java.lang.Object)">ISystemRegistry.fireEvent()</a></samp> <samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String, java.lang.Object)">ISystemRegistry.fireEvent()</a></samp>
method in that case. To get the system registry UI interface, use the method in that case. To get the system registry UI interface, use the
<samp><A href="../../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistry()">RSEUIPlugin.getTheSystemRegistry()</a></samp> <samp><A href="../../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">RSEUIPlugin.getTheSystemRegistryUI()</a></samp>
method. method.
</p> </p>

2
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java
View file

@ -47,7 +47,7 @@ public class DaytimeSubSystem extends SubSystem implements IServiceSubSystem {
//This is called after connect - expand the daytime node. //This is called after connect - expand the daytime node.
//May be called in worker thread. //May be called in worker thread.
//TODO find a more elegant solution for expanding the item, e.g. use implicit connect like filters //TODO find a more elegant solution for expanding the item, e.g. use implicit connect like filters
final ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); final ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistryUI();
final SystemResourceChangeEvent event = new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); final SystemResourceChangeEvent event = new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
//TODO bug 150919: postEvent() should not be necessary asynchronously //TODO bug 150919: postEvent() should not be necessary asynchronously
//sr.postEvent(event); //sr.postEvent(event);

9
rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2007 PalmSource, Inc. * Copyright (c) 2006, 2007 PalmSource, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* Ewa Matejska (PalmSource) - initial API and implementation * Ewa Matejska (PalmSource) - initial API and implementation
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.remotecdt; package org.eclipse.rse.internal.remotecdt;
@ -19,10 +20,10 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
@ -300,7 +301,7 @@ public class RemoteCMainTab extends CMainTab {
String remoteConnection = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : null; String remoteConnection = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : null;
if(remoteConnection == null) if(remoteConnection == null)
return null; return null;
IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts(); IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts();
int i = 0; int i = 0;
for(i = 0; i < connections.length; i++) for(i = 0; i < connections.length; i++)
if(connections[i].getAliasName().equals(remoteConnection)) if(connections[i].getAliasName().equals(remoteConnection))
@ -325,7 +326,7 @@ public class RemoteCMainTab extends CMainTab {
protected void updateConnectionPulldown() { protected void updateConnectionPulldown() {
connectionCombo.removeAll(); connectionCombo.removeAll();
IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$ IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$
for(int i = 0; i < connections.length; i++) for(int i = 0; i < connections.length; i++)
connectionCombo.add(connections[i].getAliasName()); connectionCombo.add(connections[i].getAliasName());

5
rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java
View file

@ -8,6 +8,7 @@
* Contributors: * Contributors:
* Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchDelegate * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchDelegate
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
@ -41,6 +42,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.IProcess;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.IService; import org.eclipse.rse.services.IService;
@ -50,7 +52,6 @@ import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.services.shells.IShellService;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
@ -181,7 +182,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
protected IHost getCurrentConnection(ILaunchConfiguration config) throws CoreException { protected IHost getCurrentConnection(ILaunchConfiguration config) throws CoreException {
String remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, ""); //$NON-NLS-1$ String remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, ""); //$NON-NLS-1$
IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts(); IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts();
int i = 0; int i = 0;
for(i = 0; i < connections.length; i++) for(i = 0; i < connections.length; i++)
if(connections[i].getAliasName().equals(remoteConnection)) if(connections[i].getAliasName().equals(remoteConnection))

7
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.connectorservice.dstore.util; package org.eclipse.rse.connectorservice.dstore.util;
@ -25,6 +25,7 @@ import org.eclipse.dstore.extra.IDomainListener;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
@ -121,7 +122,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
IRunnableContext runnableContext = getRunnableContext(getShell()); IRunnableContext runnableContext = getRunnableContext(getShell());
runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress
_connection.reset(); _connection.reset();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
} }
catch (InterruptedException exc) // user cancelled catch (InterruptedException exc) // user cancelled

4
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
View file

@ -10,6 +10,7 @@
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
* Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API
* - copied code from org.eclipse.team.cvs.ssh2/JSchSession (Copyright IBM) * - copied code from org.eclipse.team.cvs.ssh2/JSchSession (Copyright IBM)
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.connectorservice.ssh; package org.eclipse.rse.internal.connectorservice.ssh;
@ -34,6 +35,7 @@ import com.jcraft.jsch.Session;
import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo; import com.jcraft.jsch.UserInfo;
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;
@ -256,7 +258,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs
//runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress //runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress
runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress
_connection.reset(); _connection.reset();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
} }
catch (InterruptedException exc) // user cancelled catch (InterruptedException exc) // user cancelled

11
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.core.model; package org.eclipse.rse.core.model;
@ -22,6 +23,7 @@ package org.eclipse.rse.core.model;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
@ -51,7 +53,7 @@ import org.eclipse.rse.internal.core.RSECoreRegistry;
* <p> * <p>
* This interface is not intended to be implemented by clients. * This interface is not intended to be implemented by clients.
*/ */
public interface ISystemRegistry extends ISchedulingRule { public interface ISystemRegistry extends ISchedulingRule, IAdaptable {
public ISystemFilterStartHere getSystemFilterStartHere(); public ISystemFilterStartHere getSystemFilterStartHere();
@ -470,13 +472,6 @@ public interface ISystemRegistry extends ISchedulingRule {
*/ */
public String[] getHostNames(IRSESystemType systemType); public String[] getHostNames(IRSESystemType systemType);
/**
* Returns the list of objects on the system clipboard
* @param srcType the transfer type
* @return the list of clipboard objects
*/
public List getSystemClipboardObjects(int srcType);
/** /**
* Convenience method to create a local connection, as it often that one is needed * Convenience method to create a local connection, as it often that one is needed
* for access to the local file system. * for access to the local file system.

5
rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/internal/eclipse/filesystem/RSEFileStoreImpl.java
View file

@ -17,6 +17,7 @@
* - Improve performance by RSEFileStore instance factory and caching IRemoteFile. * - Improve performance by RSEFileStore instance factory and caching IRemoteFile.
* - Also remove unnecessary class RSEFileCache and obsolete branding files. * - Also remove unnecessary class RSEFileCache and obsolete branding files.
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.eclipse.filesystem; package org.eclipse.rse.internal.eclipse.filesystem;
@ -35,6 +36,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
@ -48,7 +50,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileContext; import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileContext;
import org.eclipse.rse.ui.RSEUIPlugin;
/** /**
* Implementation of IFileStore for RSE. * Implementation of IFileStore for RSE.
@ -114,7 +115,7 @@ public class RSEFileStoreImpl extends FileStore
if (hostNameOrAddr==null) { if (hostNameOrAddr==null) {
return null; return null;
} }
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
IHost[] connections = sr.getHosts(); IHost[] connections = sr.getHosts();
//FIXME HACK workaround until we get an API method to know when persistent data is fully restored //FIXME HACK workaround until we get an API method to know when persistent data is fully restored

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -12,7 +12,7 @@
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Added Double Click Listener that closes dialog on file double click * Kevin Doyle (IBM) - Added Double Click Listener that closes dialog on file double click
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.dialogs; package org.eclipse.rse.files.ui.dialogs;
@ -24,7 +24,6 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter;
import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.internal.ui.view.SystemView;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog; import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
View file

@ -16,6 +16,7 @@
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -43,6 +44,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -278,7 +280,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
// to handle migration of this smoothly, we can use another method to determine the subsystem // to handle migration of this smoothly, we can use another method to determine the subsystem
if (subsystemId != null) if (subsystemId != null)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
fs = registry.getSubSystem(subsystemId); fs = registry.getSubSystem(subsystemId);
} }
@ -1413,7 +1415,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
properties.setRemoteFileObject(this); properties.setRemoteFileObject(this);
// set remote properties // set remote properties
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
String subSystemId = registry.getAbsoluteNameForSubSystem(subsystem); String subSystemId = registry.getAbsoluteNameForSubSystem(subsystem);
properties.setRemoteFileSubSystem(subSystemId); properties.setRemoteFileSubSystem(subSystemId);
properties.setRemoteFilePath(remoteFile.getAbsolutePath()); properties.setRemoteFilePath(remoteFile.getAbsolutePath());

11
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
View file

@ -15,6 +15,7 @@
* 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) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -304,7 +305,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;
@ -376,7 +377,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
String ssStr = properties.getRemoteFileSubSystem(); String ssStr = properties.getRemoteFileSubSystem();
if (ssStr != null) if (ssStr != null)
{ {
ISubSystem ss = RSEUIPlugin.getTheSystemRegistry().getSubSystem(ssStr); ISubSystem ss = RSECorePlugin.getTheSystemRegistry().getSubSystem(ssStr);
if (doesHandle(ss)) if (doesHandle(ss))
{ {
_changedResources.add(resource); _changedResources.add(resource);
@ -510,7 +511,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
// to handle migration of this smoothly, we can use another method to determine the subsystem // to handle migration of this smoothly, we can use another method to determine the subsystem
if (subsystemId != null) if (subsystemId != null)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
fs = registry.getSubSystem(subsystemId); fs = registry.getSubSystem(subsystemId);
} }
@ -591,7 +592,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
protected void refreshRemoteResource(Object parent) protected void refreshRemoteResource(Object parent)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
// refresh // refresh
if (parent != null) if (parent != null)
{ {
@ -629,7 +630,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
private IRemoteFileSubSystem getLocalFileSubSystem() private IRemoteFileSubSystem getLocalFileSubSystem()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
IHost con = registry.getLocalHost(); IHost con = registry.getLocalHost();
if (con != null) if (con != null)
{ {

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -15,6 +15,7 @@
* 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) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -22,13 +23,14 @@ import java.util.ArrayList;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.files.ui.actions.SystemUploadConflictAction; import org.eclipse.rse.internal.files.ui.actions.SystemUploadConflictAction;
import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.services.files.RemoteFileSecurityException;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@ -262,7 +264,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
IRemoteFile parent = remoteFile.getParentRemoteFile(); IRemoteFile parent = remoteFile.getParentRemoteFile();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
// refresh // refresh
if (parent != null) if (parent != null)
{ {
@ -308,7 +310,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
// 2) Overwrite remote // 2) Overwrite remote
// 3) Save as... // 3) Save as...
// 4) Cancel // 4) Cancel
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tempFile, remoteFile, remoteNewer); SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tempFile, remoteFile, remoteNewer);
conflictAction.run(); conflictAction.run();

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -18,6 +18,7 @@
* 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) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.resources; package org.eclipse.rse.files.ui.resources;
@ -48,6 +49,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
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;
@ -247,7 +249,7 @@ public class UniversalFileTransferUtility
String remotePath = remoteFile.getAbsolutePath(); String remotePath = remoteFile.getAbsolutePath();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem); String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem);
properties.setRemoteFileSubSystem(subSystemId); properties.setRemoteFileSubSystem(subSystemId);
properties.setRemoteFilePath(remotePath); properties.setRemoteFilePath(remotePath);
@ -917,7 +919,7 @@ public class UniversalFileTransferUtility
*/ */
private static IRemoteFileSubSystem getLocalFileSubSystem() private static IRemoteFileSubSystem getLocalFileSubSystem()
{ {
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++)
{ {

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - moved SystemPreferencesManager to a new package * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.widgets; package org.eclipse.rse.files.ui.widgets;
@ -21,6 +22,7 @@ import java.util.ResourceBundle;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -417,11 +419,11 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
String connName = extractConnectionName(fileString); String connName = extractConnectionName(fileString);
if ((profileName == null) || (connName == null)) if ((profileName == null) || (connName == null))
return null; return null;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISystemProfile profile = sr.getSystemProfile(profileName); ISystemProfile profile = sr.getSystemProfile(profileName);
if (profile == null) if (profile == null)
return null; return null;
IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName); IHost conn = RSECorePlugin.getTheSystemRegistry().getHost(profile,connName);
return conn; return conn;
} }
@ -569,7 +571,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
if ((profileName == null) || (connName == null) || (dirName == null)) if ((profileName == null) || (connName == null) || (dirName == null))
return null; return null;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
// turn profile name into profile object... // turn profile name into profile object...
ISystemProfile profile = sr.getSystemProfile(profileName); ISystemProfile profile = sr.getSystemProfile(profileName);
@ -581,7 +583,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
} }
// turn connection name into connection object... // turn connection name into connection object...
IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName); IHost conn = RSECorePlugin.getTheSystemRegistry().getHost(profile,connName);
if (conn == null) if (conn == null)
{ {
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_CONNECTION_NOTFOUND); msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_CONNECTION_NOTFOUND);

7
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
View file

@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.files.ui.widgets; package org.eclipse.rse.files.ui.widgets;
@ -27,6 +28,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemRemoteObjectMatcher; import org.eclipse.rse.core.SystemRemoteObjectMatcher;
@ -47,7 +49,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.subsystems.files.core.util.SystemRemoteFileMatcher; import org.eclipse.rse.subsystems.files.core.util.SystemRemoteFileMatcher;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -168,7 +169,7 @@ public class SystemSelectRemoteFileOrFolderForm
callerInstanceOfWizardPage = (caller instanceof WizardPage); callerInstanceOfWizardPage = (caller instanceof WizardPage);
callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog);
//rb = RSEUIPlugin.getResourceBundle(); //rb = RSEUIPlugin.getResourceBundle();
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
// set default GUI // set default GUI
verbiage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBIAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBIAGE; verbiage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBIAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBIAGE;
@ -290,7 +291,7 @@ public class SystemSelectRemoteFileOrFolderForm
setSystemConnection(connection); setSystemConnection(connection);
setShowNewConnectionPrompt(false); setShowNewConnectionPrompt(false);
setAutoExpandDepth(1); setAutoExpandDepth(1);
//ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); //ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection); IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration(); IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString rffs = new RemoteFileFilterString(ssf); RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -28,6 +29,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
@ -159,7 +161,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
IRemoteFile selection = (IRemoteFile) _selected.get(i); IRemoteFile selection = (IRemoteFile) _selected.get(i);
addToArchive(selection, destinationArchive, saveFullPathInfo, relativeTo); addToArchive(selection, destinationArchive, saveFullPathInfo, relativeTo);
} }
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destinationArchive, destinationArchive.getParentPath(), destSS, null); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destinationArchive, destinationArchive.getParentPath(), destSS, null);
registry.fireEvent(new SystemResourceChangeEvent(destinationArchive, ISystemResourceChangeEvents.EVENT_REFRESH, destinationArchive.getParentPath())); registry.fireEvent(new SystemResourceChangeEvent(destinationArchive, ISystemResourceChangeEvents.EVENT_REFRESH, destinationArchive.getParentPath()));
repeat = false; repeat = false;
@ -315,7 +317,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java
View file

@ -14,18 +14,20 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
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.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.files.ui.dialogs.CombineDialog; import org.eclipse.rse.files.ui.dialogs.CombineDialog;
import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@ -161,7 +163,7 @@ public class SystemCombineAction extends SystemExtractToAction {
{ {
} }
} }
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null);
registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
repeat = false; repeat = false;

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java
View file

@ -13,17 +13,19 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.files.ui.dialogs.CombineDialog; import org.eclipse.rse.files.ui.dialogs.CombineDialog;
import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@ -168,7 +170,7 @@ public class SystemConvertAction extends SystemExtractToAction {
catch (java.lang.InterruptedException e) catch (java.lang.InterruptedException e)
{ {
} }
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null);
registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
} }

3
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java
View file

@ -14,6 +14,7 @@
* 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) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -485,7 +486,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
Viewer v = getViewer(); Viewer v = getViewer();
if (v instanceof ISystemTree) if (v instanceof ISystemTree)
{ {
SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); SystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISystemTree tree = (ISystemTree)v; ISystemTree tree = (ISystemTree)v;
Object parent = tree.getSelectedParent(); Object parent = tree.getSelectedParent();
if (parent == null) if (parent == null)

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -260,7 +260,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
*/ */
public void run() public void run()
{ {
setShell(RSEUIPlugin.getTheSystemRegistry().getShell()); setShell(RSEUIPlugin.getTheSystemRegistryUI().getShell());
SystemIFileProperties properties = new SystemIFileProperties(_tempFile); SystemIFileProperties properties = new SystemIFileProperties(_tempFile);
DownloadConflictDialog cnfDialog = getConflictDialog(); DownloadConflictDialog cnfDialog = getConflictDialog();

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java
View file

@ -13,6 +13,7 @@
* 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) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -28,12 +29,13 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@ -122,7 +124,7 @@ public class SystemExtractAction extends SystemBaseAction
} }
// always refresh // always refresh
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null);
registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destinationParent)); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destinationParent));
} }
@ -259,7 +261,7 @@ public class SystemExtractAction extends SystemBaseAction
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java
View file

@ -13,11 +13,13 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
@ -161,7 +163,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
{ {
} }
// always refresh // always refresh
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null);
registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
} }

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java
View file

@ -13,6 +13,7 @@
* 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][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -154,7 +155,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
// refresh all instances of the source parent, and all affected filters... // refresh all instances of the source parent, and all affected filters...
ISubSystem fileSS = targetFolder.getParentRemoteFileSubSystem(); ISubSystem fileSS = targetFolder.getParentRemoteFileSubSystem();
//RSEUIPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent( //RSECorePlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
// ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, copiedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null); // ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, copiedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null);
RSECorePlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent( RSECorePlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, movedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null); ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, movedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null);
@ -164,7 +165,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
Viewer v = getViewer(); Viewer v = getViewer();
if (v instanceof ISystemTree) if (v instanceof ISystemTree)
{ {
SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); SystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISystemTree tree = (ISystemTree)v; ISystemTree tree = (ISystemTree)v;
Object parent = tree.getSelectedParent(); Object parent = tree.getSelectedParent();
if (parent != null) if (parent != null)

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
View file

@ -13,6 +13,7 @@
* 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) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions; package org.eclipse.rse.internal.files.ui.actions;
@ -24,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
@ -503,7 +505,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
try try
{ {
_saveasFile = _saveasFile.getParentRemoteFileSubSystem().getRemoteFileObject(_saveasFile.getAbsolutePath(), new NullProgressMonitor()); _saveasFile = _saveasFile.getParentRemoteFileSubSystem().getRemoteFileObject(_saveasFile.getAbsolutePath(), new NullProgressMonitor());
RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_saveasFile.getParentRemoteFile(), ISystemResourceChangeEvents.EVENT_REFRESH, null)); RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_saveasFile.getParentRemoteFile(), ISystemResourceChangeEvents.EVENT_REFRESH, null));
} }
catch (SystemMessageException e) catch (SystemMessageException e)

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/FileServicesPropertyPage.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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.propertypages; package org.eclipse.rse.internal.files.ui.propertypages;
@ -21,13 +22,13 @@ 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.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; 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.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystemConfiguration;
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;
@ -70,7 +71,7 @@ public class FileServicesPropertyPage extends ServicesPropertyPage
protected IFileServiceSubSystemConfiguration[] getFileServiceSubSystemConfigurations(IRSESystemType systemType) protected IFileServiceSubSystemConfiguration[] getFileServiceSubSystemConfigurations(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++)

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - 176488: adding some text for the cache limit checkbox * David Dykstal (IBM) - 176488: adding some text for the cache limit checkbox
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.propertypages; package org.eclipse.rse.internal.files.ui.propertypages;
@ -33,6 +34,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -342,7 +344,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;
@ -425,7 +427,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
else if (properties.getDownloadFileTimeStamp() != child.getLocation().toFile().lastModified()) else if (properties.getDownloadFileTimeStamp() != child.getLocation().toFile().lastModified())
{ {
String ssString = properties.getRemoteFileSubSystem(); String ssString = properties.getRemoteFileSubSystem();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
ISubSystem subsystem = registry.getSubSystem(ssString); ISubSystem subsystem = registry.getSubSystem(ssString);
if (subsystem != null) if (subsystem != null)
{ {
@ -537,7 +539,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
else else
{ {
String ssString = properties.getRemoteFileSubSystem(); String ssString = properties.getRemoteFileSubSystem();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
ISubSystem subsystem = registry.getSubSystem(ssString); ISubSystem subsystem = registry.getSubSystem(ssString);
if (subsystem != null) if (subsystem != null)
{ {

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java
View file

@ -14,6 +14,7 @@
* 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) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.propertypages; package org.eclipse.rse.internal.files.ui.propertypages;
@ -25,6 +26,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@ -453,7 +455,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
try try
{ {
getRemoteFile().getParentRemoteFileSubSystem().setReadOnly(getRemoteFile(), readOnlySelected, new NullProgressMonitor()); getRemoteFile().getParentRemoteFileSubSystem().setReadOnly(getRemoteFile(), readOnlySelected, new NullProgressMonitor());
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new org.eclipse.rse.core.events.SystemResourceChangeEvent( new org.eclipse.rse.core.events.SystemResourceChangeEvent(
getRemoteFile(),ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,null)); getRemoteFile(),ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,null));

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java
View file

@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.resources; package org.eclipse.rse.internal.files.ui.resources;
@ -34,6 +35,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.files.ui.resources.ISystemMountPathMapper; import org.eclipse.rse.files.ui.resources.ISystemMountPathMapper;
@ -542,7 +544,7 @@ public class SystemRemoteEditManager
String pathStr = properties.getRemoteFilePath(); String pathStr = properties.getRemoteFilePath();
if (subsystemStr != null && pathStr != null) if (subsystemStr != null && pathStr != null)
{ {
ISubSystem subsystem = RSEUIPlugin.getTheSystemRegistry().getSubSystem(subsystemStr); ISubSystem subsystem = RSECorePlugin.getTheSystemRegistry().getSubSystem(subsystemStr);
if (subsystem != null) if (subsystem != null)
{ {
Object rmtObject = null; Object rmtObject = null;

7
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2007 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.search; package org.eclipse.rse.internal.files.ui.search;
@ -29,6 +29,7 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
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.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
@ -1102,7 +1103,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
return null; return null;
} }
else { else {
ISystemRegistry reg = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry reg = RSECorePlugin.getTheSystemRegistry();
ISystemProfile profile = reg.getSystemProfile(profName); ISystemProfile profile = reg.getSystemProfile(profName);
if (profile == null) { if (profile == null) {

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -42,7 +43,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.IContextObject;
import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.Clipboard;
@ -140,8 +140,7 @@ public class RemoteFileSubSystemConfigurationAdapter extends SubSystemConfigurat
// FIXME - can't do this here anymore // FIXME - can't do this here anymore
//_additionalActions.add(new SystemCommandAction(shell, true)); //_additionalActions.add(new SystemCommandAction(shell, true));
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
Clipboard clipboard = registry.getSystemClipboard();
_additionalActions.add(new SystemPasteFromClipboardAction(shell, clipboard)); _additionalActions.add(new SystemPasteFromClipboardAction(shell, clipboard));
} }
return _additionalActions; return _additionalActions;

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -19,6 +19,7 @@
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -47,7 +48,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
@ -125,7 +125,6 @@ import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog; import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.operations.SystemFetchOperation; import org.eclipse.rse.ui.operations.SystemFetchOperation;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
@ -418,8 +417,7 @@ public class SystemViewRemoteFileAdapter
//ISubSystem subsys = firstFile.getParentRemoteFileSubSystem(); //ISubSystem subsys = firstFile.getParentRemoteFileSubSystem();
// DKM - clipboard based copy actions // DKM - clipboard based copy actions
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
Clipboard clipboard = registry.getSystemClipboard();
if (pasteClipboardAction == null) if (pasteClipboardAction == null)
{ {
@ -1530,7 +1528,7 @@ public class SystemViewRemoteFileAdapter
*/ */
private IRemoteFileSubSystem getLocalFileSubSystem() private IRemoteFileSubSystem getLocalFileSubSystem()
{ {
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++)
{ {
@ -2521,7 +2519,7 @@ public class SystemViewRemoteFileAdapter
boolean ok = true; boolean ok = true;
IRemoteFile file = (IRemoteFile) element; IRemoteFile file = (IRemoteFile) element;
IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem(); IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
try try
{ {

3
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java
View file

@ -15,6 +15,7 @@
* 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) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -172,7 +173,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
{ {
if (_copyOutputAction == null) if (_copyOutputAction == null)
{ {
_copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard());
} }
menu.add(menuGroup, _copyOutputAction); menu.add(menuGroup, _copyOutputAction);

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -12,20 +12,16 @@
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName * Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.wizards; package org.eclipse.rse.internal.files.ui.wizards;
import java.util.Vector;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -12,20 +12,16 @@
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName * Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.files.ui.wizards; package org.eclipse.rse.internal.files.ui.wizards;
import java.util.Vector;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
@ -71,7 +67,7 @@ public class SystemNewFolderWizardMainPage
super(wizard, "NewFolder", //$NON-NLS-1$ super(wizard, "NewFolder", //$NON-NLS-1$
FileResources.RESID_NEWFOLDER_PAGE1_TITLE, FileResources.RESID_NEWFOLDER_PAGE1_TITLE,
FileResources.RESID_NEWFOLDER_PAGE1_DESCRIPTION); FileResources.RESID_NEWFOLDER_PAGE1_DESCRIPTION);
// nameValidator = new ValidatorProfileName(RSEUIPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector()); // nameValidator = new ValidatorProfileName(RSECorePlugin.getTheSystemRegistry().getAllSystemProfileNamesVector());
nameValidator = new ValidatorUniqueString(allnames, true); nameValidator = new ValidatorUniqueString(allnames, true);
this.parentFolders = parentFolders; this.parentFolders = parentFolders;
} }

10
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java
View file

@ -13,6 +13,7 @@
* 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][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.processes.ui.actions; package org.eclipse.rse.internal.processes.ui.actions;
@ -28,6 +29,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
@ -47,7 +49,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
public class SystemKillProcessAction extends SystemBaseDialogAction implements IRunnableWithProgress public class SystemKillProcessAction extends SystemBaseDialogAction implements IRunnableWithProgress
@ -147,8 +148,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
*/ */
protected IRunnableContext getRunnableContext() protected IRunnableContext getRunnableContext()
{ {
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
IRunnableContext irc = sr.getRunnableContext();
if (irc == null) if (irc == null)
irc = new ProgressMonitorDialog(getShell()); irc = new ProgressMonitorDialog(getShell());
return irc; return irc;
@ -241,7 +241,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
// update the ui // update the ui
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
for (int i = 0; i < results.size(); i++) for (int i = 0; i < results.size(); i++)
{ {
ISystemFilterReference ref = (ISystemFilterReference)results.get(i); ISystemFilterReference ref = (ISystemFilterReference)results.get(i);
@ -260,7 +260,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
*/ */
protected List getAffectedFilters(Object[] processesDeathRow, ISubSystem subSystem) protected List getAffectedFilters(Object[] processesDeathRow, ISubSystem subSystem)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
List result = new ArrayList(); List result = new ArrayList();
for (int i = 0; i < processesDeathRow.length; i++) for (int i = 0; i < processesDeathRow.length; i++)
{ {

5
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/propertypages/ProcessServicesPropertyPage.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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.processes.ui.propertypages; package org.eclipse.rse.internal.processes.ui.propertypages;
@ -21,13 +22,13 @@ 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.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; 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.processes.servicesubsystem.IProcessServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration;
import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
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;
@ -68,7 +69,7 @@ public class ProcessServicesPropertyPage extends ServicesPropertyPage
protected IProcessServiceSubSystemConfiguration[] getProcessServiceSubSystemConfigurations(IRSESystemType systemType) protected IProcessServiceSubSystemConfiguration[] getProcessServiceSubSystemConfigurations(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.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java
View file

@ -14,6 +14,7 @@
* 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) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.processes.ui.view; package org.eclipse.rse.internal.processes.ui.view;
@ -90,7 +91,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
if (copyClipboardAction == null) if (copyClipboardAction == null)
{ {
Clipboard clipboard = RSEUIPlugin.getTheSystemRegistry().getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard); copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard);
} }
menu.add(menuGroup, copyClipboardAction); menu.add(menuGroup, copyClipboardAction);

6
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java
View file

@ -17,6 +17,7 @@
* 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) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.shells.ui.view; package org.eclipse.rse.internal.shells.ui.view;
@ -53,7 +54,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabFolder;
@ -205,10 +205,8 @@ FocusListener
_tabFolderPage.setLayout(gridLayout); _tabFolderPage.setLayout(gridLayout);
createControl(_tabFolderPage); createControl(_tabFolderPage);
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry();
// global actions // global actions
Clipboard clipboard = registry.getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
_copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard);
_copyAction.setEnabled(false); _copyAction.setEnabled(false);

5
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
View file

@ -17,6 +17,7 @@
* 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 * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui
* Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.shells.ui.view; package org.eclipse.rse.shells.ui.view;
@ -126,7 +127,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter
{ {
if (_copyOutputAction == null) if (_copyOutputAction == null)
{ {
_copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard());
} }
menu.add(menuGroup, _copyOutputAction); menu.add(menuGroup, _copyOutputAction);
@ -141,7 +142,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter
{ {
if (_pasteToPromptAction == null) if (_pasteToPromptAction == null)
{ {
_pasteToPromptAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); _pasteToPromptAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard());
} }
menu.add(menuGroup, _pasteToPromptAction); menu.add(menuGroup, _pasteToPromptAction);

7
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java
View file

@ -13,16 +13,17 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.core; package org.eclipse.rse.internal.subsystems.files.core;
import org.eclipse.rse.core.RSECorePlugin;
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.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider; import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider; import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
/** /**
@ -46,7 +47,7 @@ public class SystemFileAPIProviderImpl
{ {
super(); super();
this.directoryMode = directoryMode; this.directoryMode = directoryMode;
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
} }
/** /**

5
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java
View file

@ -13,11 +13,13 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [cleanup] Fix javadoc * Martin Oberhuber (Wind River) - [cleanup] Fix javadoc
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.core.model; package org.eclipse.rse.internal.subsystems.files.core.model;
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.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
@ -28,7 +30,6 @@ import org.eclipse.rse.subsystems.files.core.model.IRemotePath;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
/** /**
@ -232,7 +233,7 @@ public class RemotePath implements IRemotePath {
return null; return null;
} }
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
ISystemProfile profile = registry.getSystemProfile(profileName); ISystemProfile profile = registry.getSystemProfile(profileName);
if (profile == null) { if (profile == null) {

9
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java
View file

@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.files.core.model; package org.eclipse.rse.subsystems.files.core.model;
@ -20,13 +21,13 @@ 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.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -35,7 +36,7 @@ public class RemoteFileUtility
public static IRemoteFileSubSystem getFileSubSystem(IHost connection) public static IRemoteFileSubSystem getFileSubSystem(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++)
{ {
@ -51,7 +52,7 @@ public class RemoteFileUtility
public static IRemoteFileSubSystem[] getFileSubSystems(IHost connection) public static IRemoteFileSubSystem[] getFileSubSystems(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++)
{ {
@ -66,7 +67,7 @@ public class RemoteFileUtility
public static IRemoteFileSubSystemConfiguration getFileSubSystemConfiguration(IRSESystemType systemType) public static IRemoteFileSubSystemConfiguration getFileSubSystemConfiguration(IRSESystemType systemType)
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISubSystemConfiguration[] sses = sr.getSubSystemConfigurationsBySystemType(systemType, false); ISubSystemConfiguration[] sses = sr.getSubSystemConfigurationsBySystemType(systemType, false);
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {

5
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java
View file

@ -12,16 +12,17 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.files.core.servicesubsystem; package org.eclipse.rse.subsystems.files.core.servicesubsystem;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchConstants;
import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
public class OutputRefresh implements Runnable public class OutputRefresh implements Runnable
@ -39,7 +40,7 @@ public class OutputRefresh implements Runnable
if (searchConfig != null) if (searchConfig != null)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(searchConfig, ISystemResourceChangeEvents.EVENT_REFRESH, null)); registry.fireEvent(new SystemResourceChangeEvent(searchConfig, ISystemResourceChangeEvents.EVENT_REFRESH, null));
if (isDone) if (isDone)

3
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.subsystems.files.core.subsystems; package org.eclipse.rse.subsystems.files.core.subsystems;
@ -1349,7 +1350,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
case CommunicationsEvent.AFTER_DISCONNECT : case CommunicationsEvent.AFTER_DISCONNECT :
_cachedRemoteFiles.clear(); _cachedRemoteFiles.clear();
// DKM - taking this out because it causes an exception when the event occurs in Modal Context // DKM - taking this out because it causes an exception when the event occurs in Modal Context
//ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); //ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
//sr.connectedStatusChange(this, false, true, true); //sr.connectedStatusChange(this, false, true, true);
getConnectorService().removeCommunicationsListener(this); getConnectorService().removeCommunicationsListener(this);

5
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
View file

@ -13,6 +13,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.dstore; package org.eclipse.rse.internal.subsystems.files.dstore;
@ -29,6 +30,7 @@ import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.DomainEvent;
import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.dstore.extra.IDomainListener;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -39,7 +41,6 @@ import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.progress.UIJob;
@ -141,7 +142,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
this._fileSubSystem = fileSS; this._fileSubSystem = fileSS;
this.dataStore = dataStore; this.dataStore = dataStore;
this.system = system; this.system = system;
this._registry = RSEUIPlugin.getTheSystemRegistry(); this._registry = RSECorePlugin.getTheSystemRegistry();
system.addCommunicationsListener(this); system.addCommunicationsListener(this);
dataStore.getDomainNotifier().addDomainListener(this); dataStore.getDomainNotifier().addDomainListener(this);
_decorateJobs = new HashMap(); _decorateJobs = new HashMap();

5
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/servicesubsystem/OutputRefreshJob.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.subsystems.shells.servicesubsystem; package org.eclipse.rse.internal.subsystems.shells.servicesubsystem;
@ -19,13 +20,13 @@ package org.eclipse.rse.internal.subsystems.shells.servicesubsystem;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings; import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings;
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.IRemoteOutput; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.progress.UIJob;
@ -73,7 +74,7 @@ public class OutputRefreshJob extends UIJob
{ {
try try
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
if (_outputs != null) if (_outputs != null)
{ {
if ((_outputs.length > 0) && (_outputs[0] != null)) { if ((_outputs.length > 0) && (_outputs[0] != null)) {

5
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShell.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) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.shells.core.model; package org.eclipse.rse.subsystems.shells.core.model;
@ -22,6 +23,7 @@ import java.util.List;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -32,7 +34,6 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.ICandidateCommand;
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;
public abstract class RemoteCommandShell implements IAdaptable, IRemoteCommandShell public abstract class RemoteCommandShell implements IAdaptable, IRemoteCommandShell
{ {
@ -180,7 +181,7 @@ public abstract class RemoteCommandShell implements IAdaptable, IRemoteCommandSh
try try
{ {
IHost host = _fileSubSystem.getHost(); IHost host = _fileSubSystem.getHost();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISubSystem[] sses = sr.getSubSystems(host); ISubSystem[] sses = sr.getSubSystems(host);
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {

7
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java
View file

@ -13,6 +13,7 @@
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.shells.core.model; package org.eclipse.rse.subsystems.shells.core.model;
@ -22,6 +23,7 @@ import java.util.Stack;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
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;
@ -30,7 +32,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
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.IRemoteOutput; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.model.ISystemShellProvider;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -107,7 +108,7 @@ public abstract class RemoteCommandShellOperation
{ {
try try
{ {
RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this);
_remoteCmdShell = _cmdSubSystem.runShell(_pwd, new NullProgressMonitor()); _remoteCmdShell = _cmdSubSystem.runShell(_pwd, new NullProgressMonitor());
} }
catch (Exception e) catch (Exception e)
@ -135,7 +136,7 @@ public abstract class RemoteCommandShellOperation
*/ */
public void finish() public void finish()
{ {
RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
if (_remoteCmdShell != null && _remoteCmdShell.isActive()) if (_remoteCmdShell != null && _remoteCmdShell.isActive())
{ {
try try

13
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.shells.core.subsystems; package org.eclipse.rse.subsystems.shells.core.subsystems;
@ -633,7 +634,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
} }
} }
//ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); //ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
// registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); // registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this));
Display.getDefault().asyncExec(new Refresh(this)); Display.getDefault().asyncExec(new Refresh(this));
@ -677,7 +678,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
public void run() public void run()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss));
} }
} }
@ -695,7 +696,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
public void run() public void run()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(_cmdShell, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, null)); registry.fireEvent(new SystemResourceChangeEvent(_cmdShell, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, null));
registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss));
} }
@ -729,7 +730,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
public void run() public void run()
{ {
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, _ss)); new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, _ss));
} }
@ -816,7 +817,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
return null; return null;
} }
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this));
return cmdShell; return cmdShell;
@ -828,7 +829,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
public IRemoteCommandShell runShell(Object context, IProgressMonitor monitor) throws Exception public IRemoteCommandShell runShell(Object context, IProgressMonitor monitor) throws Exception
{ {
IRemoteCommandShell cmdShell = internalRunShell(context, monitor); IRemoteCommandShell cmdShell = internalRunShell(context, monitor);
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this));
return cmdShell; return cmdShell;

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java
View file

@ -12,11 +12,13 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
@ -24,7 +26,6 @@ import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -100,7 +101,7 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction {
// clear userid/password from memory and fire event // clear userid/password from memory and fire event
//DKM and disk now //DKM and disk now
system.clearPassword(true, true); system.clearPassword(true, true);
RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss,
ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,
ss.getHost())); ss.getHost()));
} }

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java
View file

@ -12,10 +12,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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
@ -73,7 +75,7 @@ public class SystemClearPasswordAction extends SystemBaseAction
try { try {
IConnectorService system = ss.getConnectorService(); IConnectorService system = ss.getConnectorService();
system.clearPassword(true, true); system.clearPassword(true, true);
RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss,
ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,
ss.getHost())); ss.getHost()));
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -20,11 +21,12 @@ import java.util.Iterator;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
@ -76,7 +78,7 @@ public class SystemCollapseAction extends SystemBaseAction {
*/ */
public void run() { public void run() {
//System.out.println("Inside run of SystemRefreshAction"); //System.out.println("Inside run of SystemRefreshAction");
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED, null)); //$NON-NLS-1$ sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED, null)); //$NON-NLS-1$
} else } else

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java
View file

@ -12,16 +12,18 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
@ -61,7 +63,7 @@ public class SystemCollapseAllAction extends SystemBaseAction {
* @see org.eclipse.jface.action.Action#run() * @see org.eclipse.jface.action.Action#run()
*/ */
public void run() { public void run() {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("false", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$ sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("false", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$
} else } else

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -171,7 +171,7 @@ public class SystemCommonDeleteAction
catch (Exception e) catch (Exception e)
{ {
} }
RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext();
setEnabled(target.canDelete()); setEnabled(target.canDelete());
} }
return null; return null;
@ -179,7 +179,7 @@ public class SystemCommonDeleteAction
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;
@ -187,7 +187,7 @@ public class SystemCommonDeleteAction
else else
{ {
irc = new ProgressMonitorDialog(shell); irc = new ProgressMonitorDialog(shell);
RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc);
return irc; return irc;
} }
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -23,13 +23,13 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -103,7 +103,7 @@ public class SystemConnectAllSubSystemsAction extends SystemBaseAction
super(SystemResources.ACTION_CONNECT_ALL_LABEL,SystemResources.ACTION_CONNECT_ALL_TOOLTIP, shell); super(SystemResources.ACTION_CONNECT_ALL_LABEL,SystemResources.ACTION_CONNECT_ALL_TOOLTIP, shell);
allowOnMultipleSelection(false); allowOnMultipleSelection(false);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION); setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
//setHelp(RSEUIPlugin.HELPPREFIX+"actn0022"); //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022");
} }
/** /**

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -21,6 +22,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
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.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
@ -47,7 +49,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
public SystemCopyConnectionAction(Shell parent) public SystemCopyConnectionAction(Shell parent)
{ {
super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY); super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY);
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$
setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000"); //$NON-NLS-1$ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000"); //$NON-NLS-1$
} }
@ -220,7 +222,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
veryRootElement.setRenamable(false); veryRootElement.setRenamable(false);
veryRootElement.setDeletable(false); veryRootElement.setDeletable(false);
ISystemProfile[] profiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles();
ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID);
if (profiles == null) if (profiles == null)

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,16 +11,16 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -42,7 +42,7 @@ public class SystemDisconnectAllSubSystemsAction extends SystemBaseAction
super(SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_LABEL, SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_TOOLTIP, shell); super(SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_LABEL, SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_TOOLTIP, shell);
allowOnMultipleSelection(false); allowOnMultipleSelection(false);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION); setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
// TODO help for connect all // TODO help for connect all
//setHelp(RSEUIPlugin.HELPPREFIX+"actn0022"); //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022");
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -20,11 +21,12 @@ import java.util.Iterator;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseAction;
@ -79,7 +81,7 @@ public class SystemExpandAction extends SystemBaseAction {
*/ */
public void run() { public void run() {
//System.out.println("Inside run of SystemRefreshAction"); //System.out.println("Inside run of SystemRefreshAction");
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED, null)); //$NON-NLS-1$ sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED, null)); //$NON-NLS-1$
} else } else

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -21,6 +22,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
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.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
@ -50,7 +52,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
{ {
super(parent, SystemResources.ACTION_MOVE_CONNECTION_LABEL, MODE_MOVE); super(parent, SystemResources.ACTION_MOVE_CONNECTION_LABEL, MODE_MOVE);
//allowOnMultipleSelection(false); // too hard to handle, for now! //allowOnMultipleSelection(false); // too hard to handle, for now!
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$
setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000"); //$NON-NLS-1$ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000"); //$NON-NLS-1$
} }
@ -225,7 +227,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
veryRootElement.setRenamable(false); veryRootElement.setRenamable(false);
veryRootElement.setDeletable(false); veryRootElement.setDeletable(false);
ISystemProfile[] profiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles();
ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID);
if (profiles == null) if (profiles == null)

9
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,13 +11,14 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import java.util.Iterator; import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -62,7 +63,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e = selection.iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
@ -94,7 +95,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection()); SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
IHost conn = null; IHost conn = null;
for (int idx=0; idx<sortableArray.length; idx++) for (int idx=0; idx<sortableArray.length; idx++)

9
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveUpConnectionAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,13 +11,14 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import java.util.Iterator; import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -62,7 +63,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e = selection.iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
@ -93,7 +94,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection()); SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
IHost conn = null; IHost conn = null;

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
View file

@ -12,9 +12,11 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
@ -42,7 +44,7 @@ public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseActi
parent); parent);
setSelectionSensitive(false); setSelectionSensitive(false);
allowOnMultipleSelection(true); allowOnMultipleSelection(true);
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
setChecked(sr.getQualifiedHostNames()); setChecked(sr.getQualifiedHostNames());
setHelp(RSEUIPlugin.HELPPREFIX+"actn0008"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"actn0008"); //$NON-NLS-1$
@ -65,7 +67,7 @@ public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseActi
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java
View file

@ -13,9 +13,11 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - moved SystemPreferencesManager to a new package * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
@ -41,7 +43,7 @@ public class SystemPreferenceRestoreStateAction extends SystemBaseAction
super(SystemResources.ACTION_RESTORE_STATE_PREFERENCE_LABEL,SystemResources.ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP, parent); super(SystemResources.ACTION_RESTORE_STATE_PREFERENCE_LABEL,SystemResources.ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP, parent);
setSelectionSensitive(false); setSelectionSensitive(false);
allowOnMultipleSelection(true); allowOnMultipleSelection(true);
//sr = RSEUIPlugin.getTheSystemRegistry(); //sr = RSECorePlugin.getTheSystemRegistry();
setChecked(SystemPreferencesManager.getRememberState()); setChecked(SystemPreferencesManager.getRememberState());
setHelp(RSEUIPlugin.HELPPREFIX+"aprefres"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"aprefres"); //$NON-NLS-1$
@ -64,7 +66,7 @@ public class SystemPreferenceRestoreStateAction extends SystemBaseAction
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java
View file

@ -13,9 +13,11 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - moved SystemPreferencesManager to a new package * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
@ -65,7 +67,7 @@ public class SystemPreferenceShowFilterPoolsAction extends SystemBaseAction
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java
View file

@ -13,6 +13,7 @@
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -21,6 +22,7 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
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.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
@ -32,7 +34,6 @@ import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.ISharedImages; import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
@ -61,7 +62,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY), PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
shell); shell);
//mgr = SystemProfileManager.getSystemProfileManager(); //mgr = SystemProfileManager.getSystemProfileManager();
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
setSelectionSensitive(true); setSelectionSensitive(true);
allowOnMultipleSelection(false); allowOnMultipleSelection(false);
setHelp(RSEUIPlugin.HELPPREFIX+"actndupr"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"actndupr"); //$NON-NLS-1$
@ -122,8 +123,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
*/ */
protected IRunnableContext getRunnableContext() protected IRunnableContext getRunnableContext()
{ {
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
IRunnableContext irc = sr.getRunnableContext();
if (irc == null) if (irc == null)
irc = new ProgressMonitorDialog(getShell()); irc = new ProgressMonitorDialog(getShell());
return irc; return irc;

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameSelectAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,10 +11,11 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemProfileManager;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -52,7 +53,7 @@ public class SystemProfileNameSelectAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.setSystemProfileActive(profile, isChecked()); sr.setSystemProfileActive(profile, isChecked());
} }
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTeamReloadAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -65,7 +65,7 @@ public class SystemTeamReloadAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
//SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); //SystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
SystemMessage confirmMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONFIRM_RELOADRSE); SystemMessage confirmMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONFIRM_RELOADRSE);
SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), confirmMsg); SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), confirmMsg);
boolean ok = msgDlg.openQuestionNoException(); boolean ok = msgDlg.openQuestionNoException();

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkOfflineAction.java
View file

@ -13,11 +13,13 @@
* 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) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
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;
@ -67,7 +69,7 @@ public class SystemWorkOfflineAction extends SystemBaseAction
public void run() public void run()
{ {
IHost conn = (IHost)getFirstSelection(); IHost conn = (IHost)getFirstSelection();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if (conn.isOffline()) if (conn.isOffline())
{ {

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkWithProfilesAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.actions; package org.eclipse.rse.internal.ui.actions;
@ -40,7 +40,7 @@ public class SystemWorkWithProfilesAction extends SystemBaseAction
super(SystemResources.ACTION_WORKWITH_PROFILES_LABEL, SystemResources.ACTION_WORKWITH_PROFILES_TOOLTIP, parent); super(SystemResources.ACTION_WORKWITH_PROFILES_LABEL, SystemResources.ACTION_WORKWITH_PROFILES_TOOLTIP, parent);
setSelectionSensitive(false); setSelectionSensitive(false);
allowOnMultipleSelection(true); allowOnMultipleSelection(true);
//sr = RSEUIPlugin.getTheSystemRegistry(); //sr = RSECorePlugin.getTheSystemRegistry();
setHelp(RSEUIPlugin.HELPPREFIX+"actnwwpr"); //$NON-NLS-1$ setHelp(RSEUIPlugin.HELPPREFIX+"actnwwpr"); //$NON-NLS-1$
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,19 +11,19 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.dialogs; package org.eclipse.rse.internal.ui.dialogs;
import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.internal.ui.view.SystemTestFilterStringAPIProviderImpl; import org.eclipse.rse.internal.ui.view.SystemTestFilterStringAPIProviderImpl;
import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.internal.ui.view.SystemViewForm;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.rse.ui.widgets.SystemHostCombo;
@ -87,7 +87,7 @@ public class SystemTestFilterStringDialog
this.subsystem = subsystem; this.subsystem = subsystem;
this.filterString = filterString; this.filterString = filterString;
this.subsystemFactoryId = subsystem.getSubSystemConfiguration().getId(); this.subsystemFactoryId = subsystem.getSubSystemConfiguration().getId();
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
setNeedsProgressMonitor(true); setNeedsProgressMonitor(true);
//pack(); //pack();
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java
View file

@ -14,18 +14,20 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.dialogs; package org.eclipse.rse.internal.ui.dialogs;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
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.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemConnectionFormCaller; import org.eclipse.rse.ui.ISystemConnectionFormCaller;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.SystemConnectionForm;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
@ -124,7 +126,7 @@ public class SystemUpdateConnectionDialog extends SystemPromptDialog implements
if (closeDialog) if (closeDialog)
{ {
IHost conn = (IHost)getInputObject(); IHost conn = (IHost)getInputObject();
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.updateHost( conn,conn.getSystemType(), form.getConnectionName(),form.getHostName(), sr.updateHost( conn,conn.getSystemType(), form.getConnectionName(),form.getHostName(),
form.getConnectionDescription(), form.getDefaultUserId(), form.getConnectionDescription(), form.getDefaultUserId(),
form.getUserIdLocation() ); form.getUserIdLocation() );

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.filters.dialogs; package org.eclipse.rse.internal.ui.filters.dialogs;
@ -343,7 +343,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
public boolean close() public boolean close()
{ {
//RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); //RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
return super.close(); return super.close();
} }
/** /**

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java
View file

@ -13,8 +13,9 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - moved SystemPreferencesManager to a new package * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
* - created and used PreferencesMapper * - created and used PreferencesMapper
* Martin Oberhuber (Wind River) - [180562] dont implement ISystemPreferencesConstants * Martin Oberhuber (Wind River) - [180562] don't implement ISystemPreferencesConstants
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.propertypages; package org.eclipse.rse.internal.ui.propertypages;
@ -201,7 +202,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = showFilterPoolsEditor.getBooleanValue(); boolean newValue = showFilterPoolsEditor.getBooleanValue();
if (newValue != lastShowFilterPoolsValue) if (newValue != lastShowFilterPoolsValue)
{ {
RSEUIPlugin.getTheSystemRegistry().setShowFilterPools(newValue); RSECorePlugin.getTheSystemRegistry().setShowFilterPools(newValue);
firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_SHOWFILTERPOOLS,lastShowFilterPoolsValue,newValue); firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_SHOWFILTERPOOLS,lastShowFilterPoolsValue,newValue);
} }
lastShowFilterPoolsValue = newValue; lastShowFilterPoolsValue = newValue;
@ -211,7 +212,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = showNewConnectionPromptEditor.getBooleanValue(); boolean newValue = showNewConnectionPromptEditor.getBooleanValue();
if (newValue != lastShowNewConnectionPromptValue) if (newValue != lastShowNewConnectionPromptValue)
{ {
RSEUIPlugin.getTheSystemRegistry().setShowNewHostPrompt(newValue); RSECorePlugin.getTheSystemRegistry().setShowNewHostPrompt(newValue);
} }
lastShowNewConnectionPromptValue = newValue; lastShowNewConnectionPromptValue = newValue;
} }
@ -220,7 +221,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = qualifyConnectionNamesEditor.getBooleanValue(); boolean newValue = qualifyConnectionNamesEditor.getBooleanValue();
if (newValue != lastQualifyConnectionNamesValue) if (newValue != lastQualifyConnectionNamesValue)
{ {
RSEUIPlugin.getTheSystemRegistry().setQualifiedHostNames(newValue); RSECorePlugin.getTheSystemRegistry().setQualifiedHostNames(newValue);
firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_QUALIFYCONNECTIONNAMES,lastQualifyConnectionNamesValue,newValue); firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_QUALIFYCONNECTIONNAMES,lastQualifyConnectionNamesValue,newValue);
} }
lastQualifyConnectionNamesValue = newValue; lastQualifyConnectionNamesValue = newValue;
@ -243,7 +244,7 @@ public class RemoteSystemsPreferencePage
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getTheSystemRegistry().fireEvent( RSECorePlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java
View file

@ -15,19 +15,21 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.propertypages; package org.eclipse.rse.internal.ui.propertypages;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
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.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.ISystemConnectionFormCaller; import org.eclipse.rse.ui.ISystemConnectionFormCaller;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.SystemConnectionForm;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage; import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
@ -91,7 +93,7 @@ public class SystemConnectionPropertyPage extends SystemBasePropertyPage
if (okToClose) if (okToClose)
{ {
IHost conn = (IHost)getElement(); IHost conn = (IHost)getElement();
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.updateHost( conn, conn.getSystemType(), form.getConnectionName(),form.getHostName(), sr.updateHost( conn, conn.getSystemType(), form.getConnectionName(),form.getHostName(),
form.getConnectionDescription(), form.getDefaultUserId(), form.getConnectionDescription(), form.getDefaultUserId(),
form.getUserIdLocation() ); form.getUserIdLocation() );

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
View file

@ -14,6 +14,7 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.propertypages; package org.eclipse.rse.internal.ui.propertypages;
@ -22,6 +23,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -236,7 +238,7 @@ public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPa
protected ISubSystem[] getSubSystems() protected ISubSystem[] getSubSystems()
{ {
ISubSystem[] subsystems = ISubSystem[] subsystems =
RSEUIPlugin.getTheSystemRegistry().getSubSystems(getConnection()); RSECorePlugin.getTheSystemRegistry().getSubSystems(getConnection());
return subsystems; return subsystems;
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemTeamViewProfilePropertyPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,14 +11,14 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.propertypages; package org.eclipse.rse.internal.ui.propertypages;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.internal.ui.SystemPropertyResources; import org.eclipse.rse.internal.ui.SystemPropertyResources;
import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.internal.ui.view.SystemViewResources;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage; import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
@ -95,7 +95,7 @@ public class SystemTeamViewProfilePropertyPage extends SystemBasePropertyPage
ISystemProfile profile = getProfile(); ISystemProfile profile = getProfile();
// populate GUI... // populate GUI...
labelName.setText(profile.getName()); labelName.setText(profile.getName());
boolean active = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); boolean active = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName());
if (active) if (active)
labelStatus.setText(SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL); labelStatus.setText(SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL);
else else

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,12 +11,13 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
@ -56,7 +57,7 @@ public abstract class SystemAbstractAPIProvider
public SystemAbstractAPIProvider() public SystemAbstractAPIProvider()
{ {
super(); super();
sr = RSEUIPlugin.getTheSystemRegistry(); sr = RSECorePlugin.getTheSystemRegistry();
} }
/** /**

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDeferredTableTreeContentManager.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -9,7 +9,7 @@
* David McKnight. * David McKnight.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -73,7 +73,7 @@ public class SystemDeferredTableTreeContentManager extends
{ {
_view.computeLayout(); _view.computeLayout();
_view.refresh(true); _view.refresh(true);
//SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); //SystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
//registry.fireEvent(new SystemResourceChangeEvent(_parent, ISystemResourceChangeEvents.EVENT_PROPERTYSHEET_UPDATE, _parent)); //registry.fireEvent(new SystemResourceChangeEvent(_parent, ISystemResourceChangeEvents.EVENT_PROPERTYSHEET_UPDATE, _parent));
} }
} }

15
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDropActionDelegate.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -114,7 +115,7 @@ public class SystemDropActionDelegate implements IDropActionDelegate
{ {
} }
} }
RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext();
} }
/** FIXME - IREmoteFile is systems.core independent now /** FIXME - IREmoteFile is systems.core independent now
@ -181,7 +182,7 @@ public class SystemDropActionDelegate implements IDropActionDelegate
{ {
} }
} }
RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext();
} }
} }
catch (SystemMessageException e) catch (SystemMessageException e)
@ -202,7 +203,7 @@ public class SystemDropActionDelegate implements IDropActionDelegate
*/ */
private Object getObjectFor(String str) private Object getObjectFor(String str)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
// first extract subsystem id // first extract subsystem id
int connectionDelim = str.indexOf(":"); //$NON-NLS-1$ int connectionDelim = str.indexOf(":"); //$NON-NLS-1$
if (connectionDelim == -1) // not subsystem, therefore likely to be a connection if (connectionDelim == -1) // not subsystem, therefore likely to be a connection
@ -266,14 +267,14 @@ public class SystemDropActionDelegate implements IDropActionDelegate
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;
} }
irc = new ProgressMonitorDialog(shell); irc = new ProgressMonitorDialog(shell);
RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc);
return irc; return irc;
} }
} }

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Added getSystemViewForm() * Kevin Doyle (IBM) - Added getSystemViewForm()
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -28,13 +29,13 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
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;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -324,7 +325,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
if (adapter != null) if (adapter != null)
{ {
Object parent = adapter.getParent(selection); Object parent = adapter.getParent(selection);
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
ISubSystem ss = adapter.getSubSystem(selection); ISubSystem ss = adapter.getSubSystem(selection);
IHost connection = ss.getHost(); IHost connection = ss.getHost();
if (_inputProvider.allowMultipleConnections()) if (_inputProvider.allowMultipleConnections())

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java
View file

@ -12,14 +12,15 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
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;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider public abstract class SystemResourceSelectionInputProvider extends SystemAbstractAPIProvider
@ -38,7 +39,7 @@ public abstract class SystemResourceSelectionInputProvider extends SystemAbstrac
public SystemResourceSelectionInputProvider() public SystemResourceSelectionInputProvider()
{ {
// choose random host // choose random host
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
IHost[] hosts = registry.getHosts(); IHost[] hosts = registry.getHosts();
if (hosts != null) if (hosts != null)
_connection = hosts[0]; _connection = hosts[0];
@ -84,7 +85,7 @@ public abstract class SystemResourceSelectionInputProvider extends SystemAbstrac
{ {
if (_connection == null) if (_connection == null)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
_connection = registry.getHosts()[0]; _connection = registry.getHosts()[0];
} }

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -327,8 +328,9 @@ public class SystemTableTreeView
addSelectionChangedListener(this); addSelectionChangedListener(this);
RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
RSEUIPlugin.getTheSystemRegistry().addSystemRemoteChangeListener(this); sr.addSystemResourceChangeListener(this);
sr.addSystemRemoteChangeListener(this);
initDragAndDrop(); initDragAndDrop();
@ -1142,8 +1144,9 @@ public class SystemTableTreeView
// remove listeners // remove listeners
removeSelectionChangedListener(this); removeSelectionChangedListener(this);
RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
RSEUIPlugin.getTheSystemRegistry().removeSystemRemoteChangeListener(this); sr.removeSystemResourceChangeListener(this);
sr.removeSystemRemoteChangeListener(this);
// for debugging // for debugging
//Composite tree = getTableTree(); //Composite tree = getTableTree();

21
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
View file

@ -14,6 +14,7 @@
* Michael Berger (IBM) - 146339 Added refresh action graphic. * Michael Berger (IBM) - 146339 Added refresh action graphic.
* David Dykstal (IBM) - moved SystemsPreferencesManager to a new package * David Dykstal (IBM) - moved SystemsPreferencesManager to a new package
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -44,6 +45,7 @@ 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.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; import org.eclipse.rse.core.events.ISystemRemoteChangeEvent;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemRemoteChangeListener; import org.eclipse.rse.core.events.ISystemRemoteChangeListener;
@ -73,7 +75,6 @@ import org.eclipse.rse.ui.actions.SystemTablePrintAction;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.dialogs.SystemSelectAnythingDialog; import org.eclipse.rse.ui.dialogs.SystemSelectAnythingDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.model.ISystemShellProvider;
import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.IRSEViewPart;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
@ -339,7 +340,7 @@ public class SystemTableViewPart extends ViewPart
((ISystemContainer)inputObject).markStale(true); ((ISystemContainer)inputObject).markStale(true);
} }
((SystemTableViewProvider) _viewer.getContentProvider()).flushCache(); ((SystemTableViewProvider) _viewer.getContentProvider()).flushCache();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(inputObject, ISystemResourceChangeEvents.EVENT_REFRESH, inputObject)); registry.fireEvent(new SystemResourceChangeEvent(inputObject, ISystemResourceChangeEvents.EVENT_REFRESH, inputObject));
//_viewer.refresh(); //_viewer.refresh();
@ -397,7 +398,7 @@ public class SystemTableViewPart extends ViewPart
Object inputObject = _viewer.getInput(); Object inputObject = _viewer.getInput();
if (inputObject == null) if (inputObject == null)
{ {
inputObject = RSEUIPlugin.getTheSystemRegistry(); inputObject = RSECorePlugin.getTheSystemRegistry();
} }
dlg.setInputObject(inputObject); dlg.setInputObject(inputObject);
if (dlg.open() == Window.OK) if (dlg.open() == Window.OK)
@ -641,7 +642,7 @@ public class SystemTableViewPart extends ViewPart
String filterID = memento.getString(TAG_TABLE_VIEW_FILTER_ID); String filterID = memento.getString(TAG_TABLE_VIEW_FILTER_ID);
String objectID = memento.getString(TAG_TABLE_VIEW_OBJECT_ID); String objectID = memento.getString(TAG_TABLE_VIEW_OBJECT_ID);
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
Object input = null; Object input = null;
if (subsystemId == null) if (subsystemId == null)
{ {
@ -1115,7 +1116,7 @@ public class SystemTableViewPart extends ViewPart
} }
else else
{ {
setInput(RSEUIPlugin.getTheSystemRegistry()); setInput(RSECorePlugin.getTheSystemRegistry());
} }
} }
@ -1159,8 +1160,8 @@ public class SystemTableViewPart extends ViewPart
_browsePosition = 0; _browsePosition = 0;
// register global edit actions // register global edit actions
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
Clipboard clipboard = registry.getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
@ -1228,7 +1229,7 @@ public class SystemTableViewPart extends ViewPart
selectionService.removeSelectionListener(this); selectionService.removeSelectionListener(this);
_viewer.removeSelectionChangedListener(this); _viewer.removeSelectionChangedListener(this);
RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
if (_viewer != null) if (_viewer != null)
{ {
_viewer.dispose(); _viewer.dispose();
@ -1654,7 +1655,7 @@ public class SystemTableViewPart extends ViewPart
private void restoreState(IMemento memento) private void restoreState(IMemento memento)
{ {
RestoreStateRunnable rsr = new RestoreStateRunnable(memento); RestoreStateRunnable rsr = new RestoreStateRunnable(memento);
rsr.setRule(RSEUIPlugin.getTheSystemRegistry()); rsr.setRule(RSECorePlugin.getTheSystemRegistry());
rsr.schedule(); rsr.schedule();
_memento = null; _memento = null;
} }
@ -1715,7 +1716,7 @@ public class SystemTableViewPart extends ViewPart
ISubSystem subsystem = va.getSubSystem(input); ISubSystem subsystem = va.getSubSystem(input);
if (subsystem != null) if (subsystem != null)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
String subsystemID = registry.getAbsoluteNameForSubSystem(subsystem); String subsystemID = registry.getAbsoluteNameForSubSystem(subsystem);
String profileID = subsystem.getHost().getSystemProfileName(); String profileID = subsystem.getHost().getSystemProfileName();
String connectionID = subsystem.getHost().getAliasName(); String connectionID = subsystem.getHost().getAliasName();

19
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -23,6 +23,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -427,8 +428,9 @@ public class SystemView extends SafeTreeViewer
// ---------------------------------------- // ----------------------------------------
// register with system registry for events // register with system registry for events
// ---------------------------------------- // ----------------------------------------
RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
RSEUIPlugin.getTheSystemRegistry().addSystemRemoteChangeListener(this); sr.addSystemResourceChangeListener(this);
sr.addSystemRemoteChangeListener(this);
// ----------------------------- // -----------------------------
// Enable right-click popup menu // Enable right-click popup menu
// ----------------------------- // -----------------------------
@ -1319,8 +1321,9 @@ public class SystemView extends SafeTreeViewer
public void handleDispose(DisposeEvent event) { public void handleDispose(DisposeEvent event) {
//if (debug) //if (debug)
//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Inside handleDispose for SystemView"); //RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Inside handleDispose for SystemView");
RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
RSEUIPlugin.getTheSystemRegistry().removeSystemRemoteChangeListener(this); sr.removeSystemResourceChangeListener(this);
sr.removeSystemRemoteChangeListener(this);
busyCursor.dispose(); busyCursor.dispose();
super.handleDispose(event); super.handleDispose(event);
} }
@ -1595,7 +1598,7 @@ public class SystemView extends SafeTreeViewer
Object parent = _event.getParent(); Object parent = _event.getParent();
String[] properties = new String[1]; String[] properties = new String[1];
if (parent == RSEUIPlugin.getTheSystemRegistry()) parent = inputProvider; if (parent == RSECorePlugin.getTheSystemRegistry()) parent = inputProvider;
ISubSystem ss = null; ISubSystem ss = null;
Widget item = null; Widget item = null;
Widget parentItem = null; Widget parentItem = null;
@ -1914,7 +1917,7 @@ public class SystemView extends SafeTreeViewer
// refresh(src); // ONLY VALID WHEN USER TRULY WANTS TO REQUERY CHILDREN FROM HOST // refresh(src); // ONLY VALID WHEN USER TRULY WANTS TO REQUERY CHILDREN FROM HOST
//else //else
// refresh(); // refresh entire tree // refresh(); // refresh entire tree
if ((src == null) || (src == RSEUIPlugin.getTheSystemRegistry())) if ((src == null) || (src == RSECorePlugin.getTheSystemRegistry()))
refreshAll(); refreshAll();
else { else {
//smartRefresh(src, false); //smartRefresh(src, false);
@ -2428,7 +2431,7 @@ public class SystemView extends SafeTreeViewer
protected boolean affectsInput(Object[] elements) { protected boolean affectsInput(Object[] elements) {
boolean affected = false; boolean affected = false;
IWorkbenchPart viewPart = getWorkbenchPart(); IWorkbenchPart viewPart = getWorkbenchPart();
if ((viewPart != null) && (getInput() != RSEUIPlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) { if ((viewPart != null) && (getInput() != RSECorePlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) {
for (int idx = 0; !affected && (idx < elements.length); idx++) for (int idx = 0; !affected && (idx < elements.length); idx++)
affected = affectsInput(elements[idx]); affected = affectsInput(elements[idx]);
} }
@ -2442,7 +2445,7 @@ public class SystemView extends SafeTreeViewer
protected boolean affectsInput(Object element) { protected boolean affectsInput(Object element) {
boolean affected = false; boolean affected = false;
IWorkbenchPart viewPart = getWorkbenchPart(); IWorkbenchPart viewPart = getWorkbenchPart();
if ((viewPart != null) && (getInput() != RSEUIPlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) { if ((viewPart != null) && (getInput() != RSECorePlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) {
Object input = viewPart.getSite().getPage().getInput(); Object input = viewPart.getSite().getPage().getInput();
if (input != null) { if (input != null) {

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java
View file

@ -14,6 +14,7 @@
* 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) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -35,7 +36,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.rse.ui.view.ISystemViewInputProvider;
@ -156,13 +156,12 @@ public class SystemViewAPIProviderForFilters
ISystemViewInputProvider inputProvider = this; ISystemViewInputProvider inputProvider = this;
if ((sfr != null) && (inputProvider.getViewer()!=null)) if ((sfr != null) && (inputProvider.getViewer()!=null))
{ {
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
Viewer v = inputProvider.getViewer(); Viewer v = inputProvider.getViewer();
if (v instanceof ISystemResourceChangeListener) if (v instanceof ISystemResourceChangeListener)
{ {
//sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! //sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers!
sr.postEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! RSEUIPlugin.getTheSystemRegistryUI().postEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers!
} }
} }
} }

26
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java
View file

@ -22,6 +22,7 @@
* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* 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) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -61,7 +62,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAction;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorSpecialChar; import org.eclipse.rse.ui.validators.ValidatorSpecialChar;
import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
@ -177,7 +177,7 @@ public class SystemViewConnectionAdapter
Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null; Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null; RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
ISystemRegistry sysReg = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sysReg = RSECorePlugin.getTheSystemRegistry();
boolean anySupportsConnect = sysReg.isAnySubSystemSupportsConnect(host); boolean anySupportsConnect = sysReg.isAnySubSystemSupportsConnect(host);
if (anySupportsConnect) { if (anySupportsConnect) {
@ -330,7 +330,7 @@ public class SystemViewConnectionAdapter
*/ */
public ImageDescriptor getImageDescriptor(Object element) { public ImageDescriptor getImageDescriptor(Object element) {
IHost connection = (IHost)element; IHost connection = (IHost)element;
boolean anyConnected = RSEUIPlugin.getTheSystemRegistry().isAnySubSystemConnected(connection); boolean anyConnected = RSECorePlugin.getTheSystemRegistry().isAnySubSystemConnected(connection);
ImageDescriptor descriptor = null; ImageDescriptor descriptor = null;
IRSESystemType systemType = getSystemTypeForHost(connection); IRSESystemType systemType = getSystemTypeForHost(connection);
if (systemType != null) { if (systemType != null) {
@ -352,7 +352,7 @@ public class SystemViewConnectionAdapter
public String getText(Object element) public String getText(Object element)
{ {
IHost conn = (IHost)element; IHost conn = (IHost)element;
boolean qualifyNames = RSEUIPlugin.getTheSystemRegistry().getQualifiedHostNames(); boolean qualifyNames = RSECorePlugin.getTheSystemRegistry().getQualifiedHostNames();
if (!qualifyNames) if (!qualifyNames)
return conn.getAliasName(); return conn.getAliasName();
else else
@ -417,7 +417,7 @@ public class SystemViewConnectionAdapter
*/ */
public Object getParent(Object element) public Object getParent(Object element)
{ {
return RSEUIPlugin.getTheSystemRegistry(); return RSECorePlugin.getTheSystemRegistry();
} }
/** /**
@ -558,7 +558,7 @@ public class SystemViewConnectionAdapter
} }
else else
{ {
boolean anyConnected = RSEUIPlugin.getTheSystemRegistry().isAnySubSystemConnected(conn); boolean anyConnected = RSECorePlugin.getTheSystemRegistry().isAnySubSystemConnected(conn);
if (anyConnected) if (anyConnected)
return SystemViewResources.RESID_PROPERTY_CONNECTIONSTATUS_CONNECTED_VALUE; return SystemViewResources.RESID_PROPERTY_CONNECTIONSTATUS_CONNECTED_VALUE;
else else
@ -629,7 +629,7 @@ public class SystemViewConnectionAdapter
//System.out.println("Inside resetPropertyValue in adapter"); //System.out.println("Inside resetPropertyValue in adapter");
String property = (String)propertyObject; String property = (String)propertyObject;
IHost conn = (IHost)propertySourceInput; IHost conn = (IHost)propertySourceInput;
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if (property.equals(ISystemPropertyConstants.P_DEFAULTUSERID)) if (property.equals(ISystemPropertyConstants.P_DEFAULTUSERID))
{ {
@ -657,7 +657,7 @@ public class SystemViewConnectionAdapter
//if (!data.getIsLocal()) //if (!data.getIsLocal())
//whereToUpdate = USERID_LOCATION_DEFAULT_SYSTEMTYPE; //whereToUpdate = USERID_LOCATION_DEFAULT_SYSTEMTYPE;
String userId = data.getLocalValue(); // will be "" if !data.getIsLocal(), which results in wiping out local override String userId = data.getLocalValue(); // will be "" if !data.getIsLocal(), which results in wiping out local override
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.updateHost(conn, conn.getSystemType(), conn.getAliasName(), conn.getHostName(), sr.updateHost(conn, conn.getSystemType(), conn.getAliasName(), conn.getHostName(),
conn.getDescription(), userId, whereToUpdate); conn.getDescription(), userId, whereToUpdate);
} }
@ -669,7 +669,7 @@ public class SystemViewConnectionAdapter
{ {
String name = (String)property; String name = (String)property;
IHost conn = (IHost)propertySourceInput; IHost conn = (IHost)propertySourceInput;
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
if (name.equals(ISystemPropertyConstants.P_DEFAULTUSERID)) if (name.equals(ISystemPropertyConstants.P_DEFAULTUSERID))
{ {
@ -714,7 +714,7 @@ public class SystemViewConnectionAdapter
{ {
IHost sysCon = (IHost) element; IHost sysCon = (IHost) element;
if (sysCon.getSystemType().isLocal()) return existsMoreThanOneLocalConnection(); if (sysCon.getSystemType().isLocal()) return existsMoreThanOneLocalConnection();
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
return !sr.isAnySubSystemConnected((IHost)element); return !sr.isAnySubSystemConnected((IHost)element);
} }
return true; return true;
@ -723,7 +723,7 @@ public class SystemViewConnectionAdapter
protected boolean existsMoreThanOneLocalConnection() protected boolean existsMoreThanOneLocalConnection()
{ {
IRSESystemType localType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_LOCAL_ID); IRSESystemType localType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
IHost[] localCons = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemType(localType); IHost[] localCons = RSECorePlugin.getTheSystemRegistry().getHostsBySystemType(localType);
return localCons.length > 1; return localCons.length > 1;
} }
@ -734,7 +734,7 @@ public class SystemViewConnectionAdapter
{ {
boolean ok = true; boolean ok = true;
IHost conn = (IHost)element; IHost conn = (IHost)element;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.deleteHost(conn); sr.deleteHost(conn);
return ok; return ok;
} }
@ -755,7 +755,7 @@ public class SystemViewConnectionAdapter
{ {
boolean ok = true; boolean ok = true;
IHost conn = (IHost)element; IHost conn = (IHost)element;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.renameHost(conn,name); // renames and saves to disk sr.renameHost(conn,name); // renames and saves to disk
return ok; return ok;
} }

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java
View file

@ -13,13 +13,14 @@
* 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) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject;
@ -84,9 +85,9 @@ public class SystemViewConnectionSelectionInputProvider extends SystemAbstractAP
//System.out.println("Inside getSystemViewRoots. showNew = "+showNew); //System.out.println("Inside getSystemViewRoots. showNew = "+showNew);
IHost[] conns = null; IHost[] conns = null;
if (systemTypes == null) if (systemTypes == null)
conns = RSEUIPlugin.getTheSystemRegistry().getHosts(); conns = RSECorePlugin.getTheSystemRegistry().getHosts();
else else
conns = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemTypes(systemTypes); conns = RSECorePlugin.getTheSystemRegistry().getHostsBySystemTypes(systemTypes);
if (showNew) if (showNew)
{ {
if ((conns == null) || (conns.length == 0)) if ((conns == null) || (conns.length == 0))

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -28,6 +29,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
@ -87,13 +89,13 @@ public class SystemViewDataDragAdapter extends DragSourceAdapter
if (dragObject instanceof ISubSystem) if (dragObject instanceof ISubSystem)
{ {
subSystem = (ISubSystem)dragObject; subSystem = (ISubSystem)dragObject;
String subSystemId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); String subSystemId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem);
dataStream.append(subSystemId); dataStream.append(subSystemId);
} }
else if (dragObject instanceof IHost) else if (dragObject instanceof IHost)
{ {
IHost connection = (IHost)dragObject; IHost connection = (IHost)dragObject;
String connectionId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForConnection(connection); String connectionId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForConnection(connection);
dataStream.append(connectionId); dataStream.append(connectionId);
} }
else else
@ -102,7 +104,7 @@ public class SystemViewDataDragAdapter extends DragSourceAdapter
if (subSystem != null) if (subSystem != null)
{ {
String subSystemId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); String subSystemId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem);
dataStream.append(subSystemId); dataStream.append(subSystemId);
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java
View file

@ -12,6 +12,7 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -28,6 +29,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.ViewerDropAdapter; import org.eclipse.jface.viewers.ViewerDropAdapter;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
@ -244,7 +246,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter
*/ */
private Object getObjectFor(String str) private Object getObjectFor(String str)
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
// first extract subsystem id // first extract subsystem id
int connectionDelim = str.indexOf(":"); //$NON-NLS-1$ int connectionDelim = str.indexOf(":"); //$NON-NLS-1$
if (connectionDelim == -1) // not subsystem, therefore likely to be a connection if (connectionDelim == -1) // not subsystem, therefore likely to be a connection
@ -308,7 +310,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter
protected IRunnableContext getRunnableContext(Shell shell) protected IRunnableContext getRunnableContext(Shell shell)
{ {
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
if (irc != null) if (irc != null)
{ {
return irc; return irc;
@ -335,7 +337,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter
*/ */
irc = new ProgressMonitorDialog(shell); irc = new ProgressMonitorDialog(shell);
RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc);
return irc; return irc;
} }
} }

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -46,7 +47,6 @@ import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorFilterName; import org.eclipse.rse.ui.validators.ValidatorFilterName;
@ -325,9 +325,8 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter
Viewer v = inputProvider.getViewer(); Viewer v = inputProvider.getViewer();
if ((v!=null) && (v instanceof ISystemResourceChangeListener)) if ((v!=null) && (v instanceof ISystemResourceChangeListener))
{ {
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
SystemResourceChangeEvent event = new SystemResourceChangeEvent(newFilter, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(newFilter, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
sr.postEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! RSEUIPlugin.getTheSystemRegistryUI().postEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers!
} }
} }
} catch (Exception exc) } catch (Exception exc)

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -58,7 +59,6 @@ import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.SystemPreferencesManager;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorFilterName; import org.eclipse.rse.ui.validators.ValidatorFilterName;
@ -303,13 +303,12 @@ public class SystemViewFilterReferenceAdapter
ISystemViewInputProvider inputProvider = getInput(); ISystemViewInputProvider inputProvider = getInput();
if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer() != null)) if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer() != null))
{ {
ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
Viewer v = inputProvider.getViewer(); Viewer v = inputProvider.getViewer();
if (v instanceof ISystemResourceChangeListener) if (v instanceof ISystemResourceChangeListener)
{ {
//sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! //sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers!
sr.postEvent((ISystemResourceChangeListener) v, event); // only expand in the current viewer, not all viewers! RSEUIPlugin.getTheSystemRegistryUI().postEvent((ISystemResourceChangeListener) v, event); // only expand in the current viewer, not all viewers!
} }
} }
} }

20
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -17,6 +17,7 @@
* 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) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
* Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -88,7 +89,6 @@ import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAction;
import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.IRSEViewPart;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
@ -288,7 +288,7 @@ public class SystemViewPart
String path = properties.getRemoteFilePath(); String path = properties.getRemoteFilePath();
if (subsystemId != null && path != null) if (subsystemId != null && path != null)
{ {
ISubSystem subSystem = RSEUIPlugin.getTheSystemRegistry().getSubSystem(subsystemId); ISubSystem subSystem = RSECorePlugin.getTheSystemRegistry().getSubSystem(subsystemId);
if (subSystem != null) if (subSystem != null)
{ {
if (subSystem.isConnected()) if (subSystem.isConnected())
@ -380,7 +380,7 @@ public class SystemViewPart
{ {
//RSEUIPlugin.logInfo("INSIDE CREATEPARTCONTROL FOR SYSTEMVIEWPART."); //RSEUIPlugin.logInfo("INSIDE CREATEPARTCONTROL FOR SYSTEMVIEWPART.");
if (input == null) if (input == null)
//input = RSEUIPlugin.getTheSystemRegistry(); //input = RSECorePlugin.getTheSystemRegistry();
input = getInputProvider(); input = getInputProvider();
systemView = new SystemView(getShell(), parent, input, this); systemView = new SystemView(getShell(), parent, input, this);
frameList = createFrameList(); frameList = createFrameList();
@ -401,9 +401,9 @@ public class SystemViewPart
} }
// register global edit actions // register global edit actions
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
Clipboard clipboard = registry.getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
@ -460,7 +460,7 @@ public class SystemViewPart
// if this is the primary RSE view, and there are no user-defined // if this is the primary RSE view, and there are no user-defined
// connections, auto-expand the New Connection prompt... // connections, auto-expand the New Connection prompt...
if ((input == RSEUIPlugin.getTheSystemRegistry()) && (RSEUIPlugin.getTheSystemRegistry().getHosts().length == 1)) if ((input == RSECorePlugin.getTheSystemRegistry()) && (RSECorePlugin.getTheSystemRegistry().getHosts().length == 1))
{ {
// assume this is the primary RSE view // assume this is the primary RSE view
@ -747,7 +747,7 @@ public class SystemViewPart
super.dispose(); super.dispose();
if (platformManager != null) if (platformManager != null)
unregisterWithManager(platformManager); unregisterWithManager(platformManager);
RSEUIPlugin.getTheSystemRegistry().removeSystemPreferenceChangeListener(this); RSECorePlugin.getTheSystemRegistry().removeSystemPreferenceChangeListener(this);
getSite().getPage().removePartListener(partListener); getSite().getPage().removePartListener(partListener);
//System.out.println("INSIDE DISPOSE FOR SYSTEMVIEWPART."); //System.out.println("INSIDE DISPOSE FOR SYSTEMVIEWPART.");
} }
@ -760,7 +760,7 @@ public class SystemViewPart
{ {
IAdaptable inputObj = getSite().getPage().getInput(); IAdaptable inputObj = getSite().getPage().getInput();
inputIsRoot = false; inputIsRoot = false;
ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistry(); ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistryUI();
if (inputObj != null) if (inputObj != null)
{ {
platformManager = Platform.getAdapterManager(); platformManager = Platform.getAdapterManager();
@ -1111,7 +1111,7 @@ public class SystemViewPart
protected void restoreState(IMemento memento) protected void restoreState(IMemento memento)
{ {
RestoreStateRunnable restoreAction = new RestoreStateRunnable(memento); RestoreStateRunnable restoreAction = new RestoreStateRunnable(memento);
restoreAction.setRule(RSEUIPlugin.getTheSystemRegistry()); restoreAction.setRule(RSECorePlugin.getTheSystemRegistry());
restoreAction.schedule(); restoreAction.schedule();
/* DKM - Moved to RestoreStateRunnable /* DKM - Moved to RestoreStateRunnable
@ -1268,7 +1268,7 @@ public class SystemViewPart
*/ */
protected Object getObjectFromMemento(boolean showFilterPools, boolean showFilterStrings, String memento) protected Object getObjectFromMemento(boolean showFilterPools, boolean showFilterStrings, String memento)
{ {
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
ISystemProfile profile = null; ISystemProfile profile = null;
IHost conn = null; IHost conn = null;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java
View file

@ -14,6 +14,7 @@
* 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) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -60,7 +61,7 @@ public class SystemViewScratchpadAdapter extends AbstractSystemViewAdapter imple
{ {
if (_pasteToScratchpadAction == null) if (_pasteToScratchpadAction == null)
{ {
_pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); _pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard());
} }
menu.add(menuGroup, _pasteToScratchpadAction); menu.add(menuGroup, _pasteToScratchpadAction);
} }

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation
* 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) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -24,6 +25,7 @@ import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
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.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
@ -32,7 +34,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
@ -85,7 +86,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
if (selection.size() == 1) { if (selection.size() == 1) {
Object element = selection.getFirstElement(); Object element = selection.getFirstElement();
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfiguration ssFactory = RSECorePlugin.getTheSystemRegistry().getSubSystemConfiguration(ss);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getSubSystemActions(menu, selection, shell, menuGroup, ssFactory, ss); IAction[] actions = adapter.getSubSystemActions(menu, selection, shell, menuGroup, ssFactory, ss);
@ -110,7 +111,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE GETIMAGEDESCRIPTOR FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE GETIMAGEDESCRIPTOR FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfiguration ssFactory = RSECorePlugin.getTheSystemRegistry().getSubSystemConfiguration(ss);
if (ssFactory != null) if (ssFactory != null)
{ {
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
@ -182,7 +183,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE GETPARENT FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE GETPARENT FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
return RSEUIPlugin.getTheSystemRegistry().getHost(ss.getSystemProfile(),ss.getHostAliasName()); return RSECorePlugin.getTheSystemRegistry().getHost(ss.getSystemProfile(),ss.getHostAliasName());
} }
/** /**
@ -655,7 +656,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE DODELETE FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE DODELETE FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
sr.deleteSubSystem(ss); sr.deleteSubSystem(ss);
return true; return true;
} }

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java
View file

@ -14,6 +14,7 @@
* Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view.monitor; package org.eclipse.rse.internal.ui.view.monitor;
@ -31,6 +32,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContainer;
@ -44,7 +46,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.model.ISystemRegistryUI;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.rse.ui.view.SystemTableView;
import org.eclipse.rse.ui.widgets.ISystemCollapsableSectionListener; import org.eclipse.rse.ui.widgets.ISystemCollapsableSectionListener;
@ -184,7 +185,7 @@ FocusListener
{ {
public void run() public void run()
{ {
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.fireEvent(new SystemResourceChangeEvent(_inputObject, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, _inputObject)); registry.fireEvent(new SystemResourceChangeEvent(_inputObject, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, _inputObject));
//getViewer().refresh(); //getViewer().refresh();
} }
@ -252,12 +253,8 @@ FocusListener
createControl(_tabFolderPage); createControl(_tabFolderPage);
ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry();
// global actions // global actions
Clipboard clipboard = registry.getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
_copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard);
_copyAction.setEnabled(false); _copyAction.setEnabled(false);

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* Michael Berger (IBM) - 146339 Added refresh action graphic. * Michael Berger (IBM) - 146339 Added refresh action graphic.
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view.monitor; package org.eclipse.rse.internal.ui.view.monitor;
@ -30,6 +31,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; import org.eclipse.rse.core.events.ISystemRemoteChangeEvent;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.events.ISystemRemoteChangeListener; import org.eclipse.rse.core.events.ISystemRemoteChangeListener;
@ -37,11 +39,11 @@ 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;
import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.ui.SystemPropertyResources; import org.eclipse.rse.internal.ui.SystemPropertyResources;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider;
import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager; import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
@ -663,7 +665,7 @@ class SubSetAction extends BrowseAction
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);
registry.addSystemRemoteChangeListener(this); registry.addSystemRemoteChangeListener(this);
@ -685,7 +687,7 @@ class SubSetAction extends BrowseAction
selectionService.removeSelectionListener(this); selectionService.removeSelectionListener(this);
_folder.dispose(); _folder.dispose();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
registry.removeSystemResourceChangeListener(this); registry.removeSystemResourceChangeListener(this);
registry.removeSystemRemoteChangeListener(this); registry.removeSystemRemoteChangeListener(this);

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java
View file

@ -12,10 +12,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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view.scratchpad; package org.eclipse.rse.internal.ui.view.scratchpad;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
@ -51,7 +53,7 @@ public class ClearAction extends BrowseAction
private void clear() private void clear()
{ {
_scratchPad.clearChildren(); _scratchPad.clearChildren();
RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad)); RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad));
//_view.updateActionStates(); //_view.updateActionStates();
} }
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java
View file

@ -12,22 +12,20 @@
* *
* 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) - [186773] split ISystemRegistryUI from ISystemRegistry
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view.scratchpad; package org.eclipse.rse.internal.ui.view.scratchpad;
import java.util.Iterator; import java.util.Iterator;
import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.SystemResources;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
public class ClearSelectedAction extends BrowseAction public class ClearSelectedAction extends BrowseAction
{ {
public ClearSelectedAction(SystemScratchpadView view) public ClearSelectedAction(SystemScratchpadView view)
@ -79,7 +77,7 @@ public class ClearSelectedAction extends BrowseAction
{ {
_scratchPad.removeChild(iterator.next()); _scratchPad.removeChild(iterator.next());
} }
RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad)); RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad));
//_view.updateActionStates(); //_view.updateActionStates();
} }
} }

Some files were not shown because too many files have changed in this diff Show more