From e8dc372b54879c368c02d202815122a88c79ea0b Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 23 Apr 2007 13:42:16 +0000 Subject: [PATCH] [168975] Move RSE Events API to Core --- .../guide/Artifacts.html | 13 +- .../guide/api/modelAPI.html | 2 +- .../guide/api/uiAPI.html | 17 +- rse/doc/org.eclipse.rse.doc.isv/options.txt | 1 + .../topics_Reference.xml | 3 +- .../DaytimeConnectorServiceManager.java | 13 +- .../daytime/subsystems/DaytimeSubSystem.java | 10 +- .../DeveloperConnectorServiceManager.java | 14 +- .../DeveloperSubSystemConfiguration.java | 5 +- .../ssh/SshConnectorServiceManager.java | 9 +- .../org.eclipse.rse.core/META-INF/MANIFEST.MF | 1 + .../ISystemModelChangeEvent.java | 14 +- .../ISystemModelChangeEvents.java | 8 +- .../ISystemModelChangeListener.java | 8 +- .../ISystemPreferenceChangeEvent.java | 25 ++- .../ISystemPreferenceChangeEvents.java | 6 +- .../ISystemPreferenceChangeListener.java | 14 +- .../events}/ISystemRemoteChangeEvent.java | 35 ++-- .../events}/ISystemRemoteChangeEvents.java | 6 +- .../events}/ISystemRemoteChangeListener.java | 16 +- .../events/ISystemResourceChangeEvent.java | 108 +++++++++++ .../events}/ISystemResourceChangeEvents.java | 8 +- .../ISystemResourceChangeListener.java | 16 +- .../core/events}/SystemRemoteChangeEvent.java | 49 ++--- .../events}/SystemResourceChangeEvent.java | 58 +----- .../rse/core/model/ISystemRegistry.java | 157 +++++++++++++++- .../core}/model/SystemEscapeCharHelper.java | 8 +- .../core}/model/SystemRemoteResourceSet.java | 11 +- .../rse/core}/model/SystemStartHere.java | 16 +- .../subsystems}/ISystemDragDropAdapter.java | 10 +- .../core}/model/SystemModelChangeEvent.java | 19 +- .../model/SystemModelChangeEventManager.java | 10 +- .../model/SystemPreferenceChangeEvent.java | 16 +- .../model/SystemPreferenceChangeManager.java | 10 +- .../model/SystemRemoteChangeEventManager.java | 25 +-- .../ui/resources/SystemTempFileListener.java | 8 +- .../SystemUniversalTempFileListener.java | 9 +- .../UniversalFileTransferUtility.java | 3 +- .../ui/actions/SystemAddToArchiveAction.java | 18 +- .../files/ui/actions/SystemCombineAction.java | 16 +- .../files/ui/actions/SystemConvertAction.java | 16 +- .../actions/SystemCopyRemoteFileAction.java | 16 +- .../files/ui/actions/SystemExtractAction.java | 18 +- .../ui/actions/SystemExtractToAction.java | 16 +- .../actions/SystemMoveRemoteFileAction.java | 12 +- .../actions/SystemUploadConflictAction.java | 8 +- .../propertypages/SystemFilePropertyPage.java | 8 +- .../ui/resources/SystemFileNameHelper.java | 6 +- ...moteFileSubSystemConfigurationAdapter.java | 6 +- .../ui/view/SystemViewRemoteFileAdapter.java | 14 +- .../SystemViewRemoteSearchResultAdapter.java | 3 +- .../SystemViewSearchResultAdapterFactory.java | 3 +- .../files/ui/wizards/SystemNewFileWizard.java | 18 +- .../ui/actions/SystemKillProcessAction.java | 14 +- .../view/SystemViewRemoteProcessAdapter.java | 6 +- .../ui/SystemRemoteCommandEntryForm.java | 12 +- .../shells/ui/view/CommandsViewPage.java | 3 +- .../ui/view/SystemCommandsViewPart.java | 16 +- .../view/SystemViewOutputAdapterFactory.java | 3 +- .../shells/ui/view/SystemCommandsView.java | 8 +- .../view/SystemViewRemoteOutputAdapter.java | 3 +- .../files/core/SystemFileAPIProviderImpl.java | 6 +- .../FileServiceSubSystemConfiguration.java | 6 +- .../core/servicesubsystem/OutputRefresh.java | 12 +- .../core/subsystems/IRemoteFileSubSystem.java | 4 +- .../RemoteFileChildrenContentsType.java | 8 +- .../core/subsystems/RemoteFileSubSystem.java | 5 +- .../RemoteFolderChildrenContentsType.java | 8 +- .../RemoteSearchResultsContentsType.java | 8 +- .../RemoteFilePropertyChangeListener.java | 12 +- .../ProcessServiceSubSystemConfiguration.java | 10 +- .../DStoreProcessSubSystemConfiguration.java | 10 +- .../LocalProcessSubSystemConfiguration.java | 8 +- .../servicesubsystem/OutputRefreshJob.java | 12 +- .../model/RemoteCommandShellOperation.java | 14 +- .../core/subsystems/RemoteCmdSubSystem.java | 20 +- .../org.eclipse.rse.ui/META-INF/MANIFEST.MF | 4 +- .../SystemClearAllPasswordsAction.java | 8 +- .../ui/actions/SystemClearPasswordAction.java | 8 +- .../ui/actions/SystemCollapseAction.java | 14 +- .../ui/actions/SystemCollapseAllAction.java | 14 +- .../ui/actions/SystemExpandAction.java | 14 +- .../SystemOpenExplorerPerspectiveAction.java | 6 +- ...referenceQualifyConnectionNamesAction.java | 8 +- .../SystemPreferenceRestoreStateAction.java | 7 +- ...SystemPreferenceShowFilterPoolsAction.java | 7 +- .../actions/SystemProfileNameCopyAction.java | 8 +- .../dialogs/SystemUpdateConnectionDialog.java | 3 +- .../RemoteSystemsPreferencePage.java | 5 +- .../SystemConnectionPropertyPage.java | 3 +- ...ystemConnectionSubSystemsPropertyPage.java | 8 +- .../ui/view/SystemDNDTransferRunnable.java | 14 +- ...stemSelectRemoteObjectAPIProviderImpl.java | 6 +- .../internal/ui/view/SystemTableTreeView.java | 41 +++-- .../internal/ui/view/SystemTableViewPart.java | 34 ++-- .../rse/internal/ui/view/SystemView.java | 171 ++++++++++-------- .../view/SystemViewAPIProviderForFilters.java | 14 +- .../ui/view/SystemViewAdapterFactory.java | 10 +- .../ui/view/SystemViewConnectionAdapter.java | 3 +- ...mViewConnectionSelectionInputProvider.java | 6 +- .../ui/view/SystemViewDataDragAdapter.java | 3 +- .../ui/view/SystemViewDataDropAdapter.java | 8 +- .../ui/view/SystemViewFilterAdapter.java | 14 +- .../SystemViewFilterReferenceAdapter.java | 13 +- .../SystemViewLabelAndContentProvider.java | 10 +- .../rse/internal/ui/view/SystemViewPart.java | 15 +- .../ui/view/SystemViewPromptableAdapter.java | 6 +- .../ui/view/SystemViewRootInputAdapter.java | 5 +- .../ui/view/SystemViewScratchpadAdapter.java | 8 +- .../ui/view/monitor/MonitorViewPage.java | 11 +- .../view/monitor/SystemMonitorViewPart.java | 29 ++- .../ui/view/scratchpad/BrowseAction.java | 10 +- .../ui/view/scratchpad/ClearAction.java | 8 +- .../view/scratchpad/ClearSelectedAction.java | 8 +- .../view/scratchpad/SystemScratchpadView.java | 34 ++-- .../scratchpad/SystemScratchpadViewPart.java | 24 ++- .../ui/view/search/SystemSearchTableView.java | 12 +- .../ui/view/search/SystemSearchViewPart.java | 17 +- .../internal/ui/view/team/SystemTeamView.java | 15 +- .../team/SystemTeamViewContentProvider.java | 10 +- .../team/SystemTeamViewInputProvider.java | 8 +- .../team/SystemTeamViewLabelProvider.java | 10 +- .../ui/view/team/SystemTeamViewPart.java | 12 +- .../team/SystemTeamViewProfileAdapter.java | 5 +- .../eclipse/rse/ui/RSESystemTypeAdapter.java | 3 +- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 28 +-- .../rse/ui/actions/SystemBaseCopyAction.java | 8 +- .../SystemPasteFromClipboardAction.java | 6 +- .../rse/ui/actions/SystemRefreshAction.java | 13 +- .../ui/actions/SystemRefreshAllAction.java | 12 +- .../AbstractSystemRemoteAdapterFactory.java | 7 +- .../ui/view/AbstractSystemViewAdapter.java | 5 +- .../ui/view/ISystemViewElementAdapter.java | 1 + .../eclipse/rse/ui/view/SystemTableView.java | 36 ++-- .../rse/ui/widgets/SystemHostCombo.java | 25 +-- .../RSEDefaultNewConnectionWizard.java | 3 +- .../rse/model/ISystemResourceChangeEvent.java | 113 ------------ .../model/SystemFilterStringContentsType.java | 50 ----- .../internal/model/SystemHostPool.java | 3 +- .../SystemNewConnectionPromptObject.java | 10 +- .../model/SystemPostableEventNotifier.java | 10 +- .../internal}/model/SystemRegistry.java | 170 +++++++++++------ .../model/SystemResourceChangeManager.java | 10 +- .../model/SystemRunnableContextWrapper.java | 6 +- .../internal/model/SystemScratchpad.java | 8 +- .../model/ISystemPromptableObject.java | 6 +- .../rse/ui/model/ISystemRegistryUI.java | 99 ++++++++++ .../model/ISystemShellProvider.java} | 24 +-- .../ui/model/SystemRemoteChangeEventUI.java | 90 +++++++++ .../model/SystemRemoteElementResourceSet.java | 6 +- .../ui/model/SystemResourceChangeEventUI.java | 102 +++++++++++ rse/plugins/org.eclipse.rse.ui/plugin.xml | 2 +- .../rse/core/subsystems/SubSystem.java | 7 +- .../subsystems/SubSystemConfiguration.java | 11 +- .../rse/core/SystemResourceListener.java | 8 +- .../ui/compile/SystemCompileManager.java | 9 +- .../SystemWorkWithCompileCommandsDialog.java | 8 +- ...temTeamViewCompileCommandPropertyPage.java | 8 +- .../ui/uda/SystemUDActionEditPane.java | 8 +- .../ui/uda/SystemUDActionSubsystem.java | 11 +- .../ui/uda/SystemUDActionTreeView.java | 5 +- .../ui/uda/SystemUDAsBaseAction.java | 8 +- .../ui/uda/SystemUDBaseTreeView.java | 5 +- .../ui/uda/SystemUDTypeEditPane.java | 8 +- .../ui/uda/SystemUDTypeTreeView.java | 5 +- .../ui/uda/SystemWorkWithUDAsDialog.java | 7 +- .../tests/internal/RSEConnectionManager.java | 10 +- .../subsystems/files/FileServiceTest.java | 3 +- .../testsubsystem/TestSubsystemTestCase.java | 11 +- 169 files changed, 1692 insertions(+), 1154 deletions(-) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemModelChangeEvent.java (68%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemModelChangeEvents.java (92%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemModelChangeListener.java (88%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemPreferenceChangeEvent.java (57%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemPreferenceChangeEvents.java (88%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/{model => events}/ISystemPreferenceChangeListener.java (73%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/ISystemRemoteChangeEvent.java (61%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/ISystemRemoteChangeEvents.java (87%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/ISystemRemoteChangeListener.java (66%) create mode 100644 rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/ISystemResourceChangeEvents.java (97%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/ISystemResourceChangeListener.java (76%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/SystemRemoteChangeEvent.java (77%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/model => org.eclipse.rse.core/src/org/eclipse/rse/core/events}/SystemResourceChangeEvent.java (70%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/SystemEscapeCharHelper.java (95%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/SystemRemoteResourceSet.java (89%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse => org.eclipse.rse.core/src/org/eclipse/rse/core}/model/SystemStartHere.java (93%) rename rse/plugins/{org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view => org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems}/ISystemDragDropAdapter.java (93%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/internal/core}/model/SystemModelChangeEvent.java (79%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/internal/core}/model/SystemModelChangeEventManager.java (85%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/internal/core}/model/SystemPreferenceChangeEvent.java (80%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/internal/core}/model/SystemPreferenceChangeManager.java (85%) rename rse/plugins/{org.eclipse.rse.ui/model/org/eclipse/rse/internal => org.eclipse.rse.core/src/org/eclipse/rse/internal/core}/model/SystemRemoteChangeEventManager.java (68%) delete mode 100644 rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java delete mode 100644 rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemHostPool.java (99%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemNewConnectionPromptObject.java (97%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemPostableEventNotifier.java (86%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui/internal}/model/SystemRegistry.java (95%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemResourceChangeManager.java (89%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemRunnableContextWrapper.java (96%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/internal/model/SystemScratchpad.java (91%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/model/ISystemPromptableObject.java (93%) create mode 100644 rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{model/ISystemRegistryUI.java => ui/model/ISystemShellProvider.java} (58%) create mode 100644 rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteChangeEventUI.java rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/{ => ui}/model/SystemRemoteElementResourceSet.java (92%) create mode 100644 rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemResourceChangeEventUI.java 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 d158ee5f024..a77762ffd15 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html @@ -201,9 +201,18 @@ be exported and imported. ISystemRegistry. This is a singleton object that you can access by calling the static method -getSystemRegistry() in the -SystemStartHere +getSystemRegistry() in the +SystemStartHere +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 +RSEUIPlugin class in the org.eclipse.rse.ui plugin.

+ \ No newline at end of file diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html index 4e762dfa0b9..a6f2407d6f2 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html @@ -11,7 +11,7 @@

RSE Model API

The front door to accessing the elements of the RSE model is the ISystemRegistry, which is a -singleton object accessible via SystemStartHere.getSystemRegistry(). +singleton object accessible via SystemStartHere.getSystemRegistry().

The system registry will get you access to profiles, connections and subsystem factories. From a subsystem configuration you can access subsystems, filter pools, 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 3131172197c..20696285410 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 @@ -117,9 +117,20 @@ together with the RSE dialog and wizard support.

Often we want to refresh the contents of the Remote Systems view or Table view from within our actions, to visualize changes to the selected resources. To do this, use the -method. +method. To get the system registry, use the -method. - +method. +

+

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 +is loaded, and therefore you need to use +ISystemRegistryUI.fireEvent() +method in that case. To get the system registry UI interface, use the +RSEUIPlugin.getTheSystemRegistry() +method. +

+ + diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt index 5498eefef14..2a11e27e4d7 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/options.txt +++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt @@ -57,6 +57,7 @@ org.eclipse.rse.connectorservice.dstore org.eclipse.rse.connectorservice.dstore.util org.eclipse.rse.core org.eclipse.rse.core.comm +org.eclipse.rse.core.events org.eclipse.rse.core.filters org.eclipse.rse.core.model org.eclipse.rse.core.references diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml index 7143bf2a614..48c679a49bf 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -30,6 +30,7 @@ + @@ -39,7 +40,6 @@ - @@ -118,6 +118,7 @@ + diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java index 1d9edb8cfa5..5c3ae872796 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc. + * 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 @@ -46,21 +46,24 @@ public class DaytimeConnectorServiceManager extends AbstractConnectorServiceMana return fInstance; } - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost) + /* + * (non-Javadoc) + * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.core.model.IHost) */ public IConnectorService createConnectorService(IHost host) { return new DaytimeConnectorService(host); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem) */ public boolean sharesSystem(ISubSystem otherSubSystem) { return (otherSubSystem instanceof IDaytimeSubSystem); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem) */ public Class getSubSystemCommonInterface(ISubSystem subsystem) { 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 11c27db6894..954629b7231 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. + * Copyright (c) 2006, 2007 Wind River Systems, Inc. * 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 @@ -14,6 +14,8 @@ package org.eclipse.rse.examples.daytime.subsystems; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.widgets.Display; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.SystemMessageObject; @@ -23,12 +25,10 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.examples.daytime.model.DaytimeResource; import org.eclipse.rse.examples.daytime.service.IDaytimeService; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.model.ISystemRegistryUI; /** * This is our subsystem, which manages the remote connection and resources for @@ -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 SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + final ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); 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.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java index 5c61f70eed0..2c84d46238e 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.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 @@ -50,16 +50,17 @@ public class DeveloperConnectorServiceManager extends return inst; } - - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost) + /* + * (non-Javadoc) + * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.core.model.IHost) */ public IConnectorService createConnectorService(IHost host) { return new DeveloperConnectorService(host); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem) */ public boolean sharesSystem(ISubSystem otherSubSystem) @@ -67,7 +68,8 @@ public class DeveloperConnectorServiceManager extends return (otherSubSystem instanceof IDeveloperSubSystem); } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem) */ public Class getSubSystemCommonInterface(ISubSystem subsystem) diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java index 0f73ef14b77..9b1fb549a84 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java @@ -49,8 +49,9 @@ public class DeveloperSubSystemConfiguration extends SubSystemConfiguration { return new DeveloperSubSystem(conn, getConnectorService(conn)); } - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost) + /* + * (non-Javadoc) + * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost) */ public IConnectorService getConnectorService(IHost host) { return DeveloperConnectorServiceManager.getTheDeveloperConnectorServiceManager() diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java index ab0d87b40e0..4da2bab7df2 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java @@ -49,10 +49,11 @@ public class SshConnectorServiceManager extends AbstractConnectorServiceManager return fInstance; } - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost) - */ - public IConnectorService createConnectorService(IHost host) { + /* + * (non-Javadoc) + * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.core.model.IHost) + */ + public IConnectorService createConnectorService(IHost host) { IConnectorService service = new SshConnectorService(host); return service; } diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index 14e05879f44..caf3c6c2f6b 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services Eclipse-LazyStart: true Export-Package: org.eclipse.rse.core, + org.eclipse.rse.core.events, org.eclipse.rse.core.filters, org.eclipse.rse.core.model, org.eclipse.rse.core.references, diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java similarity index 68% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java index 26035a9bc17..289703060b3 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.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,10 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; /** * A change event passed to you when listening for RSE model changes. @@ -22,14 +22,14 @@ package org.eclipse.rse.core.model; */ public interface ISystemModelChangeEvent { /** - * Get the event type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. - * @see org.eclipse.rse.core.model.ISystemModelChangeEvents + * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. + * @see org.eclipse.rse.core.events.ISystemModelChangeEvents */ public int getEventType(); /** - * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. - * @see org.eclipse.rse.core.model.ISystemModelChangeEvents + * Get the resource type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. + * @see org.eclipse.rse.core.events.ISystemModelChangeEvents */ public int getResourceType(); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java similarity index 92% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java index 373fbbdcdf7..60baff8cf67 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.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) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; /** * The event IDs sent when local resources in the RSE model change. * You should monitor for these events in your view if you display any of the resource types listed here. *

- * To monitor, implement interface {@link org.eclipse.rse.core.model.ISystemModelChangeListener} and + * To monitor, implement interface {@link org.eclipse.rse.core.events.ISystemModelChangeListener} and * call {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)} * and in your dispose method, call {@link org.eclipse.rse.core.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}. *

diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java similarity index 88% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java index 4ee77f474d1..f998c4658eb 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.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) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; /** * Interface that listeners interesting in changes to local resources in the RSE model * implement, and subsequently register their interest, via SystemRegistry. *

- * If you list any of the resource types defined in {@link org.eclipse.rse.core.model.ISystemModelChangeEvents} + * If you list any of the resource types defined in {@link org.eclipse.rse.core.events.ISystemModelChangeEvents} * you should monitor by implementing this interface, and registering with the * system registry via {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}. * In your view's dispose method, you must also de-register by calling diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java similarity index 57% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java index a166b95a841..f3bf66746d8 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.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,37 +11,42 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; /** * Interface of event sent when a remote system preference changes. - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents */ public interface ISystemPreferenceChangeEvent { /** * Returns the type of the event. - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents - * @return a type that is one of the constants in this interface + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents + * @return a type that is one of the constants in ISystemPreferenceChangeEvents. */ public int getType(); /** - * Set the type - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * Set the type of the event. + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents + * @param type the type of the event. */ public void setType(int type); /** - * Get the old value. For boolean will be a Boolean object + * Get the old value of the Preference. + * For boolean will be a Boolean object. + * @return the old value of the Preference. */ public Object getOldValue(); /** - * Get the new value. For boolean will be a Boolean object + * Get the new value of the Preference. + * For boolean will be a Boolean object. + * @return the new value of the Preference. */ public Object getNewValue(); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java similarity index 88% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java index 4226b78199c..d67bb212a17 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.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,10 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; /** * Interface of event ID constants for preferences changed diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java similarity index 73% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java index 3528e3977a9..e2fe428c84c 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.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,23 +11,25 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.core.events; import java.util.EventListener; /** * Interface that listeners interesting in changes to remote * system preferences can implement and subsequently register - * their interest in via SystemRegistry. + * their interest in with the ISystemRegistry. */ public interface ISystemPreferenceChangeListener extends EventListener { + /** - * This is the method in your class that will be called when a - * system resource changes. + * This method will be called when a Preference changes. + * TODO document on which thread the event will be sent. * @see ISystemPreferenceChangeEvent + * @param event the event being sent. */ public void systemPreferenceChanged(ISystemPreferenceChangeEvent event); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java similarity index 61% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java index 2af19fc4c23..26411134e1c 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.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,12 +11,11 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -27,38 +26,42 @@ import org.eclipse.rse.core.subsystems.ISubSystem; public interface ISystemRemoteChangeEvent { /** - * Get the event type, such as {@link org.eclipse.rse.model.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvents + * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents + * @return the event type. */ public int getEventType(); /** * Get the resource that this event applies to. * It must either be the binary object of the resource, or the absolute name of the resource. + * @return the resource that this event applies to. */ public Object getResource(); + /** * Get the parent remote object for the affected remote object. This is not always known, - * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent + * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent + * @return the parent remote object of the affected resource, + * or null if not applicable. */ public Object getResourceParent(); /** - * Get the old name of the resource, in the event of a resource rename. Null for other event types. + * Get the old name of the resource, in the event of a resource rename. + * Null for other event types. + * @return the old name of the resource in case of a rename event, + * or null if not applicable. */ public String getOldName(); /** * Get the subsystem in which this resource resides. - * This allows the search for impacts to be limited to subsystems of the same parent factory, and to connections - * with the same hostname as the subsystem's connection. + * This allows the search for impacts to be limited to subsystems + * of the same parent factory, and to connections with the same + * hostname as the subsystem's connection. + * @return the subsystem in which this resource resides. */ public ISubSystem getSubSystem(); - /** - * Get the originating viewer from which this remote resource change event comes from. The combination of this, - * if non-null, plus the selected parent, allows viewers to decide whether to update the selection within the - * parent resource, after refreshing that resource. - */ - public Viewer getOriginatingViewer(); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java similarity index 87% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvents.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java index 3132ba51f12..f17b4b9ce35 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.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,10 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; /** * The event IDs sent when remote resources in the model change diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java similarity index 66% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeListener.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java index bf26b41d46c..e96e721e618 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRemoteChangeListener.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.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,21 +11,23 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; + /** * Interface that listeners interesting in changes to remote resources - * implement, and subsequently register their interest, in via SystemRegistry. + * implement, and subsequently register their interest, in via SystemRegistry. */ public interface ISystemRemoteChangeListener { /** - * This is the method in your class that will be called when a remote resource - * changes. You will be called after the resource is changed. - * @see ISystemRemoteChangeEvent + * This method will be called when a remote resource changes. + * You will be called after the resource is changed. + * TODO document on which thread the event will be sent. + * @param event the event. */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java new file mode 100644 index 00000000000..b0fbac733d8 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java @@ -0,0 +1,108 @@ +/******************************************************************************** + * 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 + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. + * + * Contributors: + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core +s ********************************************************************************/ + +package org.eclipse.rse.core.events; + +/** + * Interface of event sent when a remote system resource changes. + * + * These events are mainly for internal use. BPs/ISVs should instead + * fire and monitor for {@link org.eclipse.rse.core.events.ISystemModelChangeEvent}. + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + */ +public interface ISystemResourceChangeEvent +{ + /** + * Returns an object identifying the source of this event. + * @see java.util.EventObject + * + * @return an object identifying the source of this event + */ + public Object getSource(); + + /** + * For multi-target events, return the array of source targets. + * @return array of source objects. + */ + public Object[] getMultiSource(); + + /** + * Returns the parent of the object source. + * Only quaranteed to be set for additions and deletions. + * + * @return an object identifying the parent of the source of this event, + * or null if not applicable. + */ + public Object getParent(); + + /** + * Set the parent object of this event. + * @param parent the parent object. + */ + public void setParent(Object parent); + + /** + * Returns the grandparent of the object source. + * Only quaranteed to be set for special case events, which have a + * special contract with the SystemView. + * + * @return an object identifying the grandparent of the source of this event + */ + public Object getGrandParent(); + + /** + * Return the position value for adding a new item. + * Used in ADD events. A negative number indicates an append operation. + * + * @return position to add the new item to. + */ + public int getPosition(); + + /** + * Set the position value for adding a new item. + * Used in ADD events. A negative number indicates an append operation. + * + * @param position zero-based position to insert the new item. + */ + public void setPosition(int position); + + /** + * For relative add events, return the previous node this is being added after. + * @return the previous node for adding a new node after. + */ + public Object getRelativePrevious(); + + /** + * For relative add events, set the previous node this is being added after. + * @param previousObject the object after which to add the new object. + */ + public void setRelativePrevious(Object previousObject); + + /** + * Returns the type of the event. + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + * @return a type that is one of the constants in ISystemResourceChangeEvents. + */ + public int getType(); + + /** + * Set the type of this event + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + * @param type a type that is one of the constants in ISystemResourceChangeEvents. + */ + public void setType(int type); + +} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvents.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java index 552563a84ff..2a76b0a0c9c 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.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,12 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; - - +package org.eclipse.rse.core.events; /** * Interface of event ID constants diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java similarity index 76% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeListener.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java index 2634701d2cd..84777e2b5a0 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeListener.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.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,14 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; import java.util.EventListener; -import org.eclipse.swt.widgets.Shell; - /** * Interface that listeners interesting in changes to remote * system connections and subsystems can listen implement and @@ -28,13 +26,9 @@ public interface ISystemResourceChangeListener extends EventListener { /** * This is the method in your class that will be called when a - * system resource changes. + * system resource changes. * @see ISystemResourceChangeEvent */ public void systemResourceChanged(ISystemResourceChangeEvent event); - /** - * This is the method in your class that will be called to return the - * shell for your viewer - */ - public Shell getShell(); + } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java similarity index 77% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java index 74a4e49adcb..a1e27cedc43 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.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,31 +11,28 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.subsystems.ISubSystem; - /** * For listeners interested in changes with remote resources. * These events are designed to state what the change to the resource was, not to - * optimize those events for a GUI (eg, a delete event versus a refresh event) + * optimize those events for a GUI (eg, a delete event versus a refresh event) */ -public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISystemRemoteChangeEvents +public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent { private int eventType; private Object resource, parent; private String oldName; private ISubSystem subsystem; - private Viewer originatingViewer; /** * Constructor for non-rename event - * @param eventType - one of the constants from {@link org.eclipse.rse.model.ISystemRemoteChangeEvents} + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be @@ -49,9 +46,10 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste this.parent = resourceParent; this.subsystem = subsystem; } + /** * Constructor for a rename event. - * @param eventType - one of the constants from {@link org.eclipse.rse.model.ISystemRemoteChangeEvents} + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be @@ -63,6 +61,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste this(eventType, resource, resourceParent, subsystem); this.oldName = oldName; } + /** * Constructor you shouldn't use unless you intend to call the setters */ @@ -77,6 +76,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { this.eventType = eventType; } + /** * Reset the resource */ @@ -84,6 +84,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { this.resource = resource; } + /** * Reset the resource's remote resource parent */ @@ -99,6 +100,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { this.subsystem = subsystem; } + /** * Reset the old name on a rename event */ @@ -108,23 +110,14 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste } /** - * Set the originating viewer. Only this viewer is candidate for updating the selection. Eg, on a - * create event, if this and the resource parent is set, the newly created object is selected after - * the parent's contents are refreshed, for the originating viewer. - */ - public void setOriginatingViewer(Viewer originatingViewer) - { - this.originatingViewer = originatingViewer; - } - - /** - * Get the event type, such as {@link org.eclipse.rse.model.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvents + * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}. + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents */ public int getEventType() { return eventType; } + /** * Get the resource that this event applies to * It must either be the binary object of the resource, or the absolute name of the resource. @@ -133,6 +126,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { return resource; } + /** * Get the parent remote object for the affected remote object. This is not always known, * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent @@ -141,6 +135,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { return parent; } + /** * Get the subsystem in which this resource resides. * This allows the search for impacts to be limited to subsystems of the same parent factory, and to connections @@ -150,6 +145,7 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste { return subsystem; } + /** * Get the old name of the resource, in the event of a resource rename. Null for other event types. */ @@ -158,13 +154,4 @@ public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent, ISyste return oldName; } - /** - * Get the originating viewer from which this remote resource change event comes from. The combination of this, - * if non-null, plus the resource parent, allows viewers to decide whether to update the selection within the - * parent resource, after refreshing that resource. - */ - public Viewer getOriginatingViewer() - { - return originatingViewer; - } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java similarity index 70% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java index c928d98e5c5..24cef06c24d 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemResourceChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.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,20 +11,16 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.events; import java.util.EventObject; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Item; - - /** * Event object sent to SystemResourceChangeListeners when a * remote system object is created, changed, removed, etc. - * @see org.eclipse.rse.model.ISystemResourceChangeEvents + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents */ public class SystemResourceChangeEvent extends EventObject @@ -33,14 +29,12 @@ public class SystemResourceChangeEvent private static final long serialVersionUID = 1; private Object parent,grandparent, prevObj; private Object[] multiSource; - private Viewer originatingViewer; private int type; private int position = -1; - private Item item; /** * Constructor for SystemResourceChangeEvent. - * @see org.eclipse.rse.model.ISystemResourceChangeEvents + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents * @param source The object that was added,deleted,renamed,changed. * @param type The type of event, one of ISystemChangeEvent constants. * @param parent The parent of the object that was added or deleted. @@ -53,7 +47,7 @@ public class SystemResourceChangeEvent } /** * Constructor for SystemResourceChangeEvent when the source is multipe resources. - * @see org.eclipse.rse.model.ISystemResourceChangeEvents + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents * @param source The array of objects that were added,deleted,renamed,changed. * @param type The type of event, one of ISystemChangeEvent constants. * @param parent The parent of the object that was added or deleted. @@ -121,21 +115,12 @@ public class SystemResourceChangeEvent { this.position = position; } - /** - * Set the viewer Item of the currently selected object. This is a clue when we want to - * expand and select only the specific instance of this widget in this view. - */ - public void setViewerItem(Item item) - { - this.item = item; - } - /** * Return the type of the event (add, change, remove, rename, change, property change). - * @see org.eclipse.rse.model.ISystemResourceChangeEvents - * @see org.eclipse.rse.model.ISystemResourceChangeEvent - * @see org.eclipse.rse.model.ISystemResourceChangeEvent#getType() + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent#getType() */ public int getType() { @@ -143,7 +128,7 @@ public class SystemResourceChangeEvent } /** * Set the type - * @see org.eclipse.rse.model.ISystemResourceChangeEvents + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents */ public void setType(int type) { @@ -165,27 +150,4 @@ public class SystemResourceChangeEvent this.prevObj = previousObject; } - /** - * Set the originating viewer. For some events, this allows responding viewers to decide if the event applies to them - */ - public void setOriginatingViewer(Viewer viewer) - { - this.originatingViewer = viewer; - } - /** - * Get the originating viewer. For some events, this allows responding viewers to decide if the event applies to them - */ - public Viewer getOriginatingViewer() - { - return originatingViewer; - } - /** - * Get the viewer Item of the currently selected object. This is a clue when we want to - * expand and select only the specific instance of this widget in this view. - */ - public Item getViewerItem() - { - return item; - } - } \ No newline at end of file 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 48f497e0a5c..7535793ff2c 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2007 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 @@ -22,6 +22,14 @@ import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.events.ISystemModelChangeEvent; +import org.eclipse.rse.core.events.ISystemModelChangeListener; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeListener; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.rse.core.filters.ISystemFilterStartHere; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -128,6 +136,26 @@ public interface ISystemRegistry extends ISchedulingRule { */ public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(String systemType, boolean filterDuplicateServiceSubSystemFactories); + // ---------------------------------- + // SYSTEMVIEWINPUTPROVIDER METHODS... + // ---------------------------------- + + /** + * This method is called by the connection adapter when the user expands + * a connection. + * This method must return the child objects to show for that connection. + */ + public Object[] getConnectionChildren(IHost selectedConnection); + + /** + * This method is called by the connection adapter when deciding + * to show a plus-sign or not beside a connection. + * + * @return true if this connection has children to be shown. + */ + public boolean hasConnectionChildren(IHost selectedConnection); + + // ---------------------------- // USER PREFERENCE METHODS... // ---------------------------- @@ -676,6 +704,131 @@ public interface ISystemRegistry extends ISchedulingRule { */ public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected, boolean collapseTree); + // ---------------------------- + // RESOURCE EVENT METHODS... + // ---------------------------- + + /** + * Register your interest in being told when a system resource such as a connection is changed. + */ + public void addSystemResourceChangeListener(ISystemResourceChangeListener l); + + /** + * De-Register your interest in being told when a system resource such as a connection is changed. + */ + public void removeSystemResourceChangeListener(ISystemResourceChangeListener l); + + /** + * Query if the ISystemResourceChangeListener is already listening for SystemResourceChange events + */ + public boolean isRegisteredSystemResourceChangeListener(ISystemResourceChangeListener l); + + /** + * 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. + */ + public void fireEvent(ISystemResourceChangeEvent event); + + /** + * Notify a specific listener of a change to a system resource such as a connection. + */ + public void fireEvent(ISystemResourceChangeListener l, ISystemResourceChangeEvent event); + + // ---------------------------- + // MODEL RESOURCE EVENT METHODS... + // ---------------------------- + + /** + * Register your interest in being told when an RSE model resource is changed. + * These are model events, not GUI-optimized events. + */ + public void addSystemModelChangeListener(ISystemModelChangeListener l); + + /** + * De-Register your interest in being told when an RSE model resource is changed. + */ + public void removeSystemModelChangeListener(ISystemModelChangeListener l); + + /** + * Notify all listeners of a change to a system model resource such as a connection. + * You would not normally call this as the methods in this class call it when appropriate. + */ + public void fireEvent(ISystemModelChangeEvent event); + + /** + * Notify all listeners of a change to a system model resource such as a connection. + * This one takes the information needed and creates the event for you. + */ + public void fireModelChangeEvent(int eventType, int resourceType, Object resource, String oldName); + + /** + * Notify a specific listener of a change to a system model resource such as a connection. + */ + public void fireEvent(ISystemModelChangeListener l, ISystemModelChangeEvent event); + + // -------------------------------- + // REMOTE RESOURCE EVENT METHODS... + // -------------------------------- + + /** + * Register your interest in being told when a remote resource is changed. + * These are model events, not GUI-optimized events. + */ + public void addSystemRemoteChangeListener(ISystemRemoteChangeListener l); + + /** + * De-Register your interest in being told when a remote resource is changed. + */ + public void removeSystemRemoteChangeListener(ISystemRemoteChangeListener l); + + /** + * Notify all listeners of a change to a remote resource such as a file. + * You would not normally call this as the methods in this class call it when appropriate. + */ + public void fireEvent(ISystemRemoteChangeEvent event); + + /** + * Notify all listeners of a change to a remote resource such as a file. + * This one takes the information needed and creates the event for you. + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} + * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter + * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. + * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be + * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. + * @param oldName - on a rename operation, this is the absolute name of the resource prior to the rename + */ + public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String oldName); + + /** + * Notify a specific listener of a change to a remote resource such as a file. + */ + public void fireEvent(ISystemRemoteChangeListener l, ISystemRemoteChangeEvent event); + + // ---------------------------- + // PREFERENCE EVENT METHODS... + // ---------------------------- + + /** + * Register your interest in being told when a system preference changes + */ + public void addSystemPreferenceChangeListener(ISystemPreferenceChangeListener l); + + /** + * De-Register your interest in being told when a system preference changes + */ + public void removeSystemPreferenceChangeListener(ISystemPreferenceChangeListener l); + + /** + * Notify all listeners of a change to a system preference + * You would not normally call this as the methods in this class call it when appropriate. + */ + public void fireEvent(ISystemPreferenceChangeEvent event); + + /** + * Notify a specific listener of a change to a system preference + */ + public void fireEvent(ISystemPreferenceChangeListener l, ISystemPreferenceChangeEvent event); + // ---------------------------- // MISCELLANEOUS METHODS... // ---------------------------- @@ -735,4 +888,4 @@ public interface ISystemRegistry extends ISchedulingRule { * @return true if restored ok, false if error encountered. If false, call getLastException(). */ public boolean restore(); -} //SystemRegistry \ No newline at end of file +} diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java index a75b7f45f8a..ae75d02baab 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.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,20 +11,18 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; public class SystemEscapeCharHelper { - private static char ESCAPE_CHAR = '#'; private char changedChars[]; private int escapeStringLength; - /** * Constructor. * @param chars array of chars to be escaped. diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java similarity index 89% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java index 3cff4f66fd6..f313d97b19b 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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,15 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; import java.util.List; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.rse.core.model.AbstractSystemResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; public class SystemRemoteResourceSet extends AbstractSystemResourceSet @@ -28,8 +27,6 @@ public class SystemRemoteResourceSet extends AbstractSystemResourceSet private ISubSystem _subSystem; private ISystemDragDropAdapter _adapter; - - public SystemRemoteResourceSet(ISubSystem subSystem) { super(); diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java index 7d1b583ecae..3c1a0ab3dea 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.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,18 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.core.model.ISystemProfileManager; -import org.eclipse.rse.core.model.ISystemRegistry; +package org.eclipse.rse.core.model; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.core.model.SystemProfileManager; -import org.eclipse.rse.ui.RSEUIPlugin; /** @@ -33,11 +29,11 @@ public class SystemStartHere /** * STEP 1. Get system registry singleton *

- * SAME AS: RSEUIPlugin.getTheSystemRegistry + * SAME AS: RSECorePlugin.getSystemRegistry */ public static ISystemRegistry getSystemRegistry() { - return RSEUIPlugin.getTheSystemRegistry(); + return RSECorePlugin.getDefault().getSystemRegistry(); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISystemDragDropAdapter.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISystemDragDropAdapter.java index 2cee8a87b12..7cd562ea919 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISystemDragDropAdapter.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,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.core.subsystems; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.core.model.ISystemResourceSet; -import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier; -import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.model.SystemRemoteResourceSet; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; public interface ISystemDragDropAdapter extends IRemoteObjectIdentifier { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEvent.java similarity index 79% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEvent.java index e751e26ec34..8379dc132fd 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEvent.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,20 +11,19 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.internal.core.model; -import org.eclipse.rse.core.model.ISystemModelChangeEvent; -import org.eclipse.rse.core.model.ISystemModelChangeEvents; +import org.eclipse.rse.core.events.ISystemModelChangeEvent; /** * For listeners interested in model changes with resources in the rse project. * These events are designed to state what the change the resource was, not to * optimize those events for a GUI (eg, a delete event versus a refresh event) */ -public class SystemModelChangeEvent implements ISystemModelChangeEvent, ISystemModelChangeEvents +public class SystemModelChangeEvent implements ISystemModelChangeEvent { private int eventType, resourceType; private Object resource; @@ -85,16 +84,16 @@ public class SystemModelChangeEvent implements ISystemModelChangeEvent, ISystemM } /** - * Get the event type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. - * @see org.eclipse.rse.core.model.ISystemModelChangeEvents + * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. + * @see org.eclipse.rse.core.events.ISystemModelChangeEvents */ public int getEventType() { return eventType; } /** - * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. - * @see org.eclipse.rse.core.model.ISystemModelChangeEvents + * Get the resource type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. + * @see org.eclipse.rse.core.events.ISystemModelChangeEvents */ public int getResourceType() { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEventManager.java similarity index 85% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEventManager.java index bdac23e4077..a827202af83 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemModelChangeEventManager.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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.internal.core.model; import java.util.Vector; -import org.eclipse.rse.core.model.ISystemModelChangeEvent; -import org.eclipse.rse.core.model.ISystemModelChangeListener; +import org.eclipse.rse.core.events.ISystemModelChangeEvent; +import org.eclipse.rse.core.events.ISystemModelChangeListener; /** diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeEvent.java similarity index 80% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeEvent.java index cf77db246db..9cdd736e65c 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeEvent.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,19 +11,19 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.internal.core.model; import java.util.EventObject; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; /** * Event object sent to ISystemPreferenceChangeListeners when a * remote system preference is changed. - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents */ public class SystemPreferenceChangeEvent extends EventObject @@ -35,7 +35,7 @@ public class SystemPreferenceChangeEvent /** * Constructor - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents * @param source The object that was added,deleted,renamed,changed. * @param type The type of event, one of ISystemChangeEvent constants. * @param parent The parent of the object that was added or deleted. @@ -50,7 +50,7 @@ public class SystemPreferenceChangeEvent /** * Return the type of the event - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents */ public int getType() { @@ -73,7 +73,7 @@ public class SystemPreferenceChangeEvent /** * Set the type - * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents + * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents */ public void setType(int type) { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeManager.java similarity index 85% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeManager.java index a039f48f5d8..20d8bc32d22 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemPreferenceChangeManager.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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.internal.core.model; import java.util.Vector; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent; -import org.eclipse.rse.core.model.ISystemPreferenceChangeListener; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeListener; /** diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRemoteChangeEventManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRemoteChangeEventManager.java similarity index 68% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRemoteChangeEventManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRemoteChangeEventManager.java index a9cc1a718f6..c78cafa7788 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRemoteChangeEventManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRemoteChangeEventManager.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,15 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.internal.core.model; import java.util.Vector; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeListener; - +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; /** * Manages the list of registered remote resource change listeners. @@ -36,8 +35,9 @@ public class SystemRemoteChangeEventManager } /** - * Add a listener to list of listeners. If this object is already in - * the list, this does nothing. + * Add a listener to list of listeners. + * If this object is already in the list, this does nothing. + * @param l the new listener to add. */ public void addSystemRemoteChangeListener(ISystemRemoteChangeListener l) { @@ -46,8 +46,9 @@ public class SystemRemoteChangeEventManager } /** - * Remove a listener to list of listeners. If this object is not in - * the list, this does nothing. + * Remove a listener to list of listeners. + * If this object is not in the list, this does nothing. + * @param l the listener to remove. */ public void removeSystemRemoteChangeListener(ISystemRemoteChangeListener l) { @@ -56,7 +57,9 @@ public class SystemRemoteChangeEventManager } /** - * Notify all registered listeners of the given event + * Notify all registered listeners of the given event. + * TODO document on which thread the event is being sent. + * @param event the event to send. */ public void notify(ISystemRemoteChangeEvent event) { 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 69e0f7a0c24..768b7eb63c9 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -32,15 +33,14 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; 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.filters.ISystemFilterReference; 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.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -589,7 +589,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener protected void refreshRemoteResource(Object parent) { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); // refresh if (parent != 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 0b11ffe0ee7..2889bcbf649 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -20,12 +21,12 @@ import java.util.ArrayList; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; 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.subsystems.ISubSystem; import org.eclipse.rse.internal.files.ui.actions.SystemUploadConflictAction; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +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; @@ -261,7 +262,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener IRemoteFile parent = remoteFile.getParentRemoteFile(); - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); // refresh if (parent != null) { 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 ae993967096..12092cc227e 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 @@ -13,6 +13,7 @@ * Contributors: * Michael Scharf (Wind River) - Fix 163844: InvalidThreadAccess in checkForCollision * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -45,13 +46,13 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.files.ui.Activator; import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.services.clientserver.SystemEncodingUtil; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler; 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 2d8fa39283b..ea6f54f0d6c 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -27,13 +27,14 @@ 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.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.files.ui.dialogs.AddToArchiveDialog; import org.eclipse.rse.internal.files.ui.FileResources; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -44,7 +45,6 @@ import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.swt.widgets.Shell; @@ -158,8 +158,8 @@ public class SystemAddToArchiveAction extends SystemBaseAction IRemoteFile selection = (IRemoteFile) _selected.get(i); addToArchive(selection, destinationArchive, saveFullPathInfo, relativeTo); } - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); - registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destinationArchive, destinationArchive.getParentPath(), destSS, null, null); + ISystemRegistry registry = RSEUIPlugin.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; } 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 be3e6f73973..485a6f178ce 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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,17 +11,17 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.operation.IRunnableContext; +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.files.ui.dialogs.CombineDialog; import org.eclipse.rse.internal.files.ui.FileResources; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +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; @@ -156,8 +156,8 @@ public class SystemCombineAction extends SystemExtractToAction { { } } - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); - registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null); + ISystemRegistry registry = RSEUIPlugin.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 ad604645d54..44b70c49108 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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,17 +11,17 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.jface.operation.IRunnableContext; +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.files.ui.dialogs.CombineDialog; import org.eclipse.rse.internal.files.ui.FileResources; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +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; @@ -166,8 +166,8 @@ public class SystemConvertAction extends SystemExtractToAction { catch (java.lang.InterruptedException e) { } - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); - registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null); + ISystemRegistry registry = RSEUIPlugin.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 3fedee744b7..016265ffdff 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -24,6 +24,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; @@ -35,7 +36,6 @@ import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemView; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.services.clientserver.SystemEncodingUtil; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -489,18 +489,18 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction if (parent instanceof IRemoteFile) // refresh parent in all views... sr.fireEvent( - new org.eclipse.rse.model.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.SystemResourceChangeEvent( parent,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, null) ); else // refresh parent in all views... sr.fireEvent( - new org.eclipse.rse.model.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.SystemResourceChangeEvent( parent,ISystemResourceChangeEvent.EVENT_REFRESH, null) ); // select new files in this view only sr.fireEvent((ISystemResourceChangeListener)v, - new org.eclipse.rse.model.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.SystemResourceChangeEvent( copiedFiles,ISystemResourceChangeEvent.EVENT_SELECT_REMOTE, targetFolder) ); } @@ -509,8 +509,8 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction else { // refresh target folder in all views, but only select new files in this view... - org.eclipse.rse.model.SystemResourceChangeEvent event = - new org.eclipse.rse.model.SystemResourceChangeEvent( + org.eclipse.rse.ui.model.SystemResourceChangeEvent event = + new org.eclipse.rse.ui.model.SystemResourceChangeEvent( targetFolder,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, copiedFiles); event.setOriginatingViewer(getViewer()); sr.fireEvent(event); 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 83a53d722c1..440ae9059c8 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -26,11 +26,12 @@ 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.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.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; 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; @@ -40,7 +41,6 @@ import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.swt.widgets.Shell; @@ -119,8 +119,8 @@ public class SystemExtractAction extends SystemBaseAction } // always refresh - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); - registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null, null); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null); registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destinationParent)); } } 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 b0c2c96bf78..731e7d40394 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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,19 +11,19 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ 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.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.dialogs.ExtractToDialog; import org.eclipse.rse.internal.files.ui.FileResources; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; 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; @@ -149,8 +149,8 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid { } // always refresh - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); - registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null); + ISystemRegistry registry = RSEUIPlugin.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 df6bdf30b24..5913366006b 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; 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; @@ -172,7 +172,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction { //System.out.println("Firing REFRESH_REMOTE"); sr.fireEvent( - new org.eclipse.rse.model.impl.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.impl.SystemResourceChangeEvent( parent,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, null) ); } else @@ -180,11 +180,11 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction //System.out.println("MOVE OPERATION: Firing REFRESH"); // FIRST REFRESH EXPANDED FILTER sr.fireEvent( - new org.eclipse.rse.model.impl.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.impl.SystemResourceChangeEvent( parent,ISystemResourceChangeEvent.EVENT_REFRESH, null) ); // NEXT REFRESH ALL OTHER PLACES THAT MIGHT BE SHOWING THE SOURCE FOLDER sr.fireEvent( - new org.eclipse.rse.model.impl.SystemResourceChangeEvent( + new org.eclipse.rse.ui.model.impl.SystemResourceChangeEvent( firstSelectionParent,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, 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 3793d5e093e..37aefaa8180 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.actions; @@ -23,6 +23,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; 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.subsystems.SubSystem; import org.eclipse.rse.core.subsystems.SubSystem.SystemMessageDialogRunnable; import org.eclipse.rse.files.ui.dialogs.ISaveAsDialog; @@ -31,8 +33,6 @@ import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.SystemEncodingUtil; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; 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 d4282ecefc1..8769ee90ae9 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.propertypages; @@ -23,8 +23,8 @@ import java.util.Date; import java.util.List; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; -import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -451,7 +451,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage { getRemoteFile().getParentRemoteFileSubSystem().setReadOnly(new NullProgressMonitor(), getRemoteFile(), readOnlySelected); RSEUIPlugin.getTheSystemRegistry().fireEvent( - new org.eclipse.rse.model.SystemResourceChangeEvent( + 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/SystemFileNameHelper.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.java index cbc6bab5840..b5b06c5b29c 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.resources; import java.io.File; -import org.eclipse.rse.model.SystemEscapeCharHelper; +import org.eclipse.rse.core.model.SystemEscapeCharHelper; /** 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 a2803fab2f5..4b79eb8f0fa 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 @@ -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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; @@ -38,11 +38,11 @@ import org.eclipse.rse.internal.files.ui.actions.SystemNewFolderAction; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.files.ui.wizards.SystemFileNewConnectionWizardPage; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; -import org.eclipse.rse.model.ISystemRegistryUI; 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; 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 dbfea64072e..b8f892ed129 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; @@ -41,6 +42,8 @@ import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; 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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.SystemFilterReference; @@ -50,8 +53,10 @@ import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemResourceSet; import org.eclipse.rse.core.model.SystemMessageObject; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; @@ -79,11 +84,6 @@ import org.eclipse.rse.internal.ui.view.ISystemMementoConstants; import org.eclipse.rse.internal.ui.view.SystemDNDTransferRunnable; import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.internal.ui.view.search.SystemSearchTableView; -import org.eclipse.rse.model.ISystemRegistryUI; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemRemoteResourceSet; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.PathUtility; import org.eclipse.rse.services.clientserver.StringCompare; import org.eclipse.rse.services.clientserver.SystemEncodingUtil; @@ -118,11 +118,11 @@ 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; import org.eclipse.rse.ui.view.IContextObject; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; @@ -2506,7 +2506,7 @@ public class SystemViewRemoteFileAdapter boolean ok = true; IRemoteFile file = (IRemoteFile) element; IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem(); - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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 58ec96447ed..342f5ff379a 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180562] dont implement ISystemOutputRemoteTypes + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; @@ -27,6 +28,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.internal.files.ui.FileResources; @@ -41,7 +43,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewSearchResultAdapterFactory.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewSearchResultAdapterFactory.java index efba2bdf249..31211ec6d53 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewSearchResultAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewSearchResultAdapterFactory.java @@ -12,14 +12,15 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180519][api] declaratively register adapter factories + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.view; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.services.search.IHostSearchResult; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.ui.IActionFilter; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizard.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizard.java index e0ccee09b60..26835dc0f6e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizard.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizard.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,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.files.ui.wizards; @@ -20,15 +20,14 @@ import java.util.Vector; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.files.ui.FileResources; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -43,6 +42,7 @@ import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.view.ISystemTree; import org.eclipse.rse.ui.wizards.AbstractSystemWizard; @@ -279,7 +279,7 @@ public class SystemNewFileWizard protected static void updateGUI(IRemoteFile parentFolder, IRemoteFile newFileOrFolder, Viewer viewer, boolean isInputAFilter, ISystemFilterReference selectedFilterRef) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); if (selectedFilterRef != null) { selectedFilterRef.markStale(true); @@ -287,7 +287,7 @@ public class SystemNewFileWizard // invalidate filters that reference this object // TODO: we shouldn't have to do this. Presumably step 0 below should take care of it. - SystemRegistry.getSystemRegistry().invalidateFiltersFor(newFileOrFolder, parentFolder.getParentRemoteFileSubSystem()); + sr.invalidateFiltersFor(newFileOrFolder, parentFolder.getParentRemoteFileSubSystem()); // step 0: refresh all affected filters... ISubSystem fileSS = newFileOrFolder.getParentRemoteFileSubSystem(); 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 e21b82de977..482976fbfbd 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2005, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2005, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.processes.ui.actions; @@ -27,15 +27,14 @@ 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.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.processes.ui.ProcessesPlugin; import org.eclipse.rse.internal.processes.ui.SystemProcessesResources; import org.eclipse.rse.internal.processes.ui.dialogs.SystemKillDialog; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants; @@ -47,6 +46,7 @@ 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; @@ -147,7 +147,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I */ protected IRunnableContext getRunnableContext() { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IRunnableContext irc = sr.getRunnableContext(); if (irc == null) irc = new ProgressMonitorDialog(getShell()); @@ -241,7 +241,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I // update the ui - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); for (int i = 0; i < results.size(); i++) { ISystemFilterReference ref = (ISystemFilterReference)results.get(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 f6884fad2fd..7021de2dbd6 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 @@ -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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.processes.ui.view; @@ -25,10 +25,10 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemResourceSet; import org.eclipse.rse.core.model.SystemMessageObject; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.processes.ui.ProcessesPlugin; import org.eclipse.rse.internal.processes.ui.actions.SystemKillProcessAction; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter; import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants; import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteTypes; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java index 9ded6a41180..d5f9468e9a6 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java @@ -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,21 +11,23 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.shells.ui; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISubSystemConfigurationCategories; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -47,7 +49,7 @@ import org.eclipse.swt.widgets.Listener; * but can also be instantiated and used anywhere. */ public class SystemRemoteCommandEntryForm extends Composite - implements org.eclipse.rse.model.ISystemResourceChangeListener + implements ISystemResourceChangeListener, ISystemShellProvider { private SystemHostCombo sysConnCombo; private IRemoteCmdSubSystem[] subSystems = null; 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 c7ee065cd1c..72d736c76b9 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 @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - Fix 154874 - handle files with space or $ in the name * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; @@ -34,7 +35,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.shells.ui.ShellResources; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; -import org.eclipse.rse.model.ISystemRegistryUI; import org.eclipse.rse.services.clientserver.PathUtility; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.shells.ui.view.CommandEntryViewerConfiguration; @@ -51,6 +51,7 @@ 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; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java index 5d8382051ae..39c67ea6bd9 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; @@ -36,16 +37,15 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeListener; 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.shells.ui.ShellResources; import org.eclipse.rse.internal.shells.ui.actions.SystemBaseShellAction; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter; @@ -58,6 +58,7 @@ import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemBaseDummyAction; import org.eclipse.rse.ui.actions.SystemTablePrintAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -73,8 +74,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.CellEditorActionHandler; import org.eclipse.ui.part.ViewPart; - - /** * This is the desktop view wrapper of the System View viewer. */ @@ -85,6 +84,7 @@ public class SystemCommandsViewPart SelectionListener, ISelectionChangedListener, ISystemResourceChangeListener, + ISystemShellProvider, IRSEViewPart, IMenuListener, ISystemMessageLine @@ -317,7 +317,7 @@ public class SystemCommandsViewPart SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$ - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); @@ -339,7 +339,7 @@ public class SystemCommandsViewPart selectionService.removeSelectionListener(this); _folder.dispose(); - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.removeSystemResourceChangeListener(this); super.dispose(); } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewOutputAdapterFactory.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewOutputAdapterFactory.java index 5611bf799d9..f9b367984f0 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewOutputAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemViewOutputAdapterFactory.java @@ -12,16 +12,17 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180519][api] declaratively register adapter factories + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.ui.IActionFilter; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java index b440966f552..4f3699de4a8 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -20,10 +21,10 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewProvider; import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.subsystems.shells.core.model.ISystemOutputRemoteTypes; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; @@ -40,7 +41,8 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.IThemeManager; -public class SystemCommandsView extends SystemTableView implements IPropertyChangeListener +public class SystemCommandsView extends SystemTableView + implements IPropertyChangeListener { public class CommandsViewFilter extends ViewerFilter { 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 788220044d5..0954b6e5175 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180562] dont implement ISystemOutputRemoteTypes + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -32,6 +33,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.subsystems.IRemoteLineReference; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; @@ -59,7 +61,6 @@ import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; 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 09ce1e369f1..36a8fbf1a36 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 @@ -12,14 +12,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.core; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider; -import org.eclipse.rse.model.SystemRegistry; +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; @@ -34,7 +34,7 @@ public class SystemFileAPIProviderImpl { - protected SystemRegistry sr = null; + protected ISystemRegistry sr = null; protected boolean directoryMode = false; //protected Object[] emptyList = new Object[0]; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystemConfiguration.java index 0dee9969d5a..64a87333776 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystemConfiguration.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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.servicesubsystem; @@ -72,7 +72,7 @@ public abstract class FileServiceSubSystemConfiguration extends RemoteFileSubSys } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.ui.model.IHost) */ public final boolean supportsServerLaunchProperties(IHost host) { 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 4edce04d152..585d92cfdb1 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.servicesubsystem; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +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; @@ -39,7 +39,7 @@ public class OutputRefresh implements Runnable if (searchConfig != null) { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.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/IRemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java index 83dc1a8ffef..9d22dbafbd7 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java @@ -12,7 +12,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -23,8 +23,8 @@ import java.net.InetAddress; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java index 99347416191..c2d726b5fcb 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -32,7 +32,7 @@ public class RemoteFileChildrenContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#getType() + * @see org.eclipse.rse.ui.model.ISystemContentsType#getType() */ public String getType() { @@ -40,7 +40,7 @@ public class RemoteFileChildrenContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#isPersistent() + * @see org.eclipse.rse.ui.model.ISystemContentsType#isPersistent() */ public boolean isPersistent() { 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 0a682a1afbc..0b38a9161e3 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 @@ -13,6 +13,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - Fix 162962 - recursive removeCachedRemoteFile() + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -44,6 +45,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.SystemChildrenContentsType; import org.eclipse.rse.core.model.SystemMessageObject; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -51,7 +53,6 @@ import org.eclipse.rse.core.subsystems.IRemoteContainer; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.core.subsystems.SubSystem; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.IClientServerConstants; import org.eclipse.rse.services.clientserver.IMatcher; @@ -1395,7 +1396,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 - //SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + //ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); //sr.connectedStatusChange(this, false, true, true); getConnectorService().removeCommunicationsListener(this); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java index 40afbdaa554..7cc37b4e323 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -32,7 +32,7 @@ public class RemoteFolderChildrenContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#getType() + * @see org.eclipse.rse.ui.model.ISystemContentsType#getType() */ public String getType() { @@ -40,7 +40,7 @@ public class RemoteFolderChildrenContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#isPersistent() + * @see org.eclipse.rse.ui.model.ISystemContentsType#isPersistent() */ public boolean isPersistent() { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java index 929193451e5..575b4dc50bd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -32,7 +32,7 @@ public class RemoteSearchResultsContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#getType() + * @see org.eclipse.rse.ui.model.ISystemContentsType#getType() */ public String getType() { @@ -40,7 +40,7 @@ public class RemoteSearchResultsContentsType implements ISystemContentsType } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemContentsType#isPersistent() + * @see org.eclipse.rse.ui.model.ISystemContentsType#isPersistent() */ public boolean isPersistent() { 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 5782345624a..4c86f1a5490 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 @@ -12,7 +12,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.dstore; @@ -30,13 +30,13 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.RSEUIPlugin; @@ -56,7 +56,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, protected Shell shell; - protected SystemRegistry _registry; + protected ISystemRegistry _registry; protected IConnectorService system; @@ -116,14 +116,14 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, for (int i = 0; i < _files.length; i++) { _registry.fireEvent(new - org.eclipse.rse.model.SystemResourceChangeEvent(_files[i], + org.eclipse.rse.core.events.SystemResourceChangeEvent(_files[i], ISystemResourceChangeEvents.EVENT_ICON_CHANGE, _parentFile)); } /* _registry.fireEvent(new - org.eclipse.rse.model.SystemResourceChangeEvent(_files, + org.eclipse.rse.ui.model.SystemResourceChangeEvent(_files, ISystemResourceChangeEvent.EVENT_REPLACE_CHILDREN, _parentFile)); */ diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java index 306d0b64a37..31d201b2192 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.processes.servicesubsystem; @@ -42,7 +42,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#getProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#getProcessService(org.eclipse.rse.ui.model.IHost) */ public IProcessService getProcessService(IHost host) { @@ -64,7 +64,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.ui.model.IHost) */ public boolean supportsServerLaunchProperties(IHost host) { @@ -72,7 +72,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration#getService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration#getService(org.eclipse.rse.ui.model.IHost) */ public IService getService(IHost host) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java index a3d2bc532c3..5ba3266d2f4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.processes.dstore; @@ -48,7 +48,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.ui.model.IHost) */ public ISubSystem createSubSystemInternal(IHost host) { @@ -86,7 +86,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.ui.model.IHost) */ public IProcessService createProcessService(IHost host) { @@ -107,7 +107,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.ui.model.IHost) */ public IConnectorService getConnectorService(IHost host) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java index 437b9c58032..80dcc6b5af6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2006, 2007 IBM Corporation. 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.processes.local; @@ -95,7 +95,7 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.ui.model.IHost) */ public IConnectorService getConnectorService(IHost host) { @@ -103,7 +103,7 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.ui.model.IHost) */ public IProcessService createProcessService(IHost host) { 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 5fc8e7f9b54..4604230d8bd 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 @@ -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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.subsystems.shells.servicesubsystem; @@ -19,10 +19,10 @@ 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.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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; import org.eclipse.rse.ui.RSEUIPlugin; @@ -73,7 +73,7 @@ public class OutputRefreshJob extends UIJob { try { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.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/RemoteCommandShellOperation.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java index f87b2363153..6122bc274ff 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 @@ -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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.shells.core.model; @@ -22,14 +22,15 @@ import java.util.Stack; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; +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.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; @@ -42,7 +43,8 @@ import org.eclipse.swt.widgets.Shell; * is called. * */ -public abstract class RemoteCommandShellOperation implements ISystemResourceChangeListener +public abstract class RemoteCommandShellOperation + implements ISystemResourceChangeListener, ISystemShellProvider { protected class CommandAlias 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 1a4f493e9e8..53329f6446a 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.subsystems.shells.core.subsystems; @@ -26,9 +26,12 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; 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.IHost; import org.eclipse.rse.core.model.IProperty; import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.PropertyList; import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; @@ -37,9 +40,6 @@ import org.eclipse.rse.core.subsystems.IRemoteSystemEnvVar; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings; import org.eclipse.rse.internal.subsystems.shells.subsystems.RemoteSystemEnvVar; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -647,7 +647,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd _cmdShells.clear(); _defaultShell = null; // registry.fireEvent(new - // org.eclipse.rse.model.SystemResourceChangeEvent(this, + // org.eclipse.rse.ui.model.SystemResourceChangeEvent(this, // ISystemResourceChangeEvent.EVENT_COMMAND_SHELL_FINISHED, null)); Display.getDefault().asyncExec(new Refresh(this)); @@ -663,7 +663,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void run() { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); } } @@ -681,7 +681,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void run() { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(_cmdShell, ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_REMOVED, null)); registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); } @@ -802,7 +802,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd return null; } - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); return cmdShell; @@ -814,7 +814,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public IRemoteCommandShell runShell(IProgressMonitor monitor, Object context) throws Exception { IRemoteCommandShell cmdShell = internalRunShell(monitor, context); - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, this)); return cmdShell; diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF index 6f022d0498f..6034a239eda 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.core.servicesubsystem, org.eclipse.rse.core.subsystems, org.eclipse.rse.core.subsystems.util, - org.eclipse.rse.internal.model;x-internal:=true, org.eclipse.rse.internal.ui;x-internal:=true, org.eclipse.rse.internal.ui.actions;x-internal:=true, org.eclipse.rse.internal.ui.dialogs;x-internal:=true, @@ -37,14 +36,15 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.internal.ui.view.search;x-internal:=true, org.eclipse.rse.internal.ui.view.team;x-internal:=true, org.eclipse.rse.internal.ui.widgets;x-internal:=true, - org.eclipse.rse.model, org.eclipse.rse.ui, org.eclipse.rse.ui.actions, org.eclipse.rse.ui.dialogs, org.eclipse.rse.ui.filters, org.eclipse.rse.ui.filters.actions, org.eclipse.rse.ui.filters.dialogs, + org.eclipse.rse.ui.internal.model;x-internal:=true, org.eclipse.rse.ui.messages, + org.eclipse.rse.ui.model, org.eclipse.rse.ui.open, org.eclipse.rse.ui.operations, org.eclipse.rse.ui.propertypages, 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 745320ee7f1..1ec7ae9be68 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 @@ -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 @@ -11,18 +11,18 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.IHost; 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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; 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 ccc5c308f90..0bd2fcc69d9 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; 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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; 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 a070dcf9e59..9dd9c05681b 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -20,11 +20,11 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; @@ -76,7 +76,7 @@ public class SystemCollapseAction extends SystemBaseAction { */ public void run() { //System.out.println("Inside run of SystemRefreshAction"); - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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 faddc90d6d0..37c7d4cef14 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 @@ -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,17 +11,17 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; import org.eclipse.jface.viewers.IStructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -61,7 +61,7 @@ public class SystemCollapseAllAction extends SystemBaseAction { * @see org.eclipse.jface.action.Action#run() */ public void run() { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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/SystemExpandAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java index 518daa9a4b5..adb9d4e1256 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -20,11 +20,11 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; @@ -79,7 +79,7 @@ public class SystemExpandAction extends SystemBaseAction { */ public void run() { //System.out.println("Inside run of SystemRefreshAction"); - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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/SystemOpenExplorerPerspectiveAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.java index 28dd257cf94..ddfb183d8a5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -20,11 +20,11 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; +import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.OpenInNewWindowAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java index 416fcc8061f..9b25ea49da8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.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,13 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent; +import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemBaseAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java index b8f515e7a85..65ff5f8dc0b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.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 @@ -12,11 +12,12 @@ * * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents; -import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; +import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java index 7cb065a978e..fd6bcb8934b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.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,11 +12,12 @@ * * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents; -import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; +import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java index a049e3315cd..ed5b2df1daf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -26,12 +26,12 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.dialogs.SystemCopyProfileDialog; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; 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; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -121,7 +121,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ protected IRunnableContext getRunnableContext() { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IRunnableContext irc = sr.getRunnableContext(); if (irc == null) irc = new ProgressMonitorDialog(getShell()); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java index 3589f30e62c..82832d5f900 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java @@ -12,17 +12,18 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.dialogs; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemRegistryUI; import org.eclipse.rse.ui.ISystemConnectionFormCaller; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java index f22ebb2eb90..3f3f614763a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java @@ -14,6 +14,7 @@ * David Dykstal (IBM) - moved SystemPreferencesManager to a new package * - created and used PreferencesMapper * Martin Oberhuber (Wind River) - [180562] dont implement ISystemPreferencesConstants + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.propertypages; @@ -23,8 +24,8 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents; -import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; +import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent; import org.eclipse.rse.internal.ui.PreferencesMapper; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.ISystemPreferencesConstants; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java index 41856a44e81..a85cb1c969a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.propertypages; @@ -19,12 +20,12 @@ import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.model.ISystemRegistryUI; import org.eclipse.rse.ui.ISystemConnectionFormCaller; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java index a2a2cd4dd04..56a3592df19 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionSubSystemsPropertyPage.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.propertypages; @@ -49,9 +49,9 @@ import org.eclipse.ui.dialogs.PropertyPage; /** * The property page for subsystem properties when accessed from the connection property page. - * The plugin.xml file registers this for objects of class org.eclipse.rse.model.IHost + * The plugin.xml file registers this for objects of class org.eclipse.rse.ui.model.IHost diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java index 7dfe25ee0ed..37c58aafd09 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -29,21 +29,21 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemResourceSet; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.internal.ui.GenericMessages; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.progress.UIJob; @@ -610,7 +610,7 @@ public class SystemDNDTransferRunnable extends WorkspaceJob public IStatus runInUIThread(IProgressMonitor monitor) { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); if (_resultTgtObjects.size() > 0) { boolean doRefresh = _ok; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index 1341778ff32..61d6d369dc9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -26,7 +26,7 @@ import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; +import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java index 0e27416c3ea..0f86ad22dd3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -46,6 +46,12 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.SameShellProvider; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; @@ -58,13 +64,6 @@ import org.eclipse.rse.internal.ui.actions.SystemCommonSelectAllAction; import org.eclipse.rse.internal.ui.actions.SystemOpenExplorerPerspectiveAction; import org.eclipse.rse.internal.ui.actions.SystemShowInTableAction; import org.eclipse.rse.internal.ui.actions.SystemSubMenuManager; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.StringCompare; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; @@ -78,6 +77,8 @@ import org.eclipse.rse.ui.actions.ISystemAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemRegistryUI; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ContextObject; import org.eclipse.rse.ui.view.IContextObject; @@ -125,13 +126,15 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; * */ public class SystemTableTreeView -// TODO change TreeViewer to TableTreeViewer when Eclipse fixes SWT viewer -//extends TableTreeViewer -extends TreeViewer -implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget, ISystemResourceChangeListener, ISystemRemoteChangeListener, ISelectionChangedListener, ISelectionProvider + //FIXEM change TreeViewer to TableTreeViewer when Eclipse fixes SWT viewer + //extends TableTreeViewer + extends TreeViewer + implements IMenuListener, + ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget, + ISystemResourceChangeListener, ISystemRemoteChangeListener, + ISystemShellProvider, ISelectionChangedListener, ISelectionProvider { - protected Composite getTableTree() { // TODO - turn back to table tree @@ -881,7 +884,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvent + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvent */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { @@ -1274,7 +1277,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec */ public boolean doDelete(IProgressMonitor monitor) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -1322,7 +1325,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec if (_selectionIsRemoteObject) sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); } return ok; } @@ -1366,7 +1369,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec */ public boolean doRename(String[] newNames) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -1396,7 +1399,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, remoteAdapter.getSubSystem(element), oldFullName, this); } else { - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); } } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java index 4ac7335e296..4008f92e5d5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.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 @@ -13,6 +13,7 @@ * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. * David Dykstal (IBM) - moved SystemsPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -43,6 +44,13 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemContainer; @@ -53,14 +61,6 @@ import org.eclipse.rse.internal.ui.SystemPropertyResources; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -73,6 +73,8 @@ import org.eclipse.rse.ui.actions.SystemTablePrintAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.dialogs.SystemSelectAnythingDialog; 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; import org.eclipse.rse.ui.view.SystemTableView; @@ -111,11 +113,13 @@ import org.osgi.framework.Bundle; /** * Comment goes here */ -public class SystemTableViewPart extends ViewPart implements ISelectionListener, ISelectionChangedListener, - ISystemMessageLine, ISystemResourceChangeListener, ISystemRemoteChangeListener, IRSEViewPart +public class SystemTableViewPart extends ViewPart + implements ISelectionListener, ISelectionChangedListener, + ISystemMessageLine, ISystemShellProvider, + ISystemResourceChangeListener, ISystemRemoteChangeListener, + IRSEViewPart { - class BrowseAction extends Action { @@ -335,7 +339,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener, ((ISystemContainer)inputObject).markStale(true); } ((SystemTableViewProvider) _viewer.getContentProvider()).flushCache(); - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(inputObject, ISystemResourceChangeEvents.EVENT_REFRESH, inputObject)); //_viewer.refresh(); @@ -1155,7 +1159,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener, _browsePosition = 0; // register global edit actions - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); Clipboard clipboard = registry.getSystemClipboard(); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); @@ -1562,7 +1566,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener, /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvent + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvent */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 487fcae7785..ad655bf8e04 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -18,6 +18,7 @@ * - [177537] [api] Dynamic system type provider need a hook to add dynamic system type specific menu groups * - Several bugfixes. * David Dykstal (IBM) - moved SystemPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -61,12 +62,20 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeExpansionEvent; import org.eclipse.jface.viewers.TreePath; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.window.SameShellProvider; 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.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterContainer; import org.eclipse.rse.core.filters.ISystemFilterContainerReference; @@ -95,16 +104,6 @@ import org.eclipse.rse.internal.ui.actions.SystemOpenExplorerPerspectiveAction; import org.eclipse.rse.internal.ui.actions.SystemShowInMonitorAction; import org.eclipse.rse.internal.ui.actions.SystemShowInTableAction; import org.eclipse.rse.internal.ui.actions.SystemSubMenuManager; -import org.eclipse.rse.model.ISystemPromptableObject; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemRemoteElementResourceSet; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemDeleteTarget; @@ -120,6 +119,11 @@ import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemPromptableObject; +import org.eclipse.rse.ui.model.ISystemRegistryUI; +import org.eclipse.rse.ui.model.ISystemShellProvider; +import org.eclipse.rse.ui.model.SystemRemoteElementResourceSet; +import org.eclipse.rse.ui.model.SystemResourceChangeEventUI; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ContextObject; import org.eclipse.rse.ui.view.IContextObject; @@ -169,9 +173,12 @@ import org.eclipse.ui.views.framelist.GoIntoAction; /* * At one time implemented the following as well: MenuListener, IDoubleClickListener, ArmListener, IWireEventTarget */ -public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemResourceChangeListener, ISystemRemoteChangeListener, IMenuListener, -IPostSelectionProvider, -ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget +public class SystemView extends SafeTreeViewer + implements ISystemTree, ISystemShellProvider, + ISystemResourceChangeListener, ISystemRemoteChangeListener, + IMenuListener, IPostSelectionProvider, + ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget, + ISelectionChangedListener, ITreeViewerListener { protected Shell shell; // shell hosting this viewer @@ -1594,34 +1601,49 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy Widget parentItem = null; Object[] multiSource = null; Object previous = null; - if (_event.getViewerItem() instanceof TreeItem) - inputTreeItem = (TreeItem) _event.getViewerItem(); - else - inputTreeItem = null; boolean wasSelected = false; - boolean originatedHere = (_event.getOriginatingViewer() == null) || (_event.getOriginatingViewer() == _originatingViewer); + boolean originatedHere = true; + if (_event instanceof SystemResourceChangeEventUI) { + Viewer viewer = ((SystemResourceChangeEventUI)_event).getOriginatingViewer(); + if (viewer!=null && viewer!=_originatingViewer) { + originatedHere = false; + } + Object viewerItem = ((SystemResourceChangeEventUI)_event).getViewerItem(); + if (viewerItem instanceof TreeItem) { + inputTreeItem = (TreeItem)viewerItem; + } else { + inputTreeItem = null; + } + } else { + inputTreeItem = null; + } //logDebugMsg("INSIDE SYSRESCHGD: " + type + ", " + src + ", " + parent); switch (type) { // SPECIAL CASES: ANYTHING TO DO WITH FILTERS!! - case EVENT_RENAME_FILTER_REFERENCE: - case EVENT_CHANGE_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_RENAME_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_CHANGE_FILTER_REFERENCE: findAndUpdateFilter(_event, type); break; - case EVENT_CHANGE_FILTERSTRING_REFERENCE: + case ISystemResourceChangeEvents.EVENT_CHANGE_FILTERSTRING_REFERENCE: findAndUpdateFilterString(_event, type); break; - case EVENT_ADD_FILTERSTRING_REFERENCE: - case EVENT_DELETE_FILTERSTRING_REFERENCE: - case EVENT_MOVE_FILTERSTRING_REFERENCES: + case ISystemResourceChangeEvents.EVENT_ADD_FILTERSTRING_REFERENCE: + case ISystemResourceChangeEvents.EVENT_DELETE_FILTERSTRING_REFERENCE: + case ISystemResourceChangeEvents.EVENT_MOVE_FILTERSTRING_REFERENCES: //findAndUpdateFilterStringParent(event, type); //break; - case EVENT_ADD_FILTER_REFERENCE: - case EVENT_DELETE_FILTER_REFERENCE: - case EVENT_MOVE_FILTER_REFERENCES: + case ISystemResourceChangeEvents.EVENT_ADD_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_DELETE_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_MOVE_FILTER_REFERENCES: // are we a secondary perspective, and our input or parent of our input was deleted? - if (((type == EVENT_DELETE_FILTERSTRING_REFERENCE) || (type == EVENT_DELETE_FILTER_REFERENCE)) && affectsInput(src)) { + if (( + (type == ISystemResourceChangeEvents.EVENT_DELETE_FILTERSTRING_REFERENCE) + || (type == ISystemResourceChangeEvents.EVENT_DELETE_FILTER_REFERENCE) + ) + && affectsInput(src) + ) { close(); return Status.OK_STATUS; } @@ -1629,8 +1651,8 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy findAndUpdateFilterParent(_event, type); break; - case EVENT_ADD: - case EVENT_ADD_RELATIVE: + case ISystemResourceChangeEvents.EVENT_ADD: + case ISystemResourceChangeEvents.EVENT_ADD_RELATIVE: if (debug) { logDebugMsg("SV event: EVENT_ADD "); //$NON-NLS-1$ } @@ -1649,7 +1671,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy //System.out.println("inputProvider.showingConnections().........: " + (inputProvider.showingConnections())); if ((parent == inputProvider) && addingConnection && (_event.getParent() instanceof ISystemRegistry) && !inputProvider.showingConnections()) return Status.OK_STATUS; // only reflect new connections in main perspective. pc42742 int pos = -1; - if (type == EVENT_ADD_RELATIVE) { + if (type == ISystemResourceChangeEvents.EVENT_ADD_RELATIVE) { previous = _event.getRelativePrevious(); if (previous != null) pos = getItemIndex(parentItem, previous); if (pos >= 0) pos++; // want to add after previous @@ -1684,7 +1706,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy setSelection(new StructuredSelection(src), true); } break; - case EVENT_ADD_MANY: + case ISystemResourceChangeEvents.EVENT_ADD_MANY: if (debug) { logDebugMsg("SV event: EVENT_ADD_MANY"); //$NON-NLS-1$ } @@ -1721,7 +1743,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy setSelection(new StructuredSelection(multiSource), true); } break; - case EVENT_REPLACE_CHILDREN: + case ISystemResourceChangeEvents.EVENT_REPLACE_CHILDREN: if (debug) { logDebugMsg("SV event: EVENT_REPLACE_CHILDREN"); //$NON-NLS-1$ } @@ -1748,7 +1770,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy //setSelection(new StructuredSelection(multiSource),true); } break; - case EVENT_CHANGE_CHILDREN: + case ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN: if (debug) { logDebugMsg("SV event: EVENT_CHANGE_CHILDREN. src=" + src + ", parent=" + parent); //$NON-NLS-1$ //$NON-NLS-2$ //Exception e = new Exception(); @@ -1786,7 +1808,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy } else collapseNode(parent, true); break; - case EVENT_DELETE: + case ISystemResourceChangeEvents.EVENT_DELETE: if (debug) logDebugMsg("SV event: EVENT_DELETE "); //$NON-NLS-1$ // are we a secondary perspective, and our input or parent of our input was deleted? if (affectsInput(src)) { @@ -1805,7 +1827,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy } break; - case EVENT_DELETE_MANY: + case ISystemResourceChangeEvents.EVENT_DELETE_MANY: if (debug) logDebugMsg("SV event: EVENT_DELETE_MANY "); //$NON-NLS-1$ multiSource = _event.getMultiSource(); // are we a secondary perspective, and our input or parent of our input was deleted? @@ -1845,7 +1867,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy deleteRemoteObject(multiSource[idx]); break; */ - case EVENT_RENAME: + case ISystemResourceChangeEvents.EVENT_RENAME: if (debug) logDebugMsg("SV event: EVENT_RENAME "); //$NON-NLS-1$ properties[0] = IBasicPropertyConstants.P_TEXT; update(src, properties); // for refreshing non-structural properties in viewer when model changes @@ -1861,7 +1883,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy renameRemoteObject(src, (String)parent); break; */ - case EVENT_ICON_CHANGE: + case ISystemResourceChangeEvents.EVENT_ICON_CHANGE: if (debug) logDebugMsg("SV event: EVENT_ICON_CHANGE "); //$NON-NLS-1$ if (initViewerFilters != null && initViewerFilters.length > 0) { @@ -1886,7 +1908,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy //refresh(src); THIS IS AN EVIL OPERATION: CAUSES ALL EXPANDED NODES TO RE-REQUEST THEIR CHILDREN. OUCH! //updatePropertySheet(); //break; - case EVENT_REFRESH: + case ISystemResourceChangeEvents.EVENT_REFRESH: if (debug) logDebugMsg("SV event: EVENT_REFRESH "); //$NON-NLS-1$ //if (src != null) // refresh(src); // ONLY VALID WHEN USER TRULY WANTS TO REQUERY CHILDREN FROM HOST @@ -1902,7 +1924,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy break; // refresh the parent of the currently selected items. // todo: intelligently re-select previous selections - case EVENT_REFRESH_SELECTED_PARENT: + case ISystemResourceChangeEvents.EVENT_REFRESH_SELECTED_PARENT: if (debug) logDebugMsg("SV event: EVENT_REFRESH_SELECTED_PARENT "); //$NON-NLS-1$ TreeItem[] items = getTree().getSelection(); if ((items != null) && (items.length > 0) && (items[0] != null)) { @@ -1918,7 +1940,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy //else //System.out.println("Selection is empty"); break; - case EVENT_REFRESH_SELECTED: + case ISystemResourceChangeEvents.EVENT_REFRESH_SELECTED: if (debug) logDebugMsg("SV event: EVENT_REFRESH_SELECTED "); //$NON-NLS-1$ IStructuredSelection selected = (IStructuredSelection) getSelection(); Iterator i = selected.iterator(); @@ -1976,7 +1998,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy updatePropertySheet(); break; - case EVENT_REFRESH_SELECTED_FILTER: + case ISystemResourceChangeEvents.EVENT_REFRESH_SELECTED_FILTER: if (debug) logDebugMsg("SV event: EVENT_REFRESH_SELECTED_FILTER "); //$NON-NLS-1$ IStructuredSelection selectedItems = (IStructuredSelection) getSelection(); Iterator j = selectedItems.iterator(); @@ -2021,17 +2043,17 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy systemResourceChanged(_event); } break; - case EVENT_REFRESH_REMOTE: + case ISystemResourceChangeEvents.EVENT_REFRESH_REMOTE: if (debug) logDebugMsg("SV event: EVENT_REFRESH_REMOTE: src = " + src); //$NON-NLS-1$ refreshRemoteObject(src, parent, originatedHere); break; - case EVENT_SELECT_REMOTE: + case ISystemResourceChangeEvents.EVENT_SELECT_REMOTE: if (debug) logDebugMsg("SV event: EVENT_SELECT_REMOTE: src = " + src); //$NON-NLS-1$ //remoteItemsToSkip = null; // reset selectRemoteObjects(src, (ISubSystem) null, parent); break; - case EVENT_MOVE_MANY: + case ISystemResourceChangeEvents.EVENT_MOVE_MANY: if (debug) logDebugMsg("SV event: EVENT_MOVE_MANY "); //$NON-NLS-1$ multiSource = _event.getMultiSource(); if ((multiSource == null) || (multiSource.length == 0)) return Status.OK_STATUS; @@ -2045,7 +2067,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy setSelection(new StructuredSelection(multiSource), true); } break; - case EVENT_PROPERTY_CHANGE: + case ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE: if (debug) logDebugMsg("SV event: EVENT_PROPERTY_CHANGE "); //$NON-NLS-1$ String[] allProps = { IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE }; ISystemRemoteElementAdapter ra = (ISystemRemoteElementAdapter)((IAdaptable)src).getAdapter(ISystemRemoteElementAdapter.class); @@ -2055,15 +2077,15 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy update(src, allProps); // for refreshing non-structural properties in viewer when model changes updatePropertySheet(); break; - case EVENT_PROPERTYSHEET_UPDATE: + case ISystemResourceChangeEvents.EVENT_PROPERTYSHEET_UPDATE: if (debug) logDebugMsg("SV event: EVENT_PROPERTYSHEET_UPDATE "); //$NON-NLS-1$ updatePropertySheet(); break; - case EVENT_MUST_COLLAPSE: + case ISystemResourceChangeEvents.EVENT_MUST_COLLAPSE: if (debug) logDebugMsg("SV event: EVENT_MUST_COLLAPSE "); //$NON-NLS-1$ collapseNode(src, true); // collapse and flush gui widgets from memory break; - case EVENT_COLLAPSE_ALL: + case ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL: if (debug) logDebugMsg("SV event: EVENT_COLLAPSE_ALL "); //$NON-NLS-1$ collapseAll(); // collapse all if ((src != null) && (src instanceof String) && ((String) src).equals("false")) // defect 41203 //$NON-NLS-1$ @@ -2071,16 +2093,16 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy } else refresh(); // flush gui widgets from memory break; - case EVENT_COLLAPSE_SELECTED: // defect 41203 + case ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED: // defect 41203 if (debug) logDebugMsg("SV event: EVENT_COLLAPSE_SELECTED "); //$NON-NLS-1$ collapseSelected(); break; - case EVENT_EXPAND_SELECTED: // defect 41203 + case ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED: // defect 41203 if (debug) logDebugMsg("SV event: EVENT_EXPAND_SELECTED "); //$NON-NLS-1$ expandSelected(); break; - case EVENT_REVEAL_AND_SELECT: + case ISystemResourceChangeEvents.EVENT_REVEAL_AND_SELECT: if (debug) logDebugMsg("SV event: EVENT_REVEAL_AND_SELECT "); //$NON-NLS-1$ parentItem = findItem(parent); if (parentItem == null) return Status.OK_STATUS; @@ -2104,14 +2126,14 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy } } break; - case EVENT_SELECT: + case ISystemResourceChangeEvents.EVENT_SELECT: if (debug) logDebugMsg("SV event: EVENT_SELECT "); //$NON-NLS-1$ item = findItem(src); if (item == null) // if not showing item, this is a no-op return Status.OK_STATUS; setSelection(new StructuredSelection(src), true); break; - case EVENT_SELECT_EXPAND: + case ISystemResourceChangeEvents.EVENT_SELECT_EXPAND: if (debug) logDebugMsg("SV event: EVENT_SELECT_EXPAND "); //$NON-NLS-1$ item = findItem(src); if (item == null) // if not showing item, this is a no-op @@ -2132,13 +2154,20 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvent + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvent */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { int eventType = event.getEventType(); Object remoteResourceParent = event.getResourceParent(); Object remoteResource = event.getResource(); - boolean originatedHere = (event.getOriginatingViewer() == this); + boolean originatedHere; + if (event instanceof SystemResourceChangeEventUI) { + Viewer viewer = ((SystemResourceChangeEventUI)event).getOriginatingViewer(); + originatedHere = (viewer==this); + } else { + originatedHere = false; + } + List remoteResourceNames = null; if (remoteResource instanceof List) { remoteResourceNames = (List) remoteResource; @@ -3380,10 +3409,10 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy if (debug) { String eventType = null; switch (type) { - case EVENT_RENAME_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_RENAME_FILTER_REFERENCE: eventType = "EVENT_RENAME_FILTER_REFERENCE"; //$NON-NLS-1$ break; - case EVENT_CHANGE_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_CHANGE_FILTER_REFERENCE: eventType = "EVENT_CHANGE_FILTER_REFERENCE"; //$NON-NLS-1$ break; } @@ -3421,10 +3450,10 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy logDebugMsg("......didn't find renamed/updated filter's reference!"); //$NON-NLS-1$ else { // STEP 3: UPDATE THAT FILTER... - if (type == EVENT_RENAME_FILTER_REFERENCE) { + if (type == ISystemResourceChangeEvents.EVENT_RENAME_FILTER_REFERENCE) { String[] rproperties = { IBasicPropertyConstants.P_TEXT }; update(item.getData(), rproperties); // for refreshing non-structural properties in viewer when model changes - } else if (type == EVENT_CHANGE_FILTER_REFERENCE) { + } else if (type == ISystemResourceChangeEvents.EVENT_CHANGE_FILTER_REFERENCE) { //if (((TreeItem)item).getExpanded()) //refresh(item.getData()); smartRefresh(new TreeItem[] { (TreeItem) item }); @@ -3456,7 +3485,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy logDebugMsg("......didn't find updated filter string's reference!"); //$NON-NLS-1$ else { // STEP 3: UPDATE THAT FILTER STRING... - if (type == EVENT_CHANGE_FILTERSTRING_REFERENCE) // HAD BETTER! + if (type == ISystemResourceChangeEvents.EVENT_CHANGE_FILTERSTRING_REFERENCE) // HAD BETTER! { //if (((TreeItem)item).getExpanded()) //refresh(item.getData()); @@ -3516,29 +3545,29 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy //{ String eventType = null; switch (type) { - case EVENT_ADD_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_ADD_FILTER_REFERENCE: add = true; if (debug) eventType = "EVENT_ADD_FILTER_REFERENCE"; //$NON-NLS-1$ break; - case EVENT_DELETE_FILTER_REFERENCE: + case ISystemResourceChangeEvents.EVENT_DELETE_FILTER_REFERENCE: delete = true; if (debug) eventType = "EVENT_DELETE_FILTER_REFERENCE"; //$NON-NLS-1$ break; - case EVENT_MOVE_FILTER_REFERENCES: + case ISystemResourceChangeEvents.EVENT_MOVE_FILTER_REFERENCES: move = true; if (debug) eventType = "EVENT_MOVE_FILTER_REFERENCES"; //$NON-NLS-1$ break; - case EVENT_ADD_FILTERSTRING_REFERENCE: + case ISystemResourceChangeEvents.EVENT_ADD_FILTERSTRING_REFERENCE: add = true; afilterstring = true; if (debug) eventType = "EVENT_ADD_FILTERSTRING_REFERENCE"; //$NON-NLS-1$ break; - case EVENT_DELETE_FILTERSTRING_REFERENCE: + case ISystemResourceChangeEvents.EVENT_DELETE_FILTERSTRING_REFERENCE: delete = true; afilterstring = true; if (debug) eventType = "EVENT_DELETE_FILTERSTRING_REFERENCE"; //$NON-NLS-1$ break; - case EVENT_MOVE_FILTERSTRING_REFERENCES: + case ISystemResourceChangeEvents.EVENT_MOVE_FILTERSTRING_REFERENCES: move = true; afilterstring = true; if (debug) eventType = "EVENT_MOVE_FILTERSTRING_REFERENCES"; //$NON-NLS-1$ @@ -4514,7 +4543,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy * Required method from ISystemDeleteTarget */ public boolean doDelete(IProgressMonitor monitor) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -4609,7 +4638,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy Object[] deleted = new Object[deletedVector.size()]; for (int idx = 0; idx < deleted.length; idx++) deleted[idx] = deletedVector.elementAt(idx); - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getSelectedParent())); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getSelectedParent())); } } return ok; @@ -4642,7 +4671,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy * Required method from ISystemRenameTarget */ public boolean doRename(String[] newNames) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); Object element = null; @@ -4669,7 +4698,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy } else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); } } } catch (SystemMessageException exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java index 954a4c5dbab..39368a526d2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.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,12 +11,15 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; +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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; @@ -28,12 +31,9 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.view.ISystemViewInputProvider; @@ -153,7 +153,7 @@ public class SystemViewAPIProviderForFilters ISystemViewInputProvider inputProvider = this; if ((sfr != null) && (inputProvider.getViewer()!=null)) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); Viewer v = inputProvider.getViewer(); if (v instanceof ISystemResourceChangeListener) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java index 4e0cd04e57c..578888f0785 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -28,14 +28,14 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewCategoryAdapter; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewCategoryNode; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewProfileAdapter; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewSubSystemConfigurationAdapter; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewSubSystemConfigurationNode; -import org.eclipse.rse.model.ISystemPromptableObject; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; +import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; +import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.ui.IActionFilter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java index 0c678349f75..b7008436e1e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java @@ -16,6 +16,7 @@ * Uwe Stieber (Wind River) - Menu action contributions can be acknowlegded by system type provider * David Dykstal (IBM) - 180562: remove implementation of IRSEUserIdConstants * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -47,7 +48,6 @@ import org.eclipse.rse.internal.ui.actions.SystemOpenExplorerPerspectiveAction; import org.eclipse.rse.internal.ui.actions.SystemShowInMonitorAction; import org.eclipse.rse.internal.ui.actions.SystemShowInTableAction; import org.eclipse.rse.internal.ui.actions.SystemWorkOfflineAction; -import org.eclipse.rse.model.ISystemRegistryUI; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSESystemTypeAdapter; @@ -55,6 +55,7 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorSpecialChar; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; 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 2950491b680..1279644f77a 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 @@ -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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; /** 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 32dd9f4b81e..baba6faa5ab 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -25,8 +26,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; 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 38ae8d78479..f813c06b168 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -31,12 +31,12 @@ import org.eclipse.jface.viewers.ViewerDropAdapter; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.internal.model.SystemScratchpad; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; +import org.eclipse.rse.ui.internal.model.SystemScratchpad; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.TransferData; 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 34f37b3c926..013da7c8525 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -24,6 +24,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; +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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; @@ -37,14 +40,11 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; 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.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; @@ -320,7 +320,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter Viewer v = inputProvider.getViewer(); if ((v!=null) && (v instanceof ISystemResourceChangeListener)) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + 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! } 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 1d460592109..90fcc3e2a46 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 @@ -13,6 +13,7 @@ * Contributors: * David Dykstal (IBM) - moved SystemsPreferencesManager to a new package * Tobias Schwarz (Wind River) - [181394] Include Context in getAbsoluteName() for filter and pool references + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -30,6 +31,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; +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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterContainerReference; import org.eclipse.rse.core.filters.ISystemFilterPool; @@ -42,20 +46,17 @@ import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemResourceSet; import org.eclipse.rse.core.model.SystemChildrenContentsType; import org.eclipse.rse.core.model.SystemMessageObject; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemRemoteResourceSet; -import org.eclipse.rse.model.SystemResourceChangeEvent; 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.SystemPreferencesManager; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; @@ -298,7 +299,7 @@ public class SystemViewFilterReferenceAdapter ISystemViewInputProvider inputProvider = getInput(); if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer() != null)) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); Viewer v = inputProvider.getViewer(); if (v instanceof ISystemResourceChangeListener) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java index 83b15dc9553..f0cc5f7b29a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -37,7 +37,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.model.ISystemResourceChangeListener; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.operations.SystemDeferredTreeContentManager; import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; @@ -211,8 +211,8 @@ public class SystemViewLabelAndContentProvider extends LabelProvider if ((adapter!=null) && (viewer != null)) { Shell shell = null; - if (viewer instanceof ISystemResourceChangeListener) - shell = ((ISystemResourceChangeListener)viewer).getShell(); + if (viewer instanceof ISystemShellProvider) + shell = ((ISystemShellProvider)viewer).getShell(); else shell = viewer.getControl().getShell(); adapter.setShell(shell); 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 e9bccfba9fa..bc91a704467 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 @@ -13,6 +13,7 @@ * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a new package * Martin Oberhuber (Wind River) - Replace SystemRegistry by ISystemRegistry + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -49,13 +50,15 @@ import org.eclipse.jface.window.IShellProvider; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents; +import org.eclipse.rse.core.events.ISystemPreferenceChangeListener; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterStringReference; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents; -import org.eclipse.rse.core.model.ISystemPreferenceChangeListener; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -66,9 +69,6 @@ import org.eclipse.rse.internal.ui.actions.SystemPreferenceQualifyConnectionName import org.eclipse.rse.internal.ui.actions.SystemPreferenceRestoreStateAction; import org.eclipse.rse.internal.ui.actions.SystemPreferenceShowFilterPoolsAction; import org.eclipse.rse.internal.ui.actions.SystemWorkWithProfilesAction; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; @@ -83,6 +83,7 @@ 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; @@ -395,7 +396,7 @@ public class SystemViewPart } // register global edit actions - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); Clipboard clipboard = registry.getSystemClipboard(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java index 2a4022a6d98..e60650fb3e5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.internal.ui.actions.SystemRunAction; -import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.SystemMenuManager; +import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java index 2e5b6d02a20..c69d08a152a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.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 @@ -12,6 +12,7 @@ * * Contributors: * David Dykstal (IBM) - moved SystemsPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -21,10 +22,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemPreferencesManager; +import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; 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 45d90a14fae..acb54f4a956 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -22,13 +22,13 @@ 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.internal.model.SystemScratchpad; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; +import org.eclipse.rse.ui.internal.model.SystemScratchpad; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.swt.widgets.Shell; 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 c75b6da71d2..69f3c83f61f 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.monitor; @@ -29,20 +30,20 @@ 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.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemContainer; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; -import org.eclipse.rse.model.ISystemRegistryUI; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; 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; @@ -182,7 +183,7 @@ FocusListener { public void run() { - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.fireEvent(new SystemResourceChangeEvent(_inputObject, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, _inputObject)); //getViewer().refresh(); } 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 77e0b9a747b..96bc5c2b6b1 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 @@ -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,6 +12,7 @@ * * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.monitor; @@ -29,24 +30,25 @@ 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.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.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.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; +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; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.SystemTableView; @@ -73,10 +75,6 @@ import org.eclipse.ui.part.CellEditorActionHandler; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.views.properties.IPropertyDescriptor; - - - - /** * This is the desktop view wrapper of the System View viewer. */ @@ -87,6 +85,7 @@ public class SystemMonitorViewPart SelectionListener, ISelectionChangedListener, ISystemResourceChangeListener, + ISystemShellProvider, ISystemRemoteChangeListener, ISystemMessageLine, IRSEViewPart @@ -664,7 +663,7 @@ class SubSetAction extends BrowseAction SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$ - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.addSystemResourceChangeListener(this); registry.addSystemRemoteChangeListener(this); @@ -686,7 +685,7 @@ class SubSetAction extends BrowseAction selectionService.removeSelectionListener(this); _folder.dispose(); - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.removeSystemResourceChangeListener(this); registry.removeSystemRemoteChangeListener(this); @@ -840,7 +839,7 @@ class SubSetAction extends BrowseAction /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvent + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvent */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java index 88f3eb6fe52..f56931e08e1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.scratchpad; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.rse.internal.model.SystemScratchpad; -import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.internal.model.SystemRegistry; +import org.eclipse.rse.ui.internal.model.SystemScratchpad; @@ -32,7 +32,7 @@ class BrowseAction extends Action _view = view; setImageDescriptor(des); setToolTipText(label); - _scratchPad = RSEUIPlugin.getTheSystemRegistry().getSystemScratchPad(); + _scratchPad = SystemRegistry.getInstance().getSystemScratchPad(); } public void checkEnabledState() 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 c40fee7eb77..4b7346f213d 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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,14 +11,14 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.scratchpad; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; 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 9ed1b4beea3..871e338870c 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2004, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ @@ -19,9 +19,9 @@ package org.eclipse.rse.internal.ui.view.scratchpad; import java.util.Iterator; import org.eclipse.jface.viewers.StructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; 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 c8ae37bf426..55d39324ee5 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.scratchpad; @@ -44,6 +44,12 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.SameShellProvider; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; @@ -60,13 +66,6 @@ import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.internal.ui.view.SystemViewDataDragAdapter; import org.eclipse.rse.internal.ui.view.SystemViewDataDropAdapter; import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemDeleteTarget; @@ -76,8 +75,11 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.ISystemAction; 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.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemRegistryUI; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ContextObject; import org.eclipse.rse.ui.view.IContextObject; @@ -120,7 +122,7 @@ public class SystemScratchpadView // extends ScratchpadViewer extends TreeViewer implements IMenuListener, ISystemDeleteTarget, - ISystemRenameTarget, ISystemSelectAllTarget, + ISystemRenameTarget, ISystemSelectAllTarget, ISystemShellProvider, ISystemResourceChangeListener, ISystemRemoteChangeListener, ISelectionChangedListener, ISelectionProvider { @@ -375,7 +377,7 @@ public class SystemScratchpadView if (w != null) { remove(child); - RSEUIPlugin.getTheSystemRegistry().getSystemScratchPad().removeChild(child); + SystemRegistry.getInstance().getSystemScratchPad().removeChild(child); } } } @@ -409,7 +411,7 @@ public class SystemScratchpadView /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeEvent + * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvent */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { @@ -821,7 +823,7 @@ public class SystemScratchpadView */ public boolean doDelete(IProgressMonitor monitor) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -869,7 +871,7 @@ public class SystemScratchpadView if (_selectionIsRemoteObject) sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); } return ok; } @@ -913,7 +915,7 @@ public class SystemScratchpadView */ public boolean doRename(String[] newNames) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -943,7 +945,7 @@ public class SystemScratchpadView sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, remoteAdapter.getSubSystem(element), oldFullName, this); } else { - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); } } } 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 067c7f53a2a..38fc1c98f2f 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.scratchpad; @@ -28,19 +28,21 @@ 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.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; 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.actions.SystemCopyToClipboardAction; 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; import org.eclipse.swt.SWT; @@ -60,8 +62,10 @@ import org.eclipse.ui.part.ViewPart; /** * This class is the Remote Scratchpad view. */ -public class SystemScratchpadViewPart extends ViewPart implements ISelectionListener, ISelectionChangedListener, - ISystemResourceChangeListener, ISystemMessageLine, IRSEViewPart +public class SystemScratchpadViewPart extends ViewPart + implements ISelectionListener, ISelectionChangedListener, + ISystemResourceChangeListener, ISystemShellProvider, + ISystemMessageLine, IRSEViewPart { @@ -120,7 +124,7 @@ public class SystemScratchpadViewPart extends ViewPart implements ISelectionList fillLocalToolBar(); // register global edit actions - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); Clipboard clipboard = registry.getSystemClipboard(); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); @@ -142,7 +146,7 @@ public class SystemScratchpadViewPart extends ViewPart implements ISelectionList SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "scrp0000"); //$NON-NLS-1$ - setInput(registry.getSystemScratchPad()); + setInput(SystemRegistry.getInstance().getSystemScratchPad()); getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java index e127db01f97..d94371bb2af 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.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,21 +11,21 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.search; import java.util.Vector; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.ui.view.SystemDecoratingLabelProvider; import org.eclipse.rse.internal.ui.view.SystemTableTreeView; import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.ui.RSEUIPlugin; 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 d6a45b86fc4..96d1d251a8b 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.search; @@ -40,13 +40,12 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; +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.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; import org.eclipse.rse.internal.ui.view.SystemView; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; @@ -57,6 +56,8 @@ 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; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; @@ -82,7 +83,7 @@ import org.eclipse.ui.part.ViewPart; * This class defines the Remote Search view. */ public class SystemSearchViewPart extends ViewPart - implements ISystemResourceChangeListener, + implements ISystemResourceChangeListener, ISystemShellProvider, IMenuListener, ISelectionChangedListener, ISystemMessageLine, IRSEViewPart { @@ -306,7 +307,7 @@ public class SystemSearchViewPart extends ViewPart tbMgr.add(removeAllAction); // register global edit actions - SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); // clipboard Clipboard clipboard = registry.getSystemClipboard(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java index 6f54fc3936d..c6cdae4eb20 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -23,11 +23,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; +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.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.ISystemSelectAllTarget; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -43,7 +44,9 @@ import org.eclipse.swt.widgets.Widget; * We specialize tree viewer for the Team view, so we know * when we are dealing with the team view in common code. */ -public class SystemTeamView extends TreeViewer implements ISystemSelectAllTarget, ISystemResourceChangeListener +public class SystemTeamView extends TreeViewer + implements ISystemSelectAllTarget, ISystemResourceChangeListener, + ISystemShellProvider { private SystemTeamViewPart teamViewPart; 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 50663f1d3be..95360c870fe 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -26,8 +26,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.model.ISystemResourceChangeListener; 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; import org.eclipse.rse.ui.view.ISystemViewInputProvider; @@ -220,8 +220,8 @@ public class SystemTeamViewContentProvider extends WorkbenchContentProvider if ((adapter!=null) && (viewer != null)) { Shell shell = null; - if (viewer instanceof ISystemResourceChangeListener) - shell = ((ISystemResourceChangeListener)viewer).getShell(); + if (viewer instanceof ISystemShellProvider) + shell = ((ISystemShellProvider)viewer).getShell(); else if (viewer != null) shell = viewer.getControl().getShell(); if (shell != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java index cc08fa2564e..248105b97cc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -93,7 +93,7 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput } /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.ui.model.IHost) */ public Object[] getConnectionChildren(IHost selectedConnection) { @@ -102,7 +102,7 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput } /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.ui.model.IHost) */ public boolean hasConnectionChildren(IHost selectedConnection) { 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 a4f596fe01a..9859c824046 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -29,9 +29,9 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.model.ISystemResourceChangeListener; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.graphics.Image; @@ -192,8 +192,8 @@ public class SystemTeamViewLabelProvider extends LabelProvider if ((adapter!=null) && (viewer != null)) { Shell shell = null; - if (viewer instanceof ISystemResourceChangeListener) - shell = ((ISystemResourceChangeListener)viewer).getShell(); + if (viewer instanceof ISystemShellProvider) + shell = ((ISystemShellProvider)viewer).getShell(); else if (viewer != null) shell = viewer.getControl().getShell(); if (shell != 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 332fa1aa955..ae9fa2612f1 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -57,15 +57,16 @@ import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemResourceManager; +import org.eclipse.rse.core.events.ISystemModelChangeEvent; +import org.eclipse.rse.core.events.ISystemModelChangeEvents; +import org.eclipse.rse.core.events.ISystemModelChangeListener; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.ISystemModelChangeEvent; -import org.eclipse.rse.core.model.ISystemModelChangeEvents; -import org.eclipse.rse.core.model.ISystemModelChangeListener; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemCollapseAllAction; @@ -78,7 +79,6 @@ import org.eclipse.rse.internal.ui.actions.SystemTeamReloadAction; import org.eclipse.rse.internal.ui.view.ISystemMementoConstants; import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.rse.internal.ui.view.SystemViewPart; -import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; 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 20f40abe41b..3c650951f4c 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 @@ -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 @@ -12,6 +12,7 @@ * * Contributors: * David Dykstal (IBM) - 180562: remove implementation of IRSEUserIdConstants + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -25,13 +26,13 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.internal.ui.actions.SystemProfileNameCopyAction; import org.eclipse.rse.internal.ui.view.ISystemMementoConstants; import org.eclipse.rse.internal.ui.view.SystemViewResources; -import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; 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 f405e63dd86..cc5a6fc444b 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 @@ -15,6 +15,7 @@ * - created and used RSEPreferencesManager * 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 ********************************************************************************/ package org.eclipse.rse.ui; @@ -339,7 +340,7 @@ public class RSESystemTypeAdapter extends RSEAdapter { /** * Creates a new IHost object instance. This method is - * called from {@link org.eclipse.rse.internal.model.SystemHostPool#createHost(String, String, String, String, String, int)}. + * called from {@link org.eclipse.rse.ui.internal.model.SystemHostPool#createHost(String, String, String, String, String, int)}. * * @param profile The system profile to associate with the host. * @return A new IHost object instance. 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 e643ac3bd0a..6f941af66f5 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 @@ -14,6 +14,7 @@ * David Dykstal (IBM) - moved methods to SystemPreferencesManager. * Uwe Stieber (Wind River) - bugfixing. * David Dykstal (IBM) - 168870: move core function from UI to core + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui; @@ -39,9 +40,12 @@ import org.eclipse.rse.core.SystemResourceListener; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; import org.eclipse.rse.core.comm.SystemKeystoreProviderManager; +import org.eclipse.rse.core.events.ISystemResourceChangeEvents; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.internal.core.model.SystemProfileManager; @@ -55,15 +59,13 @@ import org.eclipse.rse.internal.ui.subsystems.SubSystemConfigurationProxyAdapter import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapterFactory; import org.eclipse.rse.internal.ui.view.SystemViewAdapterFactory; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewResourceAdapterFactory; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; -import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.persistence.IRSEPersistenceManager; import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.ui.actions.ISystemDynamicPopupMenuExtension; +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; @@ -83,7 +85,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi public IStatus run(IProgressMonitor monitor) { - ISystemRegistry registry = getSystemRegistry(); + ISystemRegistry registry = getSystemRegistryInternal(); SystemResourceManager.getRemoteSystemsProject(); // create core folder tree @@ -137,7 +139,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi private static SystemMessageFile defaultMessageFile = null; // private SystemType[] allSystemTypes = null; - private SystemRegistry _systemRegistry = null; + private SystemRegistry _systemRegistry = null; @@ -478,7 +480,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$ - ISystemRegistry registry = getSystemRegistry(); + ISystemRegistry registry = getSystemRegistryInternal(); RSECorePlugin.getDefault().setSystemRegistry(registry); IAdapterManager manager = Platform.getAdapterManager(); @@ -531,7 +533,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi closeViews(); // clear in-memory settings for all filter pools and subsystems - ISubSystemConfigurationProxy[] proxies = getSystemRegistry().getSubSystemConfigurationProxies(); + ISubSystemConfigurationProxy[] proxies = getSystemRegistryInternal().getSubSystemConfigurationProxies(); if (proxies != null) for (int idx=0; idx < proxies.length; idx++) proxies[idx].reset(); @@ -617,7 +619,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi { if (isSystemRegistryActive()) { - ISubSystemConfigurationProxy[] proxies = getSystemRegistry().getSubSystemConfigurationProxies(); + ISubSystemConfigurationProxy[] proxies = getSystemRegistryInternal().getSubSystemConfigurationProxies(); if (proxies != null) { for (int idx=0; idx < proxies.length; idx++) @@ -722,13 +724,13 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi * Return the SystemRegistry singleton. * Clients should use static @{link getTheSystemRegistry()} instead. */ - private SystemRegistry getSystemRegistry() + private SystemRegistry getSystemRegistryInternal() { if (_systemRegistry == null) { String logfilePath = getStateLocation().toOSString(); - _systemRegistry = (SystemRegistry)SystemRegistry.getSystemRegistry(logfilePath); + _systemRegistry = SystemRegistry.getInstance(logfilePath); ISubSystemConfigurationProxy[] proxies = getSubSystemConfigurationProxies(); if (proxies != null) @@ -744,9 +746,9 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi * A static version for convenience * Returns the master registry singleton. */ - public static SystemRegistry getTheSystemRegistry() + public static ISystemRegistryUI getTheSystemRegistry() { - return getDefault().getSystemRegistry(); + return getDefault().getSystemRegistryInternal(); } public static IRSEPersistenceManager getThePersistenceManager() 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 5e82a861748..2223a84412c 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -25,7 +25,6 @@ import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.core.model.SystemProfileManager; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; @@ -35,6 +34,7 @@ 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; @@ -213,7 +213,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction */ protected IRunnableContext getRunnableContext() { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IRunnableContext irc = sr.getRunnableContext(); if (irc == null) irc = new ProgressMonitorDialog(getShell()); 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 09d68e855c6..36d392d01fd 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -27,13 +27,13 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemDNDTransferRunnable; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; -import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.FileTransfer; 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 c6b75863e3a..6bf70fcb019 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 @@ -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,6 +12,7 @@ * * Contributors: * Michael Berger (IBM) - 146339 Added refresh action graphic. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.actions; @@ -20,12 +21,12 @@ import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -71,7 +72,7 @@ public class SystemRefreshAction extends SystemBaseAction */ public void run() { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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 07160d28c4d..4533d8750cf 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 @@ -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,18 +11,18 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.actions; import java.util.Iterator; import org.eclipse.jface.viewers.IStructuredSelection; +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.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.model.SystemResourceChangeEvent; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.widgets.Shell; @@ -96,7 +96,7 @@ public class SystemRefreshAllAction extends SystemBaseAction ((ISystemContainer)_rootObject).markStale(true); } } - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistry sr = RSEUIPlugin.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/view/AbstractSystemRemoteAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.java index e86fd21fb8a..ed28f957d78 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2003, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2003, 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,12 +11,13 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.view; import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; @@ -29,8 +30,6 @@ import org.eclipse.ui.views.properties.IPropertySource; public abstract class AbstractSystemRemoteAdapterFactory implements IAdapterFactory { - - /** * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class) */ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 8b2bbb843a3..88e378284d2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -13,6 +13,7 @@ * Contributors: * Uwe Stieber (Wind River) - Allow to extend action filter by dynamic system type providers. * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -43,6 +44,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemResourceSet; import org.eclipse.rse.core.model.SystemMessageObject; +import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -54,11 +56,10 @@ import org.eclipse.rse.internal.ui.actions.SystemDynamicPopupMenuExtensionManage import org.eclipse.rse.internal.ui.view.ISystemMementoConstants; import org.eclipse.rse.internal.ui.view.SystemViewPart; import org.eclipse.rse.internal.ui.view.SystemViewResources; -import org.eclipse.rse.model.ISystemPromptableObject; -import org.eclipse.rse.model.SystemRemoteResourceSet; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; +import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.rse.ui.operations.Policy; import org.eclipse.rse.ui.operations.SystemFetchOperation; import org.eclipse.rse.ui.operations.SystemSchedulingRule; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java index 659370c1a4a..8172170beee 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java @@ -25,6 +25,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.validators.ISystemValidator; 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 c80f086e734..2c44e06b27b 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 @@ -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) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -45,6 +45,12 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.SameShellProvider; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemContainer; @@ -68,13 +74,6 @@ import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.internal.ui.view.SystemViewDataDragAdapter; import org.eclipse.rse.internal.ui.view.SystemViewDataDropAdapter; import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; -import org.eclipse.rse.model.ISystemRemoteChangeEvent; -import org.eclipse.rse.model.ISystemRemoteChangeEvents; -import org.eclipse.rse.model.ISystemRemoteChangeListener; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; -import org.eclipse.rse.model.ISystemResourceChangeListener; -import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.services.clientserver.StringCompare; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; @@ -88,6 +87,8 @@ import org.eclipse.rse.ui.actions.ISystemAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemRegistryUI; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.FileTransfer; @@ -124,7 +125,10 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; */ public class SystemTableView extends TableViewer - implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget, ISystemResourceChangeListener, ISystemRemoteChangeListener, ISelectionChangedListener, ISelectionProvider + implements IMenuListener, + ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget, + ISystemResourceChangeListener, ISystemRemoteChangeListener, + ISystemShellProvider, ISelectionChangedListener, ISelectionProvider { @@ -818,7 +822,7 @@ public class SystemTableView } /** * Used to asynchronously update the view whenever properties change. - * @see org.eclipse.rse.model.ISystemResourceChangeListener#systemResourceChanged(org.eclipse.rse.model.ISystemResourceChangeEvent) + * @see org.eclipse.rse.core.events.ISystemResourceChangeListener#systemResourceChanged(org.eclipse.rse.core.events.ISystemResourceChangeEvent) */ public void systemResourceChanged(ISystemResourceChangeEvent event) { @@ -961,7 +965,7 @@ public class SystemTableView /** * This is the method in your class that will be called when a remote resource * changes. You will be called after the resource is changed. - * @see org.eclipse.rse.model.ISystemRemoteChangeListener#systemRemoteResourceChanged(org.eclipse.rse.model.ISystemRemoteChangeEvent) + * @see org.eclipse.rse.core.events.ISystemRemoteChangeListener#systemRemoteResourceChanged(org.eclipse.rse.core.events.ISystemRemoteChangeEvent) */ public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { @@ -1404,7 +1408,7 @@ public class SystemTableView */ public boolean doDelete(IProgressMonitor monitor) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); //int selectedCount = selection.size(); @@ -1452,7 +1456,7 @@ public class SystemTableView if (_selectionIsRemoteObject) sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); } return ok; } @@ -1496,7 +1500,7 @@ public class SystemTableView */ public boolean doRename(String[] newNames) { - SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry(); IStructuredSelection selection = (IStructuredSelection) getSelection(); Iterator elements = selection.iterator(); Object element = null; @@ -1533,7 +1537,7 @@ public class SystemTableView } else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); + sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); } } } 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 861d4665223..a189cd7b6a8 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 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2000, 2007 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 @@ -12,6 +12,7 @@ * * Contributors: * David Dykstal (IBM) - moved SystemPreferencesManager to a new package + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.widgets; @@ -21,16 +22,18 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; +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.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.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeEvents; 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; +import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -76,9 +79,9 @@ import org.eclipse.swt.widgets.Shell; * For a list of pre-defined categories, see {@link org.eclipse.rse.core.model.ISubSystemConfigurationCategories}. * */ -public class SystemHostCombo extends Composite implements ISelectionProvider, ISystemCombo, - org.eclipse.rse.model.ISystemResourceChangeListener, - ISystemResourceChangeEvents, DisposeListener +public class SystemHostCombo extends Composite implements ISelectionProvider, + ISystemCombo, ISystemResourceChangeListener, ISystemShellProvider, + DisposeListener { protected Label connectionLabel = null; protected Combo connectionCombo = null; @@ -917,14 +920,14 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, IS //Object parent = event.getParent(); switch ( type ) { - case EVENT_ADD: - case EVENT_ADD_RELATIVE: - case EVENT_DELETE_MANY: - case EVENT_RENAME: + case ISystemResourceChangeEvents.EVENT_ADD: + case ISystemResourceChangeEvents.EVENT_ADD_RELATIVE: + case ISystemResourceChangeEvents.EVENT_DELETE_MANY: + case ISystemResourceChangeEvents.EVENT_RENAME: if ( src instanceof IHost ) { // if RENAME, update showQualifiedNames in case it changed - if ( type == EVENT_RENAME ) + if ( type == ISystemResourceChangeEvents.EVENT_RENAME ) showQualifiedNames = SystemPreferencesManager.getQualifyConnectionNames(); refreshConnections(); 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 36e595cda97..6a496ebd17e 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 @@ -12,6 +12,7 @@ * * Contributors: * Uwe Stieber (Wind River) - Reworked new connection wizard extension point. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.ui.wizards.newconnection; @@ -33,12 +34,12 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemMessages; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java deleted file mode 100644 index a9172b1458b..00000000000 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java +++ /dev/null @@ -1,113 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, - * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.model; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Item; - -/** - * Interface of event sent when a remote system resource changes. - * These events are mainly for internal use. BPs/ISVs should instead - * fire and monitor for {@link org.eclipse.rse.core.model.ISystemModelChangeEvent}. - * @see org.eclipse.rse.model.ISystemResourceChangeEvents - */ -public interface ISystemResourceChangeEvent extends ISystemResourceChangeEvents -{ - /** - * Returns an object identifying the source of this event. - * - * @return an object identifying the source of this event - * @see java.util.EventObject - */ - public Object getSource(); - - /** - * For multi-target events, return the array of source targets. - */ - public Object[] getMultiSource(); - - /** - * Returns the parent of the object source. Only quaranteed to - * be set for additions and deletions. - * - * @return an object identifying the parent of the source of this event - */ - public Object getParent(); - /** - * Set the parent - */ - public void setParent(Object parent); - - /** - * Returns the grandparent of the object source. Only quaranteed to - * be set for special case events, which have a special contract with - * the SystemView - * - * @return an object identifying the grandparent of the source of this event - */ - public Object getGrandParent(); - /** - * Return the position value. Used in ADD events. - * @return position to add the new item to. A negative number indicates an append operation - */ - public int getPosition(); - /** - * Set the position value. Used in ADD events. - * @param position zero-based position to insert the new item. A negative number indicates an append operation - */ - public void setPosition(int position); - - /** - * For relative add events, return the previous node this is being added after - */ - public Object getRelativePrevious(); - /** - * For relative add events, set the previous node this is being added after - */ - public void setRelativePrevious(Object previousObject); - - /** - * Returns the type of the event. - * @see org.eclipse.rse.model.ISystemResourceChangeEvents - * @return a type that is one of the constants in this interface - */ - public int getType(); - /** - * Set the type - * @see org.eclipse.rse.model.ISystemResourceChangeEvents - */ - public void setType(int type); - - /** - * Set the originating viewer. For some events, this allows responding viewers to decide if the event applies to them - */ - public void setOriginatingViewer(Viewer viewer); - /** - * Get the originating viewer. For some events, this allows responding viewers to decide if the event applies to them - */ - public Viewer getOriginatingViewer(); - - /** - * Set the viewer Item of the currently selected object. This is a clue when we want to - * expand and select only the specific instance of this widget in this view. - */ - public void setViewerItem(Item item); - /** - * Get the viewer Item of the currently selected object. This is a clue when we want to - * expand and select only the specific instance of this widget in this view. - */ - public Item getViewerItem(); -} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java deleted file mode 100644 index 8643d5580be..00000000000 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2004, 2006 IBM Corporation. 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, - * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.model; - -import org.eclipse.rse.core.model.ISystemContentsType; - -/** - * Represents contents that are children of a container - */ -public class SystemFilterStringContentsType implements ISystemContentsType -{ - public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents"; //$NON-NLS-1$ - public static SystemFilterStringContentsType _instance = new SystemFilterStringContentsType(); - - public static SystemFilterStringContentsType getInstance() - { - return _instance; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#getType() - */ - public String getType() - { - return CONTENTS_TYPE_CHILDREN_PARENTS; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.model.IRemoteContentsType#isPersistent() - */ - public boolean isPersistent() - { - return false; - } - -} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemHostPool.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemHostPool.java index 644d74231e0..7756738c5cb 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemHostPool.java @@ -15,9 +15,10 @@ * - moved SystemsPreferencesManager to a new plugin * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * David Dykstal (IBM) - 142806: refactoring persistence framework + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.ui.internal.model; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java index c5eae150460..b48d1b16942 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.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,10 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.ui.internal.model; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -30,12 +30,12 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; +import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.rse.ui.view.ISystemViewRunnableObject; import org.eclipse.swt.widgets.Shell; @@ -100,7 +100,7 @@ public class SystemNewConnectionPromptObject implements ISystemPromptableObject, } /* (non-Javadoc) - * @see org.eclipse.rse.model.ISystemPromptableObject#getSystemTypes() + * @see org.eclipse.rse.ui.model.ISystemPromptableObject#getSystemTypes() */ public IRSESystemType[] getSystemTypes() { IRSESystemType[] types = systemTypes; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPostableEventNotifier.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemPostableEventNotifier.java similarity index 86% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPostableEventNotifier.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemPostableEventNotifier.java index e226ae8af64..d18dedd6c76 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPostableEventNotifier.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemPostableEventNotifier.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,12 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.internal.model; -import org.eclipse.rse.model.ISystemResourceChangeEvent; -import org.eclipse.rse.model.ISystemResourceChangeListener; +package org.eclipse.rse.ui.internal.model; +import org.eclipse.rse.core.events.ISystemResourceChangeEvent; +import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.swt.widgets.Display; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRegistry.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java index e456775224c..80915521538 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java @@ -18,10 +18,10 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * David Dykstal (IBM) - 142806: refactoring persistence framework * Tobias Schwarz (Wind River) - [183134] getLocalHost() does not return Local + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; -import java.io.File; +package org.eclipse.rse.ui.internal.model; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -38,6 +38,17 @@ import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.events.ISystemModelChangeEvent; +import org.eclipse.rse.core.events.ISystemModelChangeEvents; +import org.eclipse.rse.core.events.ISystemModelChangeListener; +import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent; +import org.eclipse.rse.core.events.ISystemPreferenceChangeListener; +import org.eclipse.rse.core.events.ISystemRemoteChangeEvent; +import org.eclipse.rse.core.events.ISystemRemoteChangeListener; +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.events.SystemResourceChangeEvent; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.core.filters.ISystemFilterReference; @@ -47,12 +58,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISubSystemConfigurationCategories; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemHostPool; -import org.eclipse.rse.core.model.ISystemModelChangeEvent; -import org.eclipse.rse.core.model.ISystemModelChangeEvents; -import org.eclipse.rse.core.model.ISystemModelChangeListener; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; -import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent; -import org.eclipse.rse.core.model.ISystemPreferenceChangeListener; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; @@ -66,15 +72,11 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.internal.core.filters.SystemFilterStartHere; +import org.eclipse.rse.internal.core.model.SystemModelChangeEvent; +import org.eclipse.rse.internal.core.model.SystemModelChangeEventManager; +import org.eclipse.rse.internal.core.model.SystemPreferenceChangeManager; import org.eclipse.rse.internal.core.model.SystemProfileManager; -import org.eclipse.rse.internal.model.SystemHostPool; -import org.eclipse.rse.internal.model.SystemModelChangeEvent; -import org.eclipse.rse.internal.model.SystemModelChangeEventManager; -import org.eclipse.rse.internal.model.SystemPostableEventNotifier; -import org.eclipse.rse.internal.model.SystemPreferenceChangeManager; -import org.eclipse.rse.internal.model.SystemRemoteChangeEventManager; -import org.eclipse.rse.internal.model.SystemResourceChangeManager; -import org.eclipse.rse.internal.model.SystemScratchpad; +import org.eclipse.rse.internal.core.model.SystemRemoteChangeEventManager; import org.eclipse.rse.internal.ui.view.SystemDNDTransferRunnable; import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; import org.eclipse.rse.internal.ui.view.SystemView; @@ -86,6 +88,8 @@ import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.model.ISystemRegistryUI; +import org.eclipse.rse.ui.model.SystemRemoteChangeEventUI; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.dnd.Clipboard; @@ -103,17 +107,17 @@ import org.eclipse.ui.part.ResourceTransfer; /** * Registry for all connections. */ -public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEvents, ISystemViewInputProvider +public class SystemRegistry implements ISystemRegistryUI, ISystemViewInputProvider { private static Exception lastException = null; - private static ISystemRegistry registry = null; + private static SystemRegistry registry = null; private SystemResourceChangeManager listenerManager = null; private SystemPreferenceChangeManager preferenceListManager = null; private SystemModelChangeEventManager modelListenerManager = null; private SystemModelChangeEvent modelEvent; private SystemRemoteChangeEventManager remoteListManager = null; - private SystemRemoteChangeEvent remoteEvent; + private SystemRemoteChangeEventUI remoteEvent; private int listenerCount = 0; private int modelListenerCount = 0; @@ -170,31 +174,32 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven * Return singleton instance. Must be used on first instantiate. * @param logfilePath Root folder. Where to place the log file. */ - public static ISystemRegistry getSystemRegistry(String logfilePath) + public static SystemRegistry getInstance(String logfilePath) { if (registry == null) new SystemRegistry(logfilePath); return registry; } + /** * Return singleton instance assuming it already exists. */ - public static ISystemRegistry getSystemRegistry() + public static SystemRegistry getInstance() { return registry; } - /** - * Ensure given path ends with path separator. - */ - public static String addPathTerminator(String path) - { - if (!path.endsWith(File.separator)) - { - path = path + File.separatorChar; - } - return path; - } +// /** +// * Ensure given path ends with path separator. +// */ +// public static String addPathTerminator(String path) +// { +// if (!path.endsWith(File.separator)) +// { +// path = path + File.separatorChar; +// } +// return path; +// } // ---------------------------------- // UI METHODS... @@ -751,7 +756,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven */ public void setShowNewHostPrompt(boolean show) { - fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, null)); + fireEvent(new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_REFRESH, null)); } // ---------------------------- @@ -821,7 +826,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven { //fireEvent(new SystemResourceChangeEvent(profile,ISystemResourceChangeEvent.EVENT_ADD,this)); } - fireModelChangeEvent(SYSTEM_RESOURCE_ADDED, SYSTEM_RESOURCETYPE_PROFILE, profile, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_PROFILE, + profile, null); return profile; } @@ -904,7 +912,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven if (namesQualifed) setQualifiedHostNames(namesQualifed); // causes refresh events to be fired - fireModelChangeEvent(SYSTEM_RESOURCE_RENAMED, SYSTEM_RESOURCETYPE_PROFILE, profile, oldName); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_RENAMED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_PROFILE, + profile, oldName); } /** * Copy a SystemProfile. All connections connection data is copied. @@ -1040,7 +1051,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven //if (makeActive) //setSystemProfileActive(newProfile, true); - fireModelChangeEvent(SYSTEM_RESOURCE_ADDED, SYSTEM_RESOURCETYPE_PROFILE, newProfile, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_PROFILE, + newProfile, null); SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Copy of system profile " + oldName + " to " + newName + " successful"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return newProfile; @@ -1081,9 +1095,12 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven getSystemProfileManager().deleteSystemProfile(profile, true); SystemPreferencesManager.setConnectionNamesOrder(); // update preferences order list if (connections.length > 0) // defect 42112 - fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(connections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this)); + fireEvent(new SystemResourceChangeEvent(connections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this)); - fireModelChangeEvent(SYSTEM_RESOURCE_REMOVED, SYSTEM_RESOURCETYPE_PROFILE, profile, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_PROFILE, + profile, null); } /** @@ -1163,19 +1180,22 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven { disconnectAllSubSystems(affectedConnections[idx]); } - SystemResourceChangeEvent event = new org.eclipse.rse.model.SystemResourceChangeEvent(affectedConnections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this); + SystemResourceChangeEvent event = new SystemResourceChangeEvent(affectedConnections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this); fireEvent(event); } } // add... else if ((affectedConnections != null) && (affectedConnections.length > 0)) { - SystemResourceChangeEvent event = new org.eclipse.rse.model.SystemResourceChangeEvent(affectedConnections, ISystemResourceChangeEvents.EVENT_ADD_MANY, this); + SystemResourceChangeEvent event = new SystemResourceChangeEvent(affectedConnections, ISystemResourceChangeEvents.EVENT_ADD_MANY, this); fireEvent(event); } SystemPreferencesManager.setConnectionNamesOrder(); // update preferences order list - fireModelChangeEvent(SYSTEM_RESOURCE_CHANGED, SYSTEM_RESOURCETYPE_PROFILE, profile, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_PROFILE, + profile, null); } // private profile methods... @@ -2003,7 +2023,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven String subSystemId = str.substring(0, subsystemDelim); String srcKey = str.substring(subsystemDelim + 1, str.length()); - ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); + ISystemRegistryUI registry = RSEUIPlugin.getTheSystemRegistry(); ISubSystem subSystem = registry.getSubSystem(subSystemId); if (subSystem != null) { @@ -2339,7 +2359,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven event.setType(ISystemResourceChangeEvents.EVENT_ADD); } fireEvent(event); - fireModelChangeEvent(SYSTEM_RESOURCE_ADDED, SYSTEM_RESOURCETYPE_CONNECTION, conn, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_CONNECTION, + conn, null); for (int s = 0; s < subSystems.length; s++) { @@ -2533,10 +2556,13 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven return; } boolean skipUpdate = (defaultUserIdChanged && !hostNameChanged && !connectionNameChanged); - if (!skipUpdate) fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent( + if (!skipUpdate) fireEvent(new SystemResourceChangeEvent( //conn,ISystemResourceChangeEvent.EVENT_CHANGE,this)); conn, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, this)); // only update simple property sheet values here - if (!skipUpdate) fireModelChangeEvent(SYSTEM_RESOURCE_CHANGED, SYSTEM_RESOURCETYPE_CONNECTION, conn, null); + if (!skipUpdate) fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_CONNECTION, + conn, null); if (hostNameChanged || defaultUserIdChanged) { @@ -2599,7 +2625,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven } conn.getHostPool().deleteHost(conn); // delete from memory and from disk. SystemPreferencesManager.setConnectionNamesOrder(); // update preferences order list - fireModelChangeEvent(SYSTEM_RESOURCE_REMOVED, SYSTEM_RESOURCETYPE_CONNECTION, conn, null); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_REMOVED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_CONNECTION, + conn, null); } /** @@ -2636,7 +2665,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven */ conn.getHostPool().renameHost(conn, newName); // rename in memory and disk SystemPreferencesManager.setConnectionNamesOrder(); // update preferences order list - fireModelChangeEvent(SYSTEM_RESOURCE_RENAMED, SYSTEM_RESOURCETYPE_CONNECTION, conn, oldName); + fireModelChangeEvent( + ISystemModelChangeEvents.SYSTEM_RESOURCE_RENAMED, + ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_CONNECTION, + conn, oldName); } /** @@ -2663,7 +2695,10 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven fireEvent(event); // fire new model change event, which BPs might listen for... for (int idx=0; idx + * This version calls fireEvent at the next reasonable opportunity, leveraging SWT's + * Display.asyncExec() method. + */ + public void postEvent(ISystemResourceChangeEvent event); + + /** + * Notify a specific listener of a change to a system resource such as a connection. + *

+ * This version calls fireEvent at the next reasonable opportunity, leveraging SWT's + * Display.asyncExec() method. + */ + public void postEvent(ISystemResourceChangeListener listener, ISystemResourceChangeEvent event); + + /** + * Notify all listeners of a change to a remote resource such as a file. + * This one takes the information needed and creates the event for you. + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} + * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter + * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. + * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be + * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. + * @param oldName - on a rename operation, this is the absolute name of the resource prior to the rename + * @param originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent. + * This saves sending a separate event to reveal and select the new created resource on a create event, for example. + */ + public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String oldName, Viewer originatingViewer); + + // ---------------------------------- + // ACTIVE PROGRESS MONITOR METHODS... + // ---------------------------------- + + /** + * Set the current active runnable context to be used for a progress monitor + * by the subsystem methods that go to the host. Called by wizards and dialogs + * that have a built-in progress monitor and hence removes the need to popup + * an intrusive pm dialog. + *

You must call clearRunnableContext when your dialog/wizard is disposed! + * @param shell The shell of the wizard/dialog. This is recorded so it can be tested if + * it is disposed before attempting to use the context + * @param context The dialog/wizard/view that implements IRunnableContext + */ + public void setRunnableContext(Shell shell, IRunnableContext context); + + /** + * Clear the current active runnable context to be used for a progress monitor. + * Be sure to call this from you dispose method. + */ + public void clearRunnableContext(); + + /** + * Return the current registered runnable context, or null if none registered. Use this + * for long running operations instead of an intrusive progress monitor dialog as it is + * more user friendly. Many dialogs/wizards have these built in so it behooves us to use it. + */ + public IRunnableContext getRunnableContext(); + +} diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistryUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemShellProvider.java similarity index 58% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistryUI.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemShellProvider.java index c2994e07d4e..c6402753db2 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistryUI.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemShellProvider.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 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,20 +11,22 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.ui.model; -import org.eclipse.rse.core.model.ISystemRegistry; -import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.widgets.Shell; /** - * Registry or front door for all remote system connections. + * Interface that viewers implement in order to give RSE actions + * access to the Shell in which they are embedded. */ -public interface ISystemRegistryUI extends ISystemRegistry { +public interface ISystemShellProvider { + + /** + * This method will be called to return the shell for your viewer. + * @return the shell for your viewer. + */ + public Shell getShell(); - /** - * Returns the clipboard used for copy actions - */ - public Clipboard getSystemClipboard(); } diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteChangeEventUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteChangeEventUI.java new file mode 100644 index 00000000000..da97bbb3428 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteChangeEventUI.java @@ -0,0 +1,90 @@ +/******************************************************************************** + * 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 + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. + * + * Contributors: + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + ********************************************************************************/ + +package org.eclipse.rse.ui.model; + +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.events.SystemRemoteChangeEvent; +import org.eclipse.rse.core.subsystems.ISubSystem; + +/** + * For listeners interested in changes with remote resources. + * These events are designed to state what the change to the resource was, not to + * optimize those events for a GUI (eg, a delete event versus a refresh event) + */ +public class SystemRemoteChangeEventUI extends SystemRemoteChangeEvent { + + private Viewer originatingViewer; + + /** + * Constructor for non-rename event + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} + * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter + * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. + * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be + * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. + */ + public SystemRemoteChangeEventUI(int eventType, Object resource, Object resourceParent, ISubSystem subsystem) + { + super(eventType, resource, resourceParent, subsystem); + } + + /** + * Constructor for a rename event. + * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents} + * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter + * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent. + * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be + * limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection. + * @param oldName - on a rename operation, this is the absolute name of the resource prior to the rename + */ + public SystemRemoteChangeEventUI(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String oldName) + { + super(eventType, resource, resourceParent, subsystem, oldName); + } + + /** + * Constructor you shouldn't use unless you intend to call the setters + */ + public SystemRemoteChangeEventUI() + { + } + + /** + * Set the originating viewer. + * Only this viewer is candidate for updating the selection. Eg, on a + * create event, if this and the resource parent is set, the newly + * created object is selected after the parent's contents are refreshed, + * for the originating viewer. + */ + public void setOriginatingViewer(Viewer originatingViewer) + { + this.originatingViewer = originatingViewer; + } + + + /** + * Get the originating viewer from which this remote resource change event + * comes from. The combination of this, if non-null, plus the resource parent, + * allows viewers to decide whether to update the selection within the + * parent resource, after refreshing that resource. + */ + public Viewer getOriginatingViewer() + { + return originatingViewer; + } + +} diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteElementResourceSet.java similarity index 92% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteElementResourceSet.java index e796cd9c594..67108787255 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemRemoteElementResourceSet.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 @@ -11,10 +11,10 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.ui.model; import java.util.List; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemResourceChangeEventUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemResourceChangeEventUI.java new file mode 100644 index 00000000000..cc08ef08759 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/SystemResourceChangeEventUI.java @@ -0,0 +1,102 @@ +/******************************************************************************** + * 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 + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. + * + * Contributors: + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + ********************************************************************************/ + +package org.eclipse.rse.ui.model; + +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.events.SystemResourceChangeEvent; +import org.eclipse.swt.widgets.Item; + +/** + * Event object sent to SystemResourceChangeListeners when a + * remote system object is created, changed, removed, etc. + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + */ +public class SystemResourceChangeEventUI extends SystemResourceChangeEvent { + + private static final long serialVersionUID = 1; + private Viewer originatingViewer; + private Item item; + + /** + * Constructor for SystemResourceChangeEvent. + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + * @param source The object that was added,deleted,renamed,changed. + * @param type The type of event, one of ISystemChangeEvent constants. + * @param parent The parent of the object that was added or deleted. + */ + public SystemResourceChangeEventUI(Object source, int type, Object parent) + { + super(source, type, parent); + } + + /** + * Constructor for SystemResourceChangeEvent when the source is multipe resources. + * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents + * @param source The array of objects that were added,deleted,renamed,changed. + * @param type The type of event, one of ISystemChangeEvent constants. + * @param parent The parent of the object that was added or deleted. + */ + public SystemResourceChangeEventUI(Object[] source, int type, Object parent) + { + super(source, type, parent); + } + + /** + * Set the originating viewer. + * For some events, this allows responding viewers to decide + * if the event applies to them. + * @param viewer the originating Viewer. + */ + public void setOriginatingViewer(Viewer viewer) + { + this.originatingViewer = viewer; + } + + /** + * Get the originating viewer. + * For some events, this allows responding viewers to decide + * if the event applies to them. + * @return the originating Viewer. + */ + public Viewer getOriginatingViewer() + { + return originatingViewer; + } + + /** + * Set the viewer Item of the currently selected object. + * This is a clue when we want to expand and select only the specific + * instance of this widget in this view. + * @param item the viewer item of the selected object. + */ + public void setViewerItem(Item item) + { + this.item = item; + } + + /** + * Get the viewer Item of the currently selected object. + * This is a clue when we want to expand and select only the specific + * instance of this widget in this view. + * @return the viewer item of the selected object. + */ + public Item getViewerItem() + { + return item; + } + +} diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml index 87e5758a8d1..18574761190 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml @@ -235,7 +235,7 @@ Contributors: