diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java index 9aa849d6250..22bf1db9f89 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java @@ -10,6 +10,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * 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; @@ -32,7 +33,6 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.tm.discovery.model.Pair; import org.eclipse.tm.discovery.model.Service; @@ -93,7 +93,7 @@ public class ServiceDiscoveryWizard extends Wizard { IConfigurationElement[] ce = ep.getConfigurationElements(); SystemRefreshAllAction systemRefreshAllAction = new SystemRefreshAllAction(null); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); String[] addresses = serviceDiscoveryPage.getAddresses(); 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); conn = registry.createHost(discoveryType, "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$ } catch (Exception e) { - RSEUIPlugin.getTheSystemRegistry().deleteHost(conn); + RSECorePlugin.getTheSystemRegistry().deleteHost(conn); return false; } @@ -187,7 +187,7 @@ public class ServiceDiscoveryWizard extends Wizard { } } - RSEUIPlugin.getTheSystemRegistry().expandHost(conn); + RSECorePlugin.getTheSystemRegistry().expandHost(conn); } systemRefreshAllAction.run(); diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html index a77762ffd15..aba5465d642 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html @@ -209,7 +209,7 @@ class in the org.eclipse.rse.core plugin.

A UI-enabled extension of the system registry is available through the ISystemRegistryUI interface. This interface is available by calling the static method -getTheSystemRegistry() in the +getTheSystemRegistryUI() in the RSEUIPlugin class in the org.eclipse.rse.ui plugin.

diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html index c7e2c699064..f73c7fb320e 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html @@ -123,12 +123,12 @@ To get the system registry, use the

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 -with the resource change event. Such operations are only possible when the UI +original client's thread; or you may need access to the System Clipboard. +Such operations are only possible when the UI is loaded, and therefore you need to use ISystemRegistry.fireEvent() method in that case. To get the system registry UI interface, use the -RSEUIPlugin.getTheSystemRegistry() +RSEUIPlugin.getTheSystemRegistryUI() method.

diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java index 954629b7231..83029e4236e 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java @@ -47,7 +47,7 @@ public class DaytimeSubSystem extends SubSystem implements IServiceSubSystem { //This is called after connect - expand the daytime node. //May be called in worker thread. //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); //TODO bug 150919: postEvent() should not be necessary asynchronously //sr.postEvent(event); diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java index a3ca317b43d..22251638fd0 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteCMainTab.java @@ -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 * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Ewa Matejska (PalmSource) - initial API and implementation + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ 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.ILaunchConfigurationWorkingCopy; import org.eclipse.jface.window.Window; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; 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.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -300,7 +301,7 @@ public class RemoteCMainTab extends CMainTab { String remoteConnection = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : null; if(remoteConnection == null) return null; - IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts(); + IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts(); int i = 0; for(i = 0; i < connections.length; i++) if(connections[i].getAliasName().equals(remoteConnection)) @@ -325,7 +326,7 @@ public class RemoteCMainTab extends CMainTab { protected void updateConnectionPulldown() { 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++) connectionCombo.add(connections[i].getAliasName()); diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java index e49e7c5a38e..ff13e051d11 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java @@ -8,6 +8,7 @@ * Contributors: * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchDelegate * 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.model.IProcess; import org.eclipse.osgi.util.NLS; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; 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.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.widgets.Display; public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { @@ -181,7 +182,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { protected IHost getCurrentConnection(ILaunchConfiguration config) throws CoreException { String remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, ""); //$NON-NLS-1$ - IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts(); + IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts(); int i = 0; for(i = 0; i < connections.length; i++) if(connections[i].getAliasName().equals(remoteConnection)) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java index a909c18970d..3757610be2c 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -121,7 +122,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP IRunnableContext runnableContext = getRunnableContext(getShell()); runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress _connection.reset(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); } catch (InterruptedException exc) // user cancelled diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java index 45f498e291d..ce518d70901 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java @@ -10,6 +10,7 @@ * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API * - 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; @@ -34,6 +35,7 @@ import com.jcraft.jsch.Session; import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -256,7 +258,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs //runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress _connection.reset(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); } catch (InterruptedException exc) // user cancelled diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java index 6ef4523fe4c..f0fadedad1a 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * 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; @@ -22,6 +23,7 @@ package org.eclipse.rse.core.model; import java.util.List; import java.util.Vector; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.rse.core.IRSESystemType; @@ -51,7 +53,7 @@ import org.eclipse.rse.internal.core.RSECoreRegistry; *

* This interface is not intended to be implemented by clients. */ -public interface ISystemRegistry extends ISchedulingRule { +public interface ISystemRegistry extends ISchedulingRule, IAdaptable { public ISystemFilterStartHere getSystemFilterStartHere(); @@ -470,13 +472,6 @@ public interface ISystemRegistry extends ISchedulingRule { */ 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 * for access to the local file system. diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/internal/eclipse/filesystem/RSEFileStoreImpl.java b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/internal/eclipse/filesystem/RSEFileStoreImpl.java index c6c19a94d93..a40915de8b0 100644 --- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/internal/eclipse/filesystem/RSEFileStoreImpl.java +++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/internal/eclipse/filesystem/RSEFileStoreImpl.java @@ -17,6 +17,7 @@ * - Improve performance by RSEFileStore instance factory and caching IRemoteFile. * - Also remove unnecessary class RSEFileCache and obsolete branding files. * 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; @@ -35,6 +36,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; 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.ISystemRegistry; 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.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileContext; -import org.eclipse.rse.ui.RSEUIPlugin; /** * Implementation of IFileStore for RSE. @@ -114,7 +115,7 @@ public class RSEFileStoreImpl extends FileStore if (hostNameOrAddr==null) { return null; } - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); IHost[] connections = sr.getHosts(); //FIXME HACK workaround until we get an API method to know when persistent data is fully restored diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java index 66dff08b27b..d17692c4303 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -12,7 +12,7 @@ * * Contributors: * 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; @@ -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.ui.view.SystemActionViewerFilter; 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.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java index 1bbc7b94a75..0c9a344cd0a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.jface.dialogs.ProgressMonitorDialog; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; 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 if (subsystemId != null) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); fs = registry.getSubSystem(subsystemId); } @@ -1413,7 +1415,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP properties.setRemoteFileObject(this); // set remote properties - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); String subSystemId = registry.getAbsoluteNameForSubSystem(subsystem); properties.setRemoteFileSubSystem(subSystemId); properties.setRemoteFilePath(remoteFile.getAbsolutePath()); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java index 3a3e29821b2..59017524b0d 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -304,7 +305,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; @@ -376,7 +377,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener String ssStr = properties.getRemoteFileSubSystem(); if (ssStr != null) { - ISubSystem ss = RSEUIPlugin.getTheSystemRegistry().getSubSystem(ssStr); + ISubSystem ss = RSECorePlugin.getTheSystemRegistry().getSubSystem(ssStr); if (doesHandle(ss)) { _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 if (subsystemId != null) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); fs = registry.getSubSystem(subsystemId); } @@ -591,7 +592,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener protected void refreshRemoteResource(Object parent) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); // refresh if (parent != null) { @@ -629,7 +630,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener private IRemoteFileSubSystem getLocalFileSubSystem() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IHost con = registry.getLocalHost(); if (con != null) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java index 875dc57fe21..f4e4a0641b8 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.runtime.IProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; 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.internal.files.ui.actions.SystemUploadConflictAction; 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.RemoteFileSecurityException; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -262,7 +264,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener IRemoteFile parent = remoteFile.getParentRemoteFile(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); // refresh if (parent != null) { @@ -308,7 +310,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener // 2) Overwrite remote // 3) Save as... // 4) Cancel - Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); + Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell(); SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tempFile, remoteFile, remoteNewer); conflictAction.run(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index 18b6eee2ffb..ec40f8b17f0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -18,6 +18,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.Status; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -247,7 +249,7 @@ public class UniversalFileTransferUtility String remotePath = remoteFile.getAbsolutePath(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem); properties.setRemoteFileSubSystem(subSystemId); properties.setRemoteFilePath(remotePath); @@ -917,7 +919,7 @@ public class UniversalFileTransferUtility */ private static IRemoteFileSubSystem getLocalFileSubSystem() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IHost[] connections = registry.getHosts(); for (int i = 0; i < connections.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java index 203a51286cd..9c6f3b9ccef 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java @@ -13,6 +13,7 @@ * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a new package * 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; @@ -21,6 +22,7 @@ import java.util.ResourceBundle; import org.eclipse.core.runtime.NullProgressMonitor; 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.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; @@ -417,11 +419,11 @@ public class SystemQualifiedRemoteFolderCombo extends Composite String connName = extractConnectionName(fileString); if ((profileName == null) || (connName == null)) return null; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = sr.getSystemProfile(profileName); if (profile == null) return null; - IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName); + IHost conn = RSECorePlugin.getTheSystemRegistry().getHost(profile,connName); return conn; } @@ -569,7 +571,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite if ((profileName == null) || (connName == null) || (dirName == null)) return null; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); // turn profile name into profile object... ISystemProfile profile = sr.getSystemProfile(profileName); @@ -581,7 +583,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite } // turn connection name into connection object... - IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName); + IHost conn = RSECorePlugin.getTheSystemRegistry().getHost(profile,connName); if (conn == null) { msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_CONNECTION_NOTFOUND); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index 4300c600a26..7b5f9bce49b 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -27,6 +28,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; 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.IRemoteFileSubSystemConfiguration; 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.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; @@ -168,7 +169,7 @@ public class SystemSelectRemoteFileOrFolderForm callerInstanceOfWizardPage = (caller instanceof WizardPage); callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); //rb = RSEUIPlugin.getResourceBundle(); - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); // set default GUI verbiage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBIAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBIAGE; @@ -290,7 +291,7 @@ public class SystemSelectRemoteFileOrFolderForm setSystemConnection(connection); setShowNewConnectionPrompt(false); setAutoExpandDepth(1); - //ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + //ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection); IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString rffs = new RemoteFileFilterString(ssf); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java index 8df8c2cf28b..59fe9463a39 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemAddToArchiveAction.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -28,6 +29,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; 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.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; @@ -159,7 +161,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction IRemoteFile selection = (IRemoteFile) _selected.get(i); 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.fireEvent(new SystemResourceChangeEvent(destinationArchive, ISystemResourceChangeEvents.EVENT_REFRESH, destinationArchive.getParentPath())); repeat = false; @@ -315,7 +317,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java index 944b693a7a8..e058d13a0bd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCombineAction.java @@ -14,18 +14,20 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * 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; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; 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.ISystemResourceChangeEvents; 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.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.messages.SystemMessage; 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.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); repeat = false; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java index 47af3088687..d24477232e5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemConvertAction.java @@ -13,17 +13,19 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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; import org.eclipse.core.runtime.NullProgressMonitor; 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.ISystemResourceChangeEvents; 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.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.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -168,7 +170,7 @@ public class SystemConvertAction extends SystemExtractToAction { 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.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java index 1e0c1e5594b..ba23581b8a0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -485,7 +486,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction Viewer v = getViewer(); if (v instanceof ISystemTree) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + SystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemTree tree = (ISystemTree)v; Object parent = tree.getSelectedParent(); if (parent == null) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java index 77b8dc5aaf5..1010870d5db 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -260,7 +260,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru */ public void run() { - setShell(RSEUIPlugin.getTheSystemRegistry().getShell()); + setShell(RSEUIPlugin.getTheSystemRegistryUI().getShell()); SystemIFileProperties properties = new SystemIFileProperties(_tempFile); DownloadConflictDialog cnfDialog = getConflictDialog(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java index a7a19c9511d..8efcfd06ffc 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractAction.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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; @@ -28,12 +29,13 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; 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.ISystemResourceChangeEvents; 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.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.SystemMessageException; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -122,7 +124,7 @@ public class SystemExtractAction extends SystemBaseAction } // always refresh - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destinationParent)); } @@ -259,7 +261,7 @@ public class SystemExtractAction extends SystemBaseAction protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java index c4d352cea41..dd178be9715 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemExtractToAction.java @@ -13,11 +13,13 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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; import org.eclipse.jface.operation.IRunnableContext; 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.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; @@ -161,7 +163,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid { } // always refresh - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath())); } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java index 38570b09461..4d21526d927 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java @@ -13,6 +13,7 @@ * Contributors: * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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... ISubSystem fileSS = targetFolder.getParentRemoteFileSubSystem(); - //RSEUIPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent( + //RSECorePlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent( // ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, copiedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null); RSECorePlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent( ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, movedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null); @@ -164,7 +165,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction Viewer v = getViewer(); if (v instanceof ISystemTree) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + SystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemTree tree = (ISystemTree)v; Object parent = tree.getSelectedParent(); if (parent != null) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java index 33d8acb2e36..d54e5c32f82 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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; @@ -24,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; @@ -503,7 +505,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn try { _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) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/FileServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/FileServicesPropertyPage.java index 96028a3ae70..dd23e57ed39 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/FileServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/FileServicesPropertyPage.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.files.ui.propertypages; @@ -21,13 +22,13 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; 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.widgets.services.FactoryServiceElement; import org.eclipse.rse.ui.widgets.services.ServiceElement; @@ -70,7 +71,7 @@ public class FileServicesPropertyPage extends ServicesPropertyPage protected IFileServiceSubSystemConfiguration[] getFileServiceSubSystemConfigurations(IRSESystemType systemType) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, false); for (int i = 0; i < factories.length; i++) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java index e238b9472d7..98625d81352 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java @@ -13,6 +13,7 @@ * Contributors: * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -342,7 +344,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; @@ -425,7 +427,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe else if (properties.getDownloadFileTimeStamp() != child.getLocation().toFile().lastModified()) { String ssString = properties.getRemoteFileSubSystem(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystem subsystem = registry.getSubSystem(ssString); if (subsystem != null) { @@ -537,7 +539,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe else { String ssString = properties.getRemoteFileSubSystem(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystem subsystem = registry.getSubSystem(ssString); if (subsystem != null) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java index 17776aff5b4..7e37251e0e8 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java @@ -14,6 +14,7 @@ * 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) - [183824] Forward SystemMessageException from IRemoteFileSubsystem + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.files.ui.propertypages; @@ -25,6 +26,7 @@ import java.util.Date; import java.util.List; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -453,7 +455,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage try { getRemoteFile().getParentRemoteFileSubSystem().setReadOnly(getRemoteFile(), readOnlySelected, new NullProgressMonitor()); - RSEUIPlugin.getTheSystemRegistry().fireEvent( + RSECorePlugin.getTheSystemRegistry().fireEvent( new org.eclipse.rse.core.events.SystemResourceChangeEvent( getRemoteFile(),ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,null)); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java index d44c87a2fca..df5ac014e0a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -34,6 +35,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.files.ui.resources.ISystemMountPathMapper; @@ -542,7 +544,7 @@ public class SystemRemoteEditManager String pathStr = properties.getRemoteFilePath(); if (subsystemStr != null && pathStr != null) { - ISubSystem subsystem = RSEUIPlugin.getTheSystemRegistry().getSubSystem(subsystemStr); + ISubSystem subsystem = RSECorePlugin.getTheSystemRegistry().getSubSystem(subsystemStr); if (subsystem != null) { Object rmtObject = null; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java index 457dc847c96..8b0985efc02 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; @@ -1102,7 +1103,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage { return null; } else { - ISystemRegistry reg = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry reg = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = reg.getSystemProfile(profName); if (profile == null) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java index 4b79eb8f0fa..68cf427df56 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -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.ui.RSEUIPlugin; 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.SubSystemConfigurationAdapter; import org.eclipse.swt.dnd.Clipboard; @@ -140,8 +140,7 @@ public class RemoteFileSubSystemConfigurationAdapter extends SubSystemConfigurat // FIXME - can't do this here anymore //_additionalActions.add(new SystemCommandAction(shell, true)); - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - Clipboard clipboard = registry.getSystemClipboard(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); _additionalActions.add(new SystemPasteFromClipboardAction(shell, clipboard)); } return _additionalActions; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java index e96f9c44cc9..2034ff272ea 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java @@ -19,6 +19,7 @@ * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; 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.dialogs.SystemRenameSingleDialog; 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.validators.ISystemValidator; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; @@ -418,8 +417,7 @@ public class SystemViewRemoteFileAdapter //ISubSystem subsys = firstFile.getParentRemoteFileSubSystem(); // DKM - clipboard based copy actions - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - Clipboard clipboard = registry.getSystemClipboard(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); if (pasteClipboardAction == null) { @@ -1530,7 +1528,7 @@ public class SystemViewRemoteFileAdapter */ private IRemoteFileSubSystem getLocalFileSubSystem() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IHost[] connections = registry.getHosts(); for (int i = 0; i < connections.length; i++) { @@ -2521,7 +2519,7 @@ public class SystemViewRemoteFileAdapter boolean ok = true; IRemoteFile file = (IRemoteFile) element; IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); try { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java index b9094ea8fb4..05630d64979 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteSearchResultAdapter.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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; @@ -172,7 +173,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt { if (_copyOutputAction == null) { - _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); + _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard()); } menu.add(menuGroup, _copyOutputAction); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java index 87a83fdd12a..e1f13e26809 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -12,20 +12,16 @@ * * Contributors: * 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; -import java.util.Vector; - -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.internal.files.ui.FileResources; 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.IRemoteFileSubSystem; -import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java index 279905e0534..eeb37d478d5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -12,20 +12,16 @@ * * Contributors: * 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; -import java.util.Vector; - -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.internal.files.ui.FileResources; 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.IRemoteFileSubSystem; -import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; @@ -71,7 +67,7 @@ public class SystemNewFolderWizardMainPage super(wizard, "NewFolder", //$NON-NLS-1$ FileResources.RESID_NEWFOLDER_PAGE1_TITLE, FileResources.RESID_NEWFOLDER_PAGE1_DESCRIPTION); - // nameValidator = new ValidatorProfileName(RSEUIPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector()); + // nameValidator = new ValidatorProfileName(RSECorePlugin.getTheSystemRegistry().getAllSystemProfileNamesVector()); nameValidator = new ValidatorUniqueString(allnames, true); this.parentFolders = parentFolders; } diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java index 0fc2bfe25a8..247316d0270 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java @@ -13,6 +13,7 @@ * Contributors: * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.IRunnableWithProgress; 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.SystemResourceChangeEvent; 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.SystemBaseDialogAction; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.swt.widgets.Shell; public class SystemKillProcessAction extends SystemBaseDialogAction implements IRunnableWithProgress @@ -147,8 +148,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I */ protected IRunnableContext getRunnableContext() { - ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); - IRunnableContext irc = sr.getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc == null) irc = new ProgressMonitorDialog(getShell()); return irc; @@ -241,7 +241,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I // update the ui - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); for (int i = 0; i < results.size(); 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) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); List result = new ArrayList(); for (int i = 0; i < processesDeathRow.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/propertypages/ProcessServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/propertypages/ProcessServicesPropertyPage.java index fec5e54edad..c84e6f26faa 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/propertypages/ProcessServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/propertypages/ProcessServicesPropertyPage.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.processes.ui.propertypages; @@ -21,13 +22,13 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration; 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.widgets.services.FactoryServiceElement; import org.eclipse.rse.ui.widgets.services.ServiceElement; @@ -68,7 +69,7 @@ public class ProcessServicesPropertyPage extends ServicesPropertyPage protected IProcessServiceSubSystemConfiguration[] getProcessServiceSubSystemConfigurations(IRSESystemType systemType) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, false); for (int i = 0; i < factories.length; i++) diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java index 8d9fec6da76..9e004e16cc8 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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; @@ -90,7 +91,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter if (copyClipboardAction == null) { - Clipboard clipboard = RSEUIPlugin.getTheSystemRegistry().getSystemClipboard(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard); } menu.add(menuGroup, copyClipboardAction); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java index ca5781fe4d0..d61a99df1ae 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java @@ -17,6 +17,7 @@ * 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) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; -import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; @@ -205,10 +205,8 @@ FocusListener _tabFolderPage.setLayout(gridLayout); createControl(_tabFolderPage); - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - // global actions - Clipboard clipboard = registry.getSystemClipboard(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _copyAction.setEnabled(false); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java index e6af2dd9a1b..f02f558d9b4 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java @@ -17,6 +17,7 @@ * 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) - [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; @@ -126,7 +127,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter { if (_copyOutputAction == null) { - _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); + _copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard()); } menu.add(menuGroup, _copyOutputAction); @@ -141,7 +142,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter { if (_pasteToPromptAction == null) { - _pasteToPromptAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); + _pasteToPromptAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard()); } menu.add(menuGroup, _pasteToPromptAction); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java index 36a8fbf1a36..e8a694553b9 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java @@ -13,16 +13,17 @@ * * Contributors: * 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; +import org.eclipse.rse.core.RSECorePlugin; 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.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.subsystems.IRemoteFileSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; /** @@ -46,7 +47,7 @@ public class SystemFileAPIProviderImpl { super(); this.directoryMode = directoryMode; - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); } /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java index d48e8f6d94d..09bd6854a7f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/model/RemotePath.java @@ -13,11 +13,13 @@ * * Contributors: * 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; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.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.subsystems.IRemoteFile; 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; } - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = registry.getSystemProfile(profileName); if (profile == null) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java index 8a2907cc3d4..066e4e3ed6a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -20,13 +21,13 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; 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) { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] sses = sr.getSubSystems(connection); for (int i = 0; i < sses.length; i++) { @@ -51,7 +52,7 @@ public class RemoteFileUtility public static IRemoteFileSubSystem[] getFileSubSystems(IHost connection) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] sses = sr.getSubSystems(connection); for (int i = 0; i < sses.length; i++) { @@ -66,7 +67,7 @@ public class RemoteFileUtility public static IRemoteFileSubSystemConfiguration getFileSubSystemConfiguration(IRSESystemType systemType) { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] sses = sr.getSubSystemConfigurationsBySystemType(systemType, false); for (int i = 0; i < sses.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java index 585d92cfdb1..aa4742f0010 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java @@ -12,16 +12,17 @@ * * Contributors: * 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; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; public class OutputRefresh implements Runnable @@ -39,7 +40,7 @@ public class OutputRefresh implements Runnable if (searchConfig != null) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(searchConfig, ISystemResourceChangeEvents.EVENT_REFRESH, null)); if (isDone) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java index 3b8b14cecc8..5ed7b40198e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -1349,7 +1350,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi case CommunicationsEvent.AFTER_DISCONNECT : _cachedRemoteFiles.clear(); // 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); getConnectorService().removeCommunicationsListener(this); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java index 4c86f1a5490..76178b24827 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java @@ -13,6 +13,7 @@ * * Contributors: * 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; @@ -29,6 +30,7 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; 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.subsystems.files.core.servicesubsystem.FileServiceSubSystem; 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.Shell; import org.eclipse.ui.progress.UIJob; @@ -141,7 +142,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, this._fileSubSystem = fileSS; this.dataStore = dataStore; this.system = system; - this._registry = RSEUIPlugin.getTheSystemRegistry(); + this._registry = RSECorePlugin.getTheSystemRegistry(); system.addCommunicationsListener(this); dataStore.getDomainNotifier().addDomainListener(this); _decorateJobs = new HashMap(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/servicesubsystem/OutputRefreshJob.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/servicesubsystem/OutputRefreshJob.java index 4604230d8bd..768471d328b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/servicesubsystem/OutputRefreshJob.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/servicesubsystem/OutputRefreshJob.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -19,13 +20,13 @@ package org.eclipse.rse.internal.subsystems.shells.servicesubsystem; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; 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.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemRegistry; 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.IRemoteOutput; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.ui.progress.UIJob; @@ -73,7 +74,7 @@ public class OutputRefreshJob extends UIJob { try { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); if (_outputs != null) { if ((_outputs.length > 0) && (_outputs[0] != null)) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShell.java index 45f18712f35..0a9720aafa4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShell.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * 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; @@ -22,6 +23,7 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; 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.ISystemRegistry; 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.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.RemoteCmdSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; public abstract class RemoteCommandShell implements IAdaptable, IRemoteCommandShell { @@ -180,7 +181,7 @@ public abstract class RemoteCommandShell implements IAdaptable, IRemoteCommandSh try { IHost host = _fileSubSystem.getHost(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] sses = sr.getSubSystems(host); for (int i = 0; i < sses.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java index 62b932897c1..a65838f90cd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; @@ -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.IRemoteCommandShell; 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.swt.widgets.Shell; @@ -107,7 +108,7 @@ public abstract class RemoteCommandShellOperation { try { - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); _remoteCmdShell = _cmdSubSystem.runShell(_pwd, new NullProgressMonitor()); } catch (Exception e) @@ -135,7 +136,7 @@ public abstract class RemoteCommandShellOperation */ public void finish() { - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); if (_remoteCmdShell != null && _remoteCmdShell.isActive()) { try diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java index 07d187d7b53..e2e13a42544 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * 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; @@ -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)); Display.getDefault().asyncExec(new Refresh(this)); @@ -677,7 +678,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void run() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); } } @@ -695,7 +696,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd 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(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); } @@ -729,7 +730,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void run() { - RSEUIPlugin.getTheSystemRegistry().fireEvent( + RSECorePlugin.getTheSystemRegistry().fireEvent( new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, _ss)); } @@ -816,7 +817,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd return null; } - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); return cmdShell; @@ -828,7 +829,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public IRemoteCommandShell runShell(Object context, IProgressMonitor monitor) throws Exception { IRemoteCommandShell cmdShell = internalRunShell(context, monitor); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); return cmdShell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java index 1ec7ae9be68..d93d4985a74 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java @@ -12,11 +12,13 @@ * * Contributors: * 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; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; 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.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.swt.widgets.Shell; @@ -100,7 +101,7 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction { // clear userid/password from memory and fire event //DKM and disk now system.clearPassword(true, true); - RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, + RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, ss.getHost())); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java index 0bd2fcc69d9..35a96bcbb4b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java @@ -12,10 +12,12 @@ * * Contributors: * 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; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -73,7 +75,7 @@ public class SystemClearPasswordAction extends SystemBaseAction try { IConnectorService system = ss.getConnectorService(); system.clearPassword(true, true); - RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, + RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, ss.getHost())); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java index 9dd9c05681b..54471566e0e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -20,11 +21,12 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; 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.ISystemResourceChangeListener; 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.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; @@ -76,7 +78,7 @@ public class SystemCollapseAction extends SystemBaseAction { */ public void run() { //System.out.println("Inside run of SystemRefreshAction"); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED, null)); //$NON-NLS-1$ } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java index 37c7d4cef14..4f21f733311 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java @@ -12,16 +12,18 @@ * * Contributors: * 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; 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.ISystemResourceChangeListener; 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.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -61,7 +63,7 @@ public class SystemCollapseAllAction extends SystemBaseAction { * @see org.eclipse.jface.action.Action#run() */ public void run() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("false", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$ } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java index 0d51a2bf284..cdaeaf8edb9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -171,7 +171,7 @@ public class SystemCommonDeleteAction catch (Exception e) { } - RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); + RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext(); setEnabled(target.canDelete()); } return null; @@ -179,7 +179,7 @@ public class SystemCommonDeleteAction protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; @@ -187,7 +187,7 @@ public class SystemCommonDeleteAction else { irc = new ProgressMonitorDialog(shell); - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc); return irc; } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java index eee31481344..5003c82513e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.Status; 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.ISystemRegistry; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; 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); allowOnMultipleSelection(false); setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION); - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022"); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java index 52c93a13146..dc1f6506514 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -21,6 +22,7 @@ import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; 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.ISystemProfile; import org.eclipse.rse.internal.ui.SystemResources; @@ -47,7 +49,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction public SystemCopyConnectionAction(Shell parent) { super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY); - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000"); //$NON-NLS-1$ } @@ -220,7 +222,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction veryRootElement.setRenamable(false); veryRootElement.setDeletable(false); - ISystemProfile[] profiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); if (profiles == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java index b743e101917..ccf83c4d348 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.ISystemRegistry; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; 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); allowOnMultipleSelection(false); setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION); - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); // TODO help for connect all //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022"); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java index adb9d4e1256..98847930ccb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -20,11 +21,12 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; 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.ISystemResourceChangeListener; 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.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; @@ -79,7 +81,7 @@ public class SystemExpandAction extends SystemBaseAction { */ public void run() { //System.out.println("Inside run of SystemRefreshAction"); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) { sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED, null)); //$NON-NLS-1$ } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java index 4d571be1124..c3c6407d25c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -21,6 +22,7 @@ import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; 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.ISystemProfile; 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); //allowOnMultipleSelection(false); // too hard to handle, for now! - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000"); //$NON-NLS-1$ } @@ -225,7 +227,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction veryRootElement.setRenamable(false); veryRootElement.setDeletable(false); - ISystemProfile[] profiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); if (profiles == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java index e5a9b85c55e..1c708ef23ba 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; import java.util.Iterator; 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.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; @@ -62,7 +63,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction public boolean updateSelection(IStructuredSelection selection) { boolean enable = true; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); prevProfile = null; Iterator e = selection.iterator(); while (enable && e.hasNext()) @@ -94,7 +95,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction */ public void run() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection()); IHost conn = null; for (int idx=0; idx 1; } @@ -734,7 +734,7 @@ public class SystemViewConnectionAdapter { boolean ok = true; IHost conn = (IHost)element; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.deleteHost(conn); return ok; } @@ -755,7 +755,7 @@ public class SystemViewConnectionAdapter { boolean ok = true; IHost conn = (IHost)element; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.renameHost(conn,name); // renames and saves to disk return ok; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java index 55de0419dfb..4d740f19eef 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java @@ -13,13 +13,14 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * 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; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; @@ -84,9 +85,9 @@ public class SystemViewConnectionSelectionInputProvider extends SystemAbstractAP //System.out.println("Inside getSystemViewRoots. showNew = "+showNew); IHost[] conns = null; if (systemTypes == null) - conns = RSEUIPlugin.getTheSystemRegistry().getHosts(); + conns = RSECorePlugin.getTheSystemRegistry().getHosts(); else - conns = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemTypes(systemTypes); + conns = RSECorePlugin.getTheSystemRegistry().getHostsBySystemTypes(systemTypes); if (showNew) { if ((conns == null) || (conns.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java index ac87ed4bf99..a699bdecccd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; @@ -87,13 +89,13 @@ public class SystemViewDataDragAdapter extends DragSourceAdapter if (dragObject instanceof ISubSystem) { subSystem = (ISubSystem)dragObject; - String subSystemId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); + String subSystemId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); dataStream.append(subSystemId); } else if (dragObject instanceof IHost) { IHost connection = (IHost)dragObject; - String connectionId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForConnection(connection); + String connectionId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForConnection(connection); dataStream.append(connectionId); } else @@ -102,7 +104,7 @@ public class SystemViewDataDragAdapter extends DragSourceAdapter if (subSystem != null) { - String subSystemId = RSEUIPlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); + String subSystemId = RSECorePlugin.getTheSystemRegistry().getAbsoluteNameForSubSystem(subSystem); dataStream.append(subSystemId); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java index f813c06b168..3ca3bcc8696 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -28,6 +29,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.StructuredViewer; 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.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -244,7 +246,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter */ private Object getObjectFor(String str) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); // first extract subsystem id int connectionDelim = str.indexOf(":"); //$NON-NLS-1$ 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) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; @@ -335,7 +337,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter */ irc = new ProgressMonitorDialog(shell); - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc); return irc; } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java index 14e963cbaf4..cadcb4a162d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.RSEUIPlugin; 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.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; @@ -325,9 +325,8 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter Viewer v = inputProvider.getViewer(); if ((v!=null) && (v instanceof ISystemResourceChangeListener)) { - ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); 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) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index c43d01e4362..dfa909e4880 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.SystemMenuManager; 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.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; @@ -303,13 +303,12 @@ public class SystemViewFilterReferenceAdapter ISystemViewInputProvider inputProvider = getInput(); if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer() != null)) { - ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); Viewer v = inputProvider.getViewer(); if (v instanceof ISystemResourceChangeListener) { //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! } } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index bbd6d4acb8f..eda9e781028 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * 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; @@ -88,7 +89,6 @@ import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction; 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.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; @@ -288,7 +288,7 @@ public class SystemViewPart String path = properties.getRemoteFilePath(); if (subsystemId != null && path != null) { - ISubSystem subSystem = RSEUIPlugin.getTheSystemRegistry().getSubSystem(subsystemId); + ISubSystem subSystem = RSECorePlugin.getTheSystemRegistry().getSubSystem(subsystemId); if (subSystem != null) { if (subSystem.isConnected()) @@ -380,7 +380,7 @@ public class SystemViewPart { //RSEUIPlugin.logInfo("INSIDE CREATEPARTCONTROL FOR SYSTEMVIEWPART."); if (input == null) - //input = RSEUIPlugin.getTheSystemRegistry(); + //input = RSECorePlugin.getTheSystemRegistry(); input = getInputProvider(); systemView = new SystemView(getShell(), parent, input, this); frameList = createFrameList(); @@ -401,9 +401,9 @@ public class SystemViewPart } // 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()); @@ -460,7 +460,7 @@ public class SystemViewPart // if this is the primary RSE view, and there are no user-defined // 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 @@ -747,7 +747,7 @@ public class SystemViewPart super.dispose(); if (platformManager != null) unregisterWithManager(platformManager); - RSEUIPlugin.getTheSystemRegistry().removeSystemPreferenceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemPreferenceChangeListener(this); getSite().getPage().removePartListener(partListener); //System.out.println("INSIDE DISPOSE FOR SYSTEMVIEWPART."); } @@ -760,7 +760,7 @@ public class SystemViewPart { IAdaptable inputObj = getSite().getPage().getInput(); inputIsRoot = false; - ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistry(); + ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistryUI(); if (inputObj != null) { platformManager = Platform.getAdapterManager(); @@ -1111,7 +1111,7 @@ public class SystemViewPart protected void restoreState(IMemento memento) { RestoreStateRunnable restoreAction = new RestoreStateRunnable(memento); - restoreAction.setRule(RSEUIPlugin.getTheSystemRegistry()); + restoreAction.setRule(RSECorePlugin.getTheSystemRegistry()); restoreAction.schedule(); /* DKM - Moved to RestoreStateRunnable @@ -1268,7 +1268,7 @@ public class SystemViewPart */ protected Object getObjectFromMemento(boolean showFilterPools, boolean showFilterStrings, String memento) { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = null; IHost conn = null; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java index 65225b410ed..fb42cce01ea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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; @@ -60,7 +61,7 @@ public class SystemViewScratchpadAdapter extends AbstractSystemViewAdapter imple { if (_pasteToScratchpadAction == null) { - _pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard()); + _pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard()); } menu.add(menuGroup, _pasteToScratchpadAction); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java index 39650a5433e..607e8f33860 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; 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.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.validators.ISystemValidator; @@ -85,7 +86,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter if (selection.size() == 1) { Object element = selection.getFirstElement(); ISubSystem ss = (ISubSystem)element; - ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); + ISubSystemConfiguration ssFactory = RSECorePlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); 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); ISubSystem ss = (ISubSystem)element; - ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); + ISubSystemConfiguration ssFactory = RSECorePlugin.getTheSystemRegistry().getSubSystemConfiguration(ss); if (ssFactory != null) { 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); 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); ISubSystem ss = (ISubSystem)element; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.deleteSubSystem(ss); return true; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java index 963b42d59e6..bd34a92c978 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ 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.IStructuredSelection; 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.SystemResourceChangeEvent; 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.actions.SystemCopyToClipboardAction; 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.SystemTableView; import org.eclipse.rse.ui.widgets.ISystemCollapsableSectionListener; @@ -184,7 +185,7 @@ FocusListener { public void run() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(_inputObject, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, _inputObject)); //getViewer().refresh(); } @@ -252,12 +253,8 @@ FocusListener createControl(_tabFolderPage); - - - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - // global actions - Clipboard clipboard = registry.getSystemClipboard(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _copyAction.setEnabled(false); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java index 96bc5c2b6b1..ac9597337b5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java @@ -13,6 +13,7 @@ * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. * 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; @@ -30,6 +31,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; 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.ISystemRemoteChangeEvents; 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.ISystemResourceChangeListener; 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.SystemResources; import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; 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.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -663,7 +665,7 @@ class SubSetAction extends BrowseAction SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$ - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.addSystemResourceChangeListener(this); registry.addSystemRemoteChangeListener(this); @@ -685,7 +687,7 @@ class SubSetAction extends BrowseAction selectionService.removeSelectionListener(this); _folder.dispose(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.removeSystemResourceChangeListener(this); registry.removeSystemRemoteChangeListener(this); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java index 4b7346f213d..c2eb4fd1585 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java @@ -12,10 +12,12 @@ * * Contributors: * 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; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.internal.ui.SystemResources; @@ -51,7 +53,7 @@ public class ClearAction extends BrowseAction private void clear() { _scratchPad.clearChildren(); - RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad)); + RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_scratchPad, ISystemResourceChangeEvents.EVENT_REFRESH, _scratchPad)); //_view.updateActionStates(); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java index 871e338870c..d0737708b41 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java @@ -12,22 +12,20 @@ * * Contributors: * 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; import java.util.Iterator; 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.SystemResourceChangeEvent; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; - - - public class ClearSelectedAction extends BrowseAction { public ClearSelectedAction(SystemScratchpadView view) @@ -79,7 +77,7 @@ public class ClearSelectedAction extends BrowseAction { _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(); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java index f472ba3ecd2..0ecf02705be 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -197,8 +198,9 @@ public class SystemScratchpadView addSelectionChangedListener(this); - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); - RSEUIPlugin.getTheSystemRegistry().addSystemRemoteChangeListener(this); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); + sr.addSystemResourceChangeListener(this); + sr.addSystemRemoteChangeListener(this); initDragAndDrop(); @@ -615,8 +617,9 @@ public class SystemScratchpadView // remove listeners removeSelectionChangedListener(this); - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); - RSEUIPlugin.getTheSystemRegistry().removeSystemRemoteChangeListener(this); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); + sr.removeSystemResourceChangeListener(this); + sr.removeSystemRemoteChangeListener(this); //Composite tree = getTree(); //boolean isDisposed = tree.isDisposed(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java index 38fc1c98f2f..c31fa9920c7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java @@ -12,6 +12,7 @@ * * Contributors: * 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; @@ -28,9 +29,11 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeListener; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.services.clientserver.messages.SystemMessage; @@ -41,7 +44,6 @@ import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.internal.model.SystemRegistry; 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.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; @@ -124,8 +126,8 @@ public class SystemScratchpadViewPart extends ViewPart fillLocalToolBar(); // register global edit actions - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - Clipboard clipboard = registry.getSystemClipboard(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); @@ -161,7 +163,7 @@ public class SystemScratchpadViewPart extends ViewPart selectionService.removeSelectionListener(this); _viewer.removeSelectionChangedListener(this); - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); if (_viewer != null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java index 96d1d251a8b..96194224633 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java @@ -12,6 +12,7 @@ * * Contributors: * 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.search; @@ -39,6 +40,7 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; @@ -56,7 +58,6 @@ import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; 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.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemRemoveElementAdapter; @@ -77,8 +78,6 @@ import org.eclipse.ui.part.CellEditorActionHandler; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.ViewPart; - - /** * This class defines the Remote Search view. */ @@ -249,7 +248,7 @@ public class SystemSearchViewPart extends ViewPart actionBars.updateActionBars(); // add view as a system listener - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); // set help SystemWidgetHelpers.setHelp(pageBook, RSEUIPlugin.HELPPREFIX + "srch0000"); //$NON-NLS-1$ @@ -306,13 +305,9 @@ public class SystemSearchViewPart extends ViewPart // add remove all action tbMgr.add(removeAllAction); - // register global edit actions - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); - // clipboard - Clipboard clipboard = registry.getSystemClipboard(); - - Shell shell = registry.getShell(); + Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); + Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell(); copyAction = new SystemSearchCopyToClipboardAction(shell, clipboard); pasteAction = new SystemPasteFromClipboardAction(shell, clipboard); @@ -549,7 +544,7 @@ public class SystemSearchViewPart extends ViewPart public void dispose() { // remove as resource change listener - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); // clear viewers clearViewers(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java index a9e20ceebf4..be2d96f0fa6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,11 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; @@ -76,7 +77,7 @@ public class SystemTeamViewActiveProfileAction extends SystemBaseAction */ public void run() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = (ISystemProfile)getFirstSelection(); boolean check = isChecked(); while (profile != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java index 8a7a6dd3e1f..43541cddc78 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java @@ -14,6 +14,7 @@ * David Dykstal (IBM) - 180562: remove implementation of IRSEUserIdConstants * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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.team; @@ -23,12 +24,12 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemViewResources; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.swt.widgets.Shell; @@ -161,7 +162,7 @@ public class SystemTeamViewCategoryAdapter { SystemTeamViewSubSystemConfigurationNode[] nodes = null; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurations(); if (factories != null) { @@ -240,7 +241,7 @@ public class SystemTeamViewCategoryAdapter /* if (name.equals(P_IS_ACTIVE)) { - boolean active = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); + boolean active = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); if (active) return SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java index b76325e13d7..d188a210f2c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -24,10 +25,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; @@ -60,7 +61,7 @@ public class SystemTeamViewContentProvider extends WorkbenchContentProvider if (element instanceof IProject) { //IProject rseProject = (IProject)element; - ISystemProfile[] profiles = RSEUIPlugin.getTheSystemRegistry().getAllSystemProfiles(); + ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getAllSystemProfiles(); children = profiles; //return profiles; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java index 9859c824046..03688069306 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java @@ -12,6 +12,7 @@ * * Contributors: * 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.team; @@ -27,6 +28,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.ui.ISystemIconConstants; @@ -75,7 +77,7 @@ public class SystemTeamViewLabelProvider extends LabelProvider if (element instanceof ISystemProfile) { ISystemProfile profile = (ISystemProfile)element; - if (RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName())) + if (RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName())) return RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_PROFILE_ACTIVE_ID); else return RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java index 1c3e425b403..84e91a57664 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,11 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; @@ -80,7 +81,7 @@ public class SystemTeamViewMakeActiveProfileAction extends SystemBaseAction */ public void run() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = (ISystemProfile)getFirstSelection(); while (profile != null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java index 1ffbab8f2d0..e4ad47ebdb9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,11 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; @@ -82,7 +83,7 @@ public class SystemTeamViewMakeInActiveProfileAction extends SystemBaseAction { // TODO: test if attempting to disable all profiles, and issue an error // that at least one needs to be active. Or, at least a warning. - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = (ISystemProfile)getFirstSelection(); while (profile != null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java index ae9fa2612f1..11e72f89a96 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java @@ -12,6 +12,7 @@ * * Contributors: * 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.team; @@ -291,7 +292,7 @@ public class SystemTeamViewPart // update F1 help //PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IF1HelpContextID.NAV01); - RSEUIPlugin.getTheSystemRegistry().addSystemModelChangeListener(this); + RSECorePlugin.getTheSystemRegistry().addSystemModelChangeListener(this); treeViewer.setAutoExpandLevel(2); // dang, it doesn't work! @@ -734,7 +735,7 @@ public class SystemTeamViewPart public void dispose() { - RSEUIPlugin.getTheSystemRegistry().removeSystemModelChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemModelChangeListener(this); super.dispose(); } @@ -996,7 +997,7 @@ public class SystemTeamViewPart boolean ok = true; IStructuredSelection selection= getStructuredSelection(); Iterator elements= selection.iterator(); - ISystemProfileManager mgr = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager(); + ISystemProfileManager mgr = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager(); int nbrActiveProfiles = mgr.getActiveSystemProfiles().length; int activeCount = 0; while (ok && elements.hasNext()) @@ -1365,7 +1366,7 @@ public class SystemTeamViewPart if (memento == null) return null; - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile profile = null; IProject project = null; SystemTeamViewCategoryNode category = null; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java index ff332b2c697..2bfcdcad8a3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * 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.team; @@ -139,7 +140,7 @@ public class SystemTeamViewProfileAdapter public ImageDescriptor getImageDescriptor(Object element) { ISystemProfile profile = (ISystemProfile)element; - if (RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName())) + if (RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName())) return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ACTIVE_ID); else return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID); @@ -197,7 +198,7 @@ public class SystemTeamViewProfileAdapter public String getStatusLineText(Object element) { ISystemProfile profile = (ISystemProfile)element; - boolean active = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); + boolean active = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); return getType(element) + ": " + profile.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$ SystemViewResources.RESID_PROPERTY_PROFILESTATUS_LABEL + ": " + //$NON-NLS-1$ (active ? SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL : SystemViewResources.RESID_PROPERTY_PROFILESTATUS_NOTACTIVE_LABEL); @@ -316,7 +317,7 @@ public class SystemTeamViewProfileAdapter if (name.equals(ISystemPropertyConstants.P_IS_ACTIVE)) { - boolean active = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); + boolean active = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); if (active) return SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL; else @@ -348,7 +349,7 @@ public class SystemTeamViewProfileAdapter public boolean doDelete(Shell shell, Object element, IProgressMonitor monitor) throws Exception { boolean ok = true; - RSEUIPlugin.getTheSystemRegistry().deleteSystemProfile((ISystemProfile)element); + RSECorePlugin.getTheSystemRegistry().deleteSystemProfile((ISystemProfile)element); return ok; } @@ -370,7 +371,7 @@ public class SystemTeamViewProfileAdapter public boolean doRename(Shell shell, Object element, String newName) throws Exception { boolean ok = true; - RSEUIPlugin.getTheSystemRegistry().renameSystemProfile((ISystemProfile)element, newName); + RSECorePlugin.getTheSystemRegistry().renameSystemProfile((ISystemProfile)element, newName); return ok; } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java index 8fbfd69d548..19cc3217998 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * 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.team; @@ -272,7 +273,7 @@ public class SystemTeamViewSubSystemConfigurationAdapter /* if (name.equals(P_IS_ACTIVE)) { - boolean active = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); + boolean active = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().isSystemProfileActive(profile.getName()); if (active) return SystemViewResources.RESID_PROPERTY_PROFILESTATUS_ACTIVE_LABEL); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java index cc5a6fc444b..15f12a7bbc2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java @@ -16,6 +16,7 @@ * Uwe Stieber (Wind River) - Reworked new connection wizard extension point. * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui; @@ -29,6 +30,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemTypeConstants; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSEPreferencesManager; import org.eclipse.rse.core.model.Host; import org.eclipse.rse.core.model.IHost; @@ -197,7 +199,7 @@ public class RSESystemTypeAdapter extends RSEAdapter { result = RSEPreferencesManager.getIsSystemTypeEnabled(systemType); // if enabled, check if the system type has any registered subsystems. If // not, this will auto-disable the system type. - if (result && RSEUIPlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(systemType, true).length == 0) { + if (result && RSECorePlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(systemType, true).length == 0) { result = false; } } @@ -304,7 +306,7 @@ public class RSESystemTypeAdapter extends RSEAdapter { // SystemClearAllPasswordsAction is accepted only if passwords are supported // by any of the sub systems. if (actionClass.equals(SystemClearAllPasswordsAction.class)) { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); IConnectorService[] connectorServices = registry.getConnectorServices(host); boolean passwordsSupported = false; for (int i = 0; i < connectorServices.length && passwordsSupported == false; i++) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index 32dcc8a939e..5aeb085b8ee 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -21,6 +21,7 @@ * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui; @@ -30,14 +31,11 @@ import java.util.Vector; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdapterManager; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; @@ -65,7 +63,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.ui.internal.model.SystemRegistry; import org.eclipse.rse.ui.model.ISystemRegistryUI; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -84,7 +81,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi public IStatus run(IProgressMonitor monitor) { - ISystemRegistry registry = getSystemRegistryInternal(); + ISystemRegistry registry = getSystemRegistryUIInternal(); SystemResourceManager.getRemoteSystemsProject(); // create core folder tree @@ -453,7 +450,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$ - ISystemRegistry registry = getSystemRegistryInternal(); + ISystemRegistry registry = getSystemRegistryUIInternal(); RSECorePlugin.getDefault().setSystemRegistry(registry); IAdapterManager manager = Platform.getAdapterManager(); @@ -506,7 +503,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi closeViews(); // clear in-memory settings for all filter pools and subsystems - ISubSystemConfigurationProxy[] proxies = getSystemRegistryInternal().getSubSystemConfigurationProxies(); + ISubSystemConfigurationProxy[] proxies = getSystemRegistryUIInternal().getSubSystemConfigurationProxies(); if (proxies != null) for (int idx=0; idx < proxies.length; idx++) proxies[idx].reset(); @@ -592,7 +589,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi { if (isSystemRegistryActive()) { - ISubSystemConfigurationProxy[] proxies = getSystemRegistryInternal().getSubSystemConfigurationProxies(); + ISubSystemConfigurationProxy[] proxies = getSystemRegistryUIInternal().getSubSystemConfigurationProxies(); if (proxies != null) { for (int idx=0; idx < proxies.length; idx++) @@ -648,7 +645,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi * Return the SystemRegistry singleton. * Clients should use static @{link getTheSystemRegistry()} instead. */ - private SystemRegistry getSystemRegistryInternal() + private SystemRegistry getSystemRegistryUIInternal() { if (_systemRegistry == null) { @@ -670,9 +667,9 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi * A static version for convenience * Returns the master registry singleton. */ - public static ISystemRegistryUI getTheSystemRegistry() + public static ISystemRegistryUI getTheSystemRegistryUI() { - return getDefault().getSystemRegistryInternal(); + return getDefault().getSystemRegistryUIInternal(); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java index 98374a129df..b4b478b477d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java @@ -18,6 +18,7 @@ * David Dykstal (IBM) - 180562: remove implementation of IRSEUserIdConstants * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui; @@ -37,6 +38,7 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSEUserIdConstants; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSEPreferencesManager; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; @@ -143,7 +145,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab public SystemConnectionForm(ISystemMessageLine msgLine, ISystemConnectionFormCaller caller) { this.msgLine = msgLine; this.caller = caller; - this.defaultProfileNames = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfileNames(); + this.defaultProfileNames = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfileNames(); callerInstanceOfWizardPage = caller instanceof IWizardPage; callerInstanceOfSystemPromptDialog = caller instanceof ISystemPromptDialog; callerInstanceOfPropertyPage = caller instanceof IWorkbenchPropertyPage; @@ -812,7 +814,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab String currHostName = textHostName.getText().trim(); boolean hostNameChanged = !currHostName.equals(originalHostName); IRSESystemType currSystemType = getSystemType(); - textHostName.setItems(RSEUIPlugin.getTheSystemRegistry().getHostNames(currSystemType)); + textHostName.setItems(RSECorePlugin.getTheSystemRegistry().getHostNames(currSystemType)); if (hostNameChanged) { textHostName.setText(currHostName); } else if (textHostName.getItemCount() > 0) { @@ -1175,7 +1177,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab */ public static ISystemValidator getConnectionNameValidator(IHost conn) { ISystemProfile profile = conn.getSystemProfile(); - Vector v = RSEUIPlugin.getTheSystemRegistry().getHostAliasNames(profile); + Vector v = RSECorePlugin.getTheSystemRegistry().getHostAliasNames(profile); v.removeElement(conn.getAliasName()); ValidatorConnectionName connNameValidator = new ValidatorConnectionName(v); return connNameValidator; @@ -1187,7 +1189,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab * Can be null for syntax checking only, versus name-in-use. */ public static ISystemValidator getConnectionNameValidator(ISystemProfile profile) { - Vector v = RSEUIPlugin.getTheSystemRegistry().getHostAliasNames(profile); + Vector v = RSECorePlugin.getTheSystemRegistry().getHostAliasNames(profile); ValidatorConnectionName connNameValidator = new ValidatorConnectionName(v); return connNameValidator; } @@ -1197,7 +1199,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab * There is one validator per active system profile. */ public static ISystemValidator[] getConnectionNameValidators() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISystemProfile[] profiles = sr.getActiveSystemProfiles(); ISystemValidator[] connNameValidators = new ISystemValidator[profiles.length]; for (int idx = 0; idx < profiles.length; idx++) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java index 682a16a5b3b..aac8f9a0ab9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java @@ -13,6 +13,7 @@ * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a this package, was in * the org.eclipse.rse.core package of the UI plugin. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui; @@ -187,7 +188,7 @@ public class SystemPreferencesManager { * list kept in the system registry. */ public static void setConnectionNamesOrder() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); IHost[] conns = sr.getHosts(); String[] names = new String[conns.length]; for (int idx = 0; idx < names.length; idx++) @@ -329,7 +330,7 @@ public class SystemPreferencesManager { store.setValue(ISystemPreferencesConstants.SHOWFILTERPOOLS, show); savePreferences(); if (show != prevValue) { - RSEUIPlugin.getTheSystemRegistry().setShowFilterPools(show); + RSECorePlugin.getTheSystemRegistry().setShowFilterPools(show); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java index 371cce836c9..5ac8a3ba413 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java @@ -14,6 +14,7 @@ * Javier Montalvo Orús (Symbian) - Bug 149151: New Connection first page should use a Listbox for systemtype * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui; @@ -1208,7 +1209,7 @@ public class SystemWidgetHelpers { //System.out.println("TipId: " + ISystemConstants.RESID_HOSTNAME_TIP); Combo combo = createCombo(parent, listener, SystemResources.RESID_CONNECTION_HOSTNAME_TIP); //System.out.println("Tip : " + combo.getToolTipText()); - combo.setItems(RSEUIPlugin.getTheSystemRegistry().getHostNames(systemType)); + combo.setItems(RSECorePlugin.getTheSystemRegistry().getHostNames(systemType)); combo.select(0); return combo; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java index da1deb40f1c..97374478259 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java @@ -13,6 +13,7 @@ * Contributors: * 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) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -22,6 +23,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.core.model.SystemProfileManager; @@ -35,7 +37,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; import org.eclipse.rse.ui.dialogs.SystemSimpleCopyDialog; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -89,7 +90,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction parent); this.mode = mode; mgr = SystemProfileManager.getDefault(); - sr = RSEUIPlugin.getTheSystemRegistry(); + sr = RSECorePlugin.getTheSystemRegistry(); allowOnMultipleSelection(true); setProcessAllSelections(true); setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE); @@ -214,8 +215,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction */ protected IRunnableContext getRunnableContext() { - ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); - IRunnableContext irc = sr.getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc == null) irc = new ProgressMonitorDialog(getShell()); return irc; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java index 0e9801c2709..f2dc1381c24 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -25,6 +26,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.NullProgressMonitor; 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.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -153,7 +155,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV ArrayList fileNames = new ArrayList(); ArrayList resources = new ArrayList(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); while (iterator.hasNext()) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java index db79a5c8747..40cb8dcf341 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -85,7 +86,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements private void pasteClipboardToSelection(Object target) { - List srcObjects = RSEUIPlugin.getTheSystemRegistry().getSystemClipboardObjects(_srcType); + List srcObjects = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboardObjects(_srcType); if (srcObjects.size() > 0) { // do the transfer @@ -140,7 +141,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements } } runnable.schedule(); - RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); + RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext(); } // clear clipboard // _clipboard.setContents(new Object[] { null }, new Transfer[] { PluginTransfer.getInstance()}); @@ -317,7 +318,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements protected IRunnableContext getRunnableContext(Shell shell) { - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); if (irc != null) { return irc; @@ -344,7 +345,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements */ irc = new ProgressMonitorDialog(shell); - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc); return irc; } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java index 6bf70fcb019..e41b0e3162a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java @@ -13,6 +13,7 @@ * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -21,12 +22,13 @@ import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; 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.ISystemResourceChangeListener; import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemContainer; -import org.eclipse.rse.internal.ui.SystemResources; 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.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -72,7 +74,7 @@ public class SystemRefreshAction extends SystemBaseAction */ public void run() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); if (_selection != null) { Vector parents = new Vector(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java index 4533d8750cf..836d0287e1e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java @@ -12,17 +12,19 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.actions; import java.util.Iterator; 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.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemContainer; -import org.eclipse.rse.internal.ui.SystemResources; 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.RSEUIPlugin; import org.eclipse.swt.widgets.Shell; @@ -96,7 +98,7 @@ public class SystemRefreshAllAction extends SystemBaseAction ((ISystemContainer)_rootObject).markStale(true); } } - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); sr.fireEvent(new SystemResourceChangeEvent(sr, ISystemResourceChangeEvents.EVENT_REFRESH, null)); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java index 4faa06e6e7f..385dd1dbbc6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java @@ -11,7 +11,8 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Uwe Stieber} (Wind River) - API consistency. + * Uwe Stieber (Wind River) - API consistency. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -1160,14 +1161,14 @@ public abstract class SystemPromptDialog } if (RSEUIPlugin.isTheSystemRegistryActive()) { - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(getShell(),this); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(getShell(),this); // add a dispose listener for the shell getShell().addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { //System.out.println("Inside dispose for SystemPromptDialog"); - RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); + RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext(); } }); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index 6b4ac023cab..e16f31eca22 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -415,10 +415,10 @@ public class SystemRenameSingleDialog extends SystemPromptDialog super.setBusyCursor(true); try { Shell shell = getShell(); - IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); - RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); + IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext(); + RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext(); names = ra.getRemoteParentNamesInUse(shell, inputElement); - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(shell, irc); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc); } catch (Exception exc) {SystemBasePlugin.logError("Exception getting parent's child names in rename dialog",exc);} //$NON-NLS-1$ if ((names != null) && (names.length>0)) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java index d88d9289234..2ef2009432a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -62,7 +62,7 @@ public class SystemSelectAnythingDialog extends SystemPromptDialog */ protected ISystemViewInputProvider getInputProvider() { - ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistry(); + ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistryUI(); return inputProvider; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java index d3b1c036276..330472d25a6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -131,7 +131,7 @@ public class SystemSimpleCopyDialog //ActionContributionItem[] actionItems = createActionContributionItems(); //Composite buttons = createButtonBar(composite_prompts, actionItems); - //RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); + //RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); return composite_prompts; } @@ -200,7 +200,7 @@ public class SystemSimpleCopyDialog public boolean close() { - //RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + //RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); return super.close(); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java index 4d497d9dcf1..5eb92f75dc1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java @@ -11,7 +11,8 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Uwe Stieber} (Wind River) - API consistency. + * Uwe Stieber (Wind River) - API consistency. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -144,11 +145,11 @@ public class SystemWizardDialog extends WizardDialog implements ISystemPromptDia ((ProgressMonitorPart)pm).dispose(); } if (needsMonitor && RSEUIPlugin.isTheSystemRegistryActive()) { - RSEUIPlugin.getTheSystemRegistry().setRunnableContext(getShell(), this); + RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(getShell(), this); // add a dispose listener getShell().addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - RSEUIPlugin.getTheSystemRegistry().clearRunnableContext(); + RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext(); } }); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java index 9e550cec597..a55195b20d0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.operations; @@ -26,6 +27,7 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.IAction; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.SubSystem; @@ -151,7 +153,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW public void run() { - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.connectedStatusChange(_ss, true, false); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java index de36cbe31e8..321fdc2a950 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.propertypages; @@ -29,6 +30,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; import org.eclipse.rse.core.PasswordPersistenceManager; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.SystemSignonInformation; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -339,7 +341,7 @@ public final class SignonPreferencePage extends PreferencePage implements IWorkb { PasswordModification mod; PasswordPersistenceManager manager = PasswordPersistenceManager.getInstance(); - IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts(); + IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts(); ISubSystem[] subsystems; IConnectorService system; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java index 227fd5dbfac..0b9dc456ad5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java @@ -15,6 +15,7 @@ * - created and used RSEPreferencesManager * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ @@ -321,7 +322,7 @@ public class SystemTypeFieldEditor extends FieldEditor ArrayList list = new ArrayList(); if (systemTypes == null || restoreDefaults) { for (int i = 0; i < types.length; i++) { - ISubSystemConfiguration[] configurations = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(types[i], false); + ISubSystemConfiguration[] configurations = RSECorePlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(types[i], false); if (configurations != null && configurations.length > 0) { list.add(types[i]); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java index 78ecfe7a26c..34184760c51 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java @@ -12,6 +12,7 @@ * * Contributors: * 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.ui.view; @@ -29,6 +30,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; @@ -622,7 +624,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda { boolean anyAdded = false; SystemFilterPoolWrapperInformation poolWrapperInfo = getNewFilterWizardPoolWrapperInformation(); - ISystemProfile[] activeProfiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] activeProfiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); ISystemProfile activeProfile = selectedSubSystem.getHost().getSystemProfile(); for (int idx = 0; idx < activeProfiles.length; idx++) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 1baa3f6d661..52f22a48856 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -318,8 +319,9 @@ public class SystemTableView addSelectionChangedListener(this); - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); - RSEUIPlugin.getTheSystemRegistry().addSystemRemoteChangeListener(this); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); + sr.addSystemResourceChangeListener(this); + sr.addSystemRemoteChangeListener(this); initDragAndDrop(); @@ -925,7 +927,7 @@ public class SystemTableView case ISystemResourceChangeEvents.EVENT_REFRESH: { - if (child == RSEUIPlugin.getTheSystemRegistry()) + if (child == RSECorePlugin.getTheSystemRegistry()) { // treat this as refresh all child = _objectInput; @@ -1199,8 +1201,9 @@ public class SystemTableView public void dispose() { removeSelectionChangedListener(this); - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); - RSEUIPlugin.getTheSystemRegistry().removeSystemRemoteChangeListener(this); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); + sr.removeSystemResourceChangeListener(this); + sr.removeSystemRemoteChangeListener(this); _menuManager.removeAll(); Table table = getTable(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java index 3059bb8c57e..caa4fc13063 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemHostCombo.java @@ -14,6 +14,7 @@ * David Dykstal (IBM) - moved SystemPreferencesManager to a new package * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.widgets; @@ -24,6 +25,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeListener; @@ -31,7 +33,6 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; @@ -174,7 +175,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, public SystemHostCombo(Composite parent, int style, IHost defaultConnection, String ssConfigId, boolean showNewButton) { super(parent, style); - restrictSystemTypesTo = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ssConfigId).getSystemTypes(); + restrictSystemTypesTo = RSECorePlugin.getTheSystemRegistry().getSubSystemConfiguration(ssConfigId).getSystemTypes(); init(parent, showNewButton); populateSSFactoryId = ssConfigId; populateConnectionCombo(connectionCombo, ssConfigId, defaultConnection); @@ -212,7 +213,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, super(parent, style); if (showNewButton) // this is expensive, so only need to do this if New is enabled { - ISubSystemConfigurationProxy[] ssfProxies = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfigurationProxiesByCategory(ssFactoryCategory); + ISubSystemConfigurationProxy[] ssfProxies = RSECorePlugin.getTheSystemRegistry().getSubSystemConfigurationProxiesByCategory(ssFactoryCategory); Vector vTypes = new Vector(); for (int idx = 0; idx < ssfProxies.length; idx++) { // Do not call ISubSystemConfigurationProxy.getSystemTypes() directly. If @@ -692,9 +693,9 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, boolean matchFound = false; IHost[] additionalConnections = null; if ( (systemType == null) || (systemType.equals("*")) ) //$NON-NLS-1$ - additionalConnections = RSEUIPlugin.getTheSystemRegistry().getHosts(); + additionalConnections = RSECorePlugin.getTheSystemRegistry().getHosts(); else - additionalConnections = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemType(systemType); + additionalConnections = RSECorePlugin.getTheSystemRegistry().getHostsBySystemType(systemType); if (additionalConnections != null) { String[] connectionNames = new String[additionalConnections.length]; @@ -776,7 +777,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, */ protected boolean populateConnectionCombo(Combo combo, ISubSystemConfiguration ssFactory, IHost defaultConnection) { - connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySubSystemConfiguration(ssFactory); + connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfiguration(ssFactory); return addConnections(combo, connections, defaultConnection); } /** @@ -790,7 +791,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, */ protected boolean populateConnectionCombo(Combo combo, String ssFactoryId, IHost defaultConnection) { - connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationId(ssFactoryId); + connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationId(ssFactoryId); return addConnections(combo, connections, defaultConnection); } @@ -805,7 +806,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, */ protected boolean populateConnectionCombo(Combo combo, IHost defaultConnection, String ssFactoryCategory) { - connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory(ssFactoryCategory); + connections = RSECorePlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory(ssFactoryCategory); return addConnections(combo, connections, defaultConnection); } /** @@ -948,7 +949,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, // register with system registry for events // ---------------------------------------- listeningForConnectionEvents = true; - RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().addSystemResourceChangeListener(this); } else { @@ -956,7 +957,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, // remove register with system registry for events // ---------------------------------------- listeningForConnectionEvents = false; - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); } } /** @@ -967,7 +968,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, if (listeningForConnectionEvents) { listeningForConnectionEvents = false; - RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); + RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java index 0748cc507f0..b62cf5a96d0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java @@ -14,6 +14,7 @@ * Uwe Stieber (Wind River) - Reworked new connection wizard extension point. * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.wizards; @@ -23,6 +24,7 @@ import java.util.List; import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -32,7 +34,6 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystem; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.widgets.services.ConnectorServiceElement; import org.eclipse.rse.ui.widgets.services.FactoryServiceElement; import org.eclipse.rse.ui.widgets.services.RootServiceElement; @@ -121,7 +122,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar protected IServiceSubSystemConfiguration[] getServiceSubSystemConfigurations(IRSESystemType systemType, Class serviceType) { List results = new ArrayList(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] configs = sr.getSubSystemConfigurationsBySystemType(systemType, false); for (int i = 0; i < configs.length; i++) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java index e8166c2edf4..52ef3e32a45 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2000, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved. * 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 * 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. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.wizards; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.ui.SystemResources; @@ -80,7 +81,7 @@ public class SystemNewProfileWizard if (mainPage.performFinish()) { //SystemMessage.showInformationMessage(getShell(),"Finish pressed."); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); String name = mainPage.getProfileName(); boolean makeActive = mainPage.getMakeActive(); try diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java index 9a08b77d9c3..0ff2edbe897 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java @@ -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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,11 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.wizards; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.RSEUIPlugin; @@ -61,7 +62,7 @@ public class SystemNewProfileWizardMainPage super(wizard, "NewProfile", //$NON-NLS-1$ SystemResources.RESID_NEWPROFILE_PAGE1_TITLE, SystemResources.RESID_NEWPROFILE_PAGE1_DESCRIPTION); - nameValidator = new ValidatorProfileName(RSEUIPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector()); + nameValidator = new ValidatorProfileName(RSECorePlugin.getTheSystemRegistry().getAllSystemProfileNamesVector()); setHelp(HELPID_PREFIX+"0000"); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java index 84adb39452d..0eddf27576c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * 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.ui.wizards.newconnection; @@ -32,6 +33,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; @@ -210,7 +212,7 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) { // 2. If the wizard is invoked the 1st time, the default private system profile is the // default profile. - ISystemProfile defaultPrivateProfile = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile(); + ISystemProfile defaultPrivateProfile = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile(); if (defaultPrivateProfile != null) defaultProfileName = defaultPrivateProfile.getName(); if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) { // 4. The first non-empty profile from the list of active profiles is the default profile. @@ -300,7 +302,7 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar if (ok) { boolean cursorSet = true; setBusyCursor(true); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); // if private profile is not null, then we have to rename the private profile // with the new profile name @@ -378,7 +380,7 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar if (subsystemFactorySuppliedWizardPages == null) { // query all affected subsystems for their list of additional wizard pages... Vector additionalPages = new Vector(); - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true); for (int idx = 0; idx < factories.length; idx++) { ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factories[idx].getAdapter(ISubSystemConfigurationAdapter.class); diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java index 4ff1742839b..5de26b8f968 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java @@ -24,6 +24,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * 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.ui.internal.model; @@ -113,7 +114,7 @@ import org.eclipse.ui.part.ResourceTransfer; /** * Registry for all connections. */ -public class SystemRegistry implements ISystemRegistryUI, ISystemViewInputProvider +public class SystemRegistry implements ISystemRegistry, ISystemRegistryUI, ISystemViewInputProvider { private static Exception lastException = null; private static SystemRegistry registry = null; @@ -1988,7 +1989,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemViewInputProvid String subSystemId = str.substring(0, subsystemDelim); String srcKey = str.substring(subsystemDelim + 1, str.length()); - ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystem subSystem = registry.getSubSystem(subSystemId); if (subSystem != null) { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java index fffb6ab420d..0d75517171d 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java @@ -12,13 +12,15 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.ui.model; +import java.util.List; + import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeListener; -import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; @@ -27,13 +29,20 @@ import org.eclipse.swt.widgets.Shell; * Registry or front door for all remote system connections. */ public interface ISystemRegistryUI - extends ISystemRegistry, ISystemShellProvider, ISystemViewInputProvider { + extends ISystemShellProvider, ISystemViewInputProvider { /** * Returns the clipboard used for copy actions */ public Clipboard getSystemClipboard(); + /** + * 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); + /** * Notify all listeners of a change to a system resource such as a connection. * You would not normally call this as the methods in this class call it when appropriate. diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 490ca5aa834..650ee0817c4 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -21,6 +21,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -42,6 +43,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSEPreferencesManager; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvents; @@ -808,7 +810,7 @@ public abstract class SubSystem extends RSEModelObject try { ISystemFilterPoolReferenceManager filterMgr = getFilterPoolReferenceManager(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystemConfiguration factory = registry.getSubSystemConfiguration(this); int indexOfDot = filterID.indexOf('.'); @@ -998,7 +1000,7 @@ public abstract class SubSystem extends RSEModelObject */ protected void fireEvent(SystemResourceChangeEvent event) { - RSEUIPlugin.getTheSystemRegistry().fireEvent(event); + RSECorePlugin.getTheSystemRegistry().fireEvent(event); } /* * Helper method to fire a reference event... @@ -1006,7 +1008,7 @@ public abstract class SubSystem extends RSEModelObject protected void fireEvent(SystemResourceChangeEvent event, Object grandParent) { event.setGrandParent(grandParent); - RSEUIPlugin.getTheSystemRegistry().fireEvent(event); + RSECorePlugin.getTheSystemRegistry().fireEvent(event); } /* * Helper method to create and then fire an event... @@ -1059,7 +1061,7 @@ public abstract class SubSystem extends RSEModelObject } try { getSubSystemConfiguration().saveSubSystem(this); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, newPoolRef, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, newPoolRef, null); } catch (Exception exc) { SystemBasePlugin.logError("Error saving subsystem " + getName(), exc); //$NON-NLS-1$ } @@ -1083,7 +1085,7 @@ public abstract class SubSystem extends RSEModelObject try { getSubSystemConfiguration().saveSubSystem(this); // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, filterPoolRef, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, filterPoolRef, null); } catch (Exception exc) { @@ -1099,7 +1101,7 @@ public abstract class SubSystem extends RSEModelObject try { getSubSystemConfiguration().saveSubSystem(this); // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, filterPoolRef, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, filterPoolRef, null); } catch (Exception exc) { @@ -1117,7 +1119,7 @@ public abstract class SubSystem extends RSEModelObject getSubSystemConfiguration().saveSubSystem(this); ISystemFilterPoolReference[] poolRefs = getFilterPoolReferenceManager().getSystemFilterPoolReferences(); for (int idx=0; idx0)) - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTER, filterStrings[0].getParentSystemFilter(), null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTER, filterStrings[0].getParentSystemFilter(), null); } // --------------------------------- diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java index 2941dc30374..db2f5ba5189 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.core; @@ -583,7 +584,7 @@ public class SystemResourceListener implements ISystemResourceListener, Runnable { return SystemPerspectiveHelpers.findRSEView(); /* - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + SystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); IWorkbench wb = PlatformUI.getWorkbench(); IWorkbenchWindow[] wbWindows = wb.getWorkbenchWindows(); for (int idx = 0; idx < wbWindows.length; idx++) @@ -608,7 +609,7 @@ public class SystemResourceListener implements ISystemResourceListener, Runnable */ private IWorkbenchPage[] getRSEPerspectives() { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); IWorkbench wb = PlatformUI.getWorkbench(); IWorkbenchWindow[] wbWindows = wb.getWorkbenchWindows(); Vector v = new Vector(); @@ -672,7 +673,7 @@ public class SystemResourceListener implements ISystemResourceListener, Runnable } else if (runAction == FIRE_EVENT) { - RSEUIPlugin.getTheSystemRegistry().fireEvent( + RSECorePlugin.getTheSystemRegistry().fireEvent( new SystemModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ALL_RELOADED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_ALL, "dummy")); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCascadingCompileAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCascadingCompileAction.java index c7fe5c474ee..6ae294389be 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCascadingCompileAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCascadingCompileAction.java @@ -1,5 +1,3 @@ -package org.eclipse.rse.internal.useractions.ui.compile; - /******************************************************************************* * Copyright (c) 2002, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -9,11 +7,15 @@ package org.eclipse.rse.internal.useractions.ui.compile; * * Contributors: * IBM Corporation - initial API and implementation + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ +package org.eclipse.rse.internal.useractions.ui.compile; + import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.internal.useractions.UserActionsResources; import org.eclipse.rse.ui.ISystemContextMenuConstants; @@ -71,7 +73,7 @@ public class SystemCascadingCompileAction extends SystemBaseSubMenuAction implem } // is cascading-by-profile preference turned on? if (SystemPreferencesManager.getCascadeUserActions()) { - ISystemProfile[] activeProfiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] activeProfiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); for (int idx = 0; idx < activeProfiles.length; idx++) { SystemBaseSubMenuAction profileAction = new SystemCompileCascadeByProfileAction(getShell(), firstSelection, activeProfiles[idx], isPrompt); ourSubMenu.add(profileAction.getSubMenu()); @@ -79,7 +81,7 @@ public class SystemCascadingCompileAction extends SystemBaseSubMenuAction implem } // else concatenate all the compile commands from all the active profiles... else { - ISystemProfile[] activeProfiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] activeProfiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); for (int idx = 0; idx < activeProfiles.length; idx++) SystemCompileCascadeByProfileAction.populateMenuWithCompileActions(ourSubMenu, getShell(), activeProfiles[idx], firstSelection, isPrompt); } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileManager.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileManager.java index f2de8602d60..a19274cc37f 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileManager.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileManager.java @@ -8,13 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.compile; import java.util.Hashtable; + import org.eclipse.core.resources.IFolder; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; @@ -300,7 +303,7 @@ public abstract class SystemCompileManager { String srcType = rmtAdapter.getRemoteSourceType(selection); if (srcType == null) return false; boolean compilable = false; - ISystemProfile[] activeProfiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] activeProfiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); for (int idx = 0; !compilable && (idx < activeProfiles.length); idx++) { SystemCompileProfile compProfile = getCompileProfile(activeProfiles[idx]); compProfile.addContributions(selection); diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java index e5d886061a2..0987d54858d 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - [180562][api] dont implement ISystemCompileXMLConstants + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.compile; @@ -28,10 +29,10 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceHelpers; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.widgets.Shell; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -114,7 +115,7 @@ public abstract class SystemCompileProfile { * Return the system profile this is associated with */ public ISystemProfile getProfile() { - return RSEUIPlugin.getTheSystemRegistry().getSystemProfile(profileName); + return RSECorePlugin.getTheSystemRegistry().getSystemProfile(profileName); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemWorkWithCompileCommandsDialog.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemWorkWithCompileCommandsDialog.java index 31b629048c7..ee35324b4df 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemWorkWithCompileCommandsDialog.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemWorkWithCompileCommandsDialog.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.compile; @@ -23,6 +24,7 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.events.ISystemModelChangeEvents; import org.eclipse.rse.internal.ui.SystemResources; @@ -583,10 +585,10 @@ public class SystemWorkWithCompileCommandsDialog extends SystemPromptDialog impl saveCompileCommand(editedCompileCmd, newMode, prevListSelection); processCommandsListSelected(); if (newMode) - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, editedCompileCmd, + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, editedCompileCmd, null); else - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, editedCompileCmd, null); } } @@ -925,7 +927,7 @@ public class SystemWorkWithCompileCommandsDialog extends SystemPromptDialog impl rmvSrcTypeButton.setEnabled(true); //traceTest = false; // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, deletedCmd, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, deletedCmd, null); } } catch (Exception exc) { } @@ -962,7 +964,7 @@ public class SystemWorkWithCompileCommandsDialog extends SystemPromptDialog impl listView.showSelection(); processCommandsListSelected(); // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, currCmd, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, currCmd, null); } /** @@ -996,7 +998,7 @@ public class SystemWorkWithCompileCommandsDialog extends SystemPromptDialog impl listView.showSelection(); processCommandsListSelected(); // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, currCmd, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, currCmd, null); } /** @@ -1058,7 +1060,7 @@ public class SystemWorkWithCompileCommandsDialog extends SystemPromptDialog impl clipboard.dispose(); clipboard = null; // fire model change event in case any BP code is listening... - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, oldCmd, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, oldCmd, null); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/propertypages/SystemTeamViewCompileCommandPropertyPage.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/propertypages/SystemTeamViewCompileCommandPropertyPage.java index eb8dabf6cc0..6d69b39e5ab 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/propertypages/SystemTeamViewCompileCommandPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/propertypages/SystemTeamViewCompileCommandPropertyPage.java @@ -8,10 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.propertypages; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvents; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.SystemResources; @@ -23,7 +25,6 @@ import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileCommandEditP import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileManager; import org.eclipse.rse.internal.useractions.ui.compile.teamview.SystemTeamViewCompileCommandNode; 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.propertypages.SystemBasePropertyPage; import org.eclipse.swt.layout.GridData; @@ -165,7 +166,7 @@ public class SystemTeamViewCompileCommandPropertyPage extends SystemBaseProperty ok = (editedCompileCmd != null); if (!ok) return false; getCompileCommand().getCompileCommand().getParentType().getParentProfile().writeToDisk(); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, editedCompileCmd, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_COMPILECMD, editedCompileCmd, null); return ok; } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDACascadeAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDACascadeAction.java index a558dc35a10..16d68bf93a8 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDACascadeAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDACascadeAction.java @@ -1,5 +1,3 @@ -package org.eclipse.rse.internal.useractions.ui.uda; - /******************************************************************************* * Copyright (c) 2002, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -9,17 +7,21 @@ package org.eclipse.rse.internal.useractions.ui.uda; * * Contributors: * IBM Corporation - initial API and implementation + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ + +package org.eclipse.rse.internal.useractions.ui.uda; + import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.internal.useractions.ui.uda.actions.SystemWorkWithUDAsAction; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.actions.SystemBaseDummyAction; import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction; @@ -74,7 +76,7 @@ public class SystemUDACascadeAction extends SystemBaseSubMenuAction implements I } // is cascading-by-profile preference turned on? else { - ISystemProfile[] activeProfiles = RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + ISystemProfile[] activeProfiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); for (int idx = 0; idx < activeProfiles.length; idx++) { SystemBaseSubMenuAction profileAction = new SystemUDACascadeByProfileAction(shell, udsubsystem, getSelection(), activeProfiles[idx]); ourSubMenu.add(profileAction.getSubMenu()); diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionEditPane.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionEditPane.java index 7fdcb7f6fac..064c7d1038f 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionEditPane.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionEditPane.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.uda; @@ -18,6 +19,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -29,7 +31,6 @@ import org.eclipse.rse.internal.useractions.ui.SystemCommandViewerConfiguration; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.shells.ui.view.ISystemCommandTextModifyListener; import org.eclipse.rse.ui.ISystemMassager; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidatorUniqueString; @@ -1096,9 +1097,9 @@ public class SystemUDActionEditPane implements SelectionListener, // for the che udam.saveUserData(currentProfile); // inform anybody registered as listeners that we have created/changed model object... if (newMode) - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_USERACTION, currentAction, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_USERACTION, currentAction, null); else - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_USERACTION, currentAction, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_USERACTION, currentAction, null); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionSubsystem.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionSubsystem.java index a383316be92..f3713a35165 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionSubsystem.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDActionSubsystem.java @@ -9,7 +9,9 @@ * IBM Corporation - initial API and implementation * 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) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ + package org.eclipse.rse.internal.useractions.ui.uda; import java.io.File; @@ -493,7 +495,7 @@ public abstract class SystemUDActionSubsystem implements ISystemSubstitutor { // REFRESH VIEW IF REQUESTED IN ACTION // ------------------------------------------------------------ if (actionRunEvenOnce && action.getRefresh() && (viewer != null)) { - ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); try { Thread.sleep(500L); } catch (Exception exc) { @@ -1065,7 +1067,7 @@ public abstract class SystemUDActionSubsystem implements ISystemSubstitutor { * Get the active system profiles */ protected ISystemProfile[] getActiveSystemProfiles() { - return RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + return RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); } protected List getDirtyEditors(IStructuredSelection sel) { diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java index 447a902de5f..a7a25b87f4f 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java @@ -8,7 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - [180562][api] dont implement ISystemUDAConstants + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ + package org.eclipse.rse.internal.useractions.ui.uda; import java.io.File; @@ -565,7 +567,7 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan * Get the active system profiles */ private ISystemProfile[] getActiveSystemProfiles() { - return RSEUIPlugin.getTheSystemRegistry().getActiveSystemProfiles(); + return RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles(); } // --------------------------------------------------------------------------- diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java index befb262cf1b..5166131035a 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java @@ -8,7 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.uda; import org.eclipse.jface.action.IMenuListener; @@ -21,6 +23,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemProfile; @@ -378,7 +381,7 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I } if (deleted) { remove(selection.getFirstElement()); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, getResourceType(), selection.getFirstElement(), null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, getResourceType(), selection.getFirstElement(), null); } return deleted; } @@ -412,7 +415,7 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I refreshElementParent(firstSelect); selectElement(firstSelect); docManager.saveUserData(docManager.getCurrentProfile()); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, getResourceType(), firstSelect, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, getResourceType(), firstSelect, null); } return true; } @@ -433,7 +436,7 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I refreshElementParent(firstSelect); selectElement(firstSelect); docManager.saveUserData(docManager.getCurrentProfile()); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, getResourceType(), firstSelect, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_REORDERED, getResourceType(), firstSelect, null); } return true; } @@ -473,7 +476,7 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I } else refreshElementParent(firstSelect); selectElement(pastedElementWrapper); - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, getResourceType(), pastedElementWrapper, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, getResourceType(), pastedElementWrapper, null); } clipboard.dispose(); clipboard = null; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeEditPane.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeEditPane.java index c7d127072b5..44ce0a43c7f 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeEditPane.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeEditPane.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * 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.useractions.ui.uda; @@ -18,12 +19,12 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.validators.ValidatorUserTypeName; import org.eclipse.rse.ui.widgets.SystemEditPaneStateMachine; @@ -471,9 +472,9 @@ public class SystemUDTypeEditPane implements ISelectionChangedListener { udtm.saveUserData(); // inform anybody registered as listeners that we have created/changed model object... if (newMode) - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_NAMEDTYPE, currentType, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_NAMEDTYPE, currentType, null); else - RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_NAMEDTYPE, currentType, null); + RSECorePlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_NAMEDTYPE, currentType, null); } /** diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java index ef9586ad570..0003af4547b 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java @@ -12,6 +12,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ package org.eclipse.rse.tests.internal; @@ -48,7 +49,6 @@ import org.eclipse.rse.tests.RSETestsPlugin; import org.eclipse.rse.tests.core.connection.IRSEConnectionManager; import org.eclipse.rse.tests.core.connection.IRSEConnectionProperties; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.osgi.framework.Bundle; /** @@ -170,7 +170,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { public void removeConnection(String profileName, String name) { assert profileName != null && name != null; - ISystemRegistry systemRegistry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry(); Assert.assertNotNull("FAILED(findOrCreateConnection): RSE system registry unavailable!", systemRegistry); //$NON-NLS-1$ ISystemProfile profile = systemRegistry.getSystemProfile(profileName); @@ -191,7 +191,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { IHost connection = null; - ISystemRegistry systemRegistry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry(); Assert.assertNotNull("FAILED(findOrCreateConnection): RSE system registry unavailable!", systemRegistry); //$NON-NLS-1$ Exception exception = null; @@ -275,7 +275,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { */ public IShellServiceSubSystem getShellSubSystem(IHost connection) throws Exception { assert connection != null; - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] subSystems = registry.getSubSystems(connection); for (int i = 0; i < subSystems.length; i++) { ISubSystem subSystem = subSystems[i]; @@ -291,7 +291,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { */ public ITestSubSystem getTestSubSystem(IHost connection) throws Exception { assert connection != null; - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); ISubSystem[] subSystems = registry.getSubSystems(connection); for (int i = 0; i < subSystems.length; i++) { ISubSystem subSystem = subSystems[i]; diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java index 3567400117c..c99aa649dec 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java @@ -8,6 +8,7 @@ * David Dykstal (IBM) - initial API and implementation. * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry ********************************************************************************/ package org.eclipse.rse.tests.persistence; @@ -56,7 +57,7 @@ public class PersistenceTest extends RSECoreTestCase { /* * Set up this particular test. */ - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); /* * Create a new profile in this profile manager. This will be the third @@ -160,7 +161,7 @@ public class PersistenceTest extends RSECoreTestCase { /* * Set up this particular test. */ - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); /* * Create a new profile in this profile manager. This will be the third diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java index 81aa9d977a1..c923a3e0aca 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. * All rights reserved. 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 available at @@ -7,6 +7,7 @@ * * Contributors: * Uwe Stieber (Wind River) - initial API and implementation. + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -16,6 +17,7 @@ import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.ISystemRegistry; @@ -30,7 +32,6 @@ import org.eclipse.rse.tests.RSETestsPlugin; import org.eclipse.rse.tests.core.RSEWaitAndDispatchUtil; import org.eclipse.rse.tests.core.connection.IRSEConnectionProperties; import org.eclipse.rse.tests.core.connection.RSEBaseConnectionTestCase; -import org.eclipse.rse.ui.RSEUIPlugin; /** * Test cases for FTP based remote host access. @@ -62,7 +63,7 @@ public class FTPFileSubsystemTestCase extends RSEBaseConnectionTestCase { public void testFTPReadAccessToRemoteHost() { if (!RSETestsPlugin.isTestCaseEnabled("FTPFileSubsystemTestCase.testFTPReadAccessToRemoteHost")) return; //$NON-NLS-1$ - ISystemRegistry systemRegistry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry(); assertNotNull("Failed to get RSE system registry instance!", systemRegistry); //$NON-NLS-1$ // Calculate the location of the test connection properties diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java index 49563cf335e..61d19b46bd8 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java @@ -8,19 +8,21 @@ * Contributors: * Tobias Schwarz (Wind River) - initial API and implementation. * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry *******************************************************************************/ package org.eclipse.rse.tests.subsystems.testsubsystem; import java.util.Vector; import org.eclipse.jface.viewers.AbstractTreeViewer; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.internal.ui.view.SystemViewPart; -import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.tests.RSETestsPlugin; import org.eclipse.rse.tests.core.IRSEViews; import org.eclipse.rse.tests.core.RSEWaitAndDispatchUtil; @@ -28,7 +30,6 @@ import org.eclipse.rse.tests.core.connection.RSEBaseConnectionTestCase; import org.eclipse.rse.tests.testsubsystem.TestSubSystemContainerNode; import org.eclipse.rse.tests.testsubsystem.TestSubSystemNode; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystem; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; @@ -104,7 +105,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { assertNotNull("No test subystem", testSubSystem); //$NON-NLS-1$ testSubSystem.removeAllChildNodes(); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.invalidateFiltersFor(testSubSystem); TestSubSystemContainerNode node = null; @@ -163,7 +164,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { assertNull("Failed to get test subsystem! Possible cause: " + cause, exception); //$NON-NLS-1$ assertNotNull("No test subystem", testSubSystem); //$NON-NLS-1$ - RSEUIPlugin.getTheSystemRegistry().invalidateFiltersFor(testSubSystem); + RSECorePlugin.getTheSystemRegistry().invalidateFiltersFor(testSubSystem); rseSystemView.refresh(testSubSystem); RSEWaitAndDispatchUtil.waitAndDispatch(1000); rseSystemView.expandToLevel(testSubSystem, AbstractTreeViewer.ALL_LEVELS); @@ -182,7 +183,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { testSubSystem.addChildNode(new TestSubSystemNode("Node 3")); //$NON-NLS-1$ testSubSystem.addChildNode(new TestSubSystemNode("Node 4")); //$NON-NLS-1$ - RSEUIPlugin.getTheSystemRegistry().invalidateFiltersFor(testSubSystem); + RSECorePlugin.getTheSystemRegistry().invalidateFiltersFor(testSubSystem); rseSystemView.refresh(testSubSystem); RSEWaitAndDispatchUtil.waitAndDispatch(1000); @@ -192,7 +193,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { node.setName("Node 1 (changed)"); //$NON-NLS-1$ - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(node, ISystemResourceChangeEvents.EVENT_REFRESH, node)); RSEWaitAndDispatchUtil.waitAndDispatch(10000);