diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java index cd0ed325004..9550cb05afa 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java @@ -22,7 +22,7 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; public class DaytimeSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java index f82290144a4..b8ad0e89164 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java @@ -21,9 +21,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction; import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; import samples.RSESamplesPlugin; @@ -92,7 +92,7 @@ public class DeveloperSubSystemConfigurationAdapter extends /** * Override of parent method for returning the image for filters in our subsystem. - * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getSystemFilterImage(org.eclipse.rse.core.filters.ISystemFilter) + * @see org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter#getSystemFilterImage(org.eclipse.rse.core.filters.ISystemFilter) */ public ImageDescriptor getSystemFilterImage(ISystemFilter filter) { diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs index e4b68380c90..2e54f84b78f 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Thu Feb 15 10:06:44 CET 2007 +#Thu Feb 15 10:45:58 EST 2007 eclipse.preferences.version=1 encoding//src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties=8859_1 diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java index 8a8d52c5b69..3979a203301 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java @@ -33,6 +33,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog; import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; +import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.model.ISystemRemoteChangeEvents; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -48,7 +49,6 @@ import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog; import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemView; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java index b241df56199..b45aafaf26c 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java @@ -20,13 +20,13 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; -import org.eclipse.rse.ui.view.SystemActionViewerFilter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java index 8778e987271..cbfd1a2346f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java @@ -17,9 +17,9 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; -import org.eclipse.rse.ui.view.SystemActionViewerFilter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java index d238a5f1e3e..dd7146dd074 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java @@ -17,9 +17,9 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog; -import org.eclipse.rse.ui.view.SystemActionViewerFilter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java index 718d49c20bb..9fef168a245 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java @@ -18,8 +18,8 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; -import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider; public class SystemRemoteFileSelectionInputProvider extends diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java index 683e0cdb8c3..bccc3043027 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java @@ -17,9 +17,9 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; -import org.eclipse.rse.ui.view.SystemActionViewerFilter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java index 7e4f4032bfc..4d9db2252ad 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java @@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -26,7 +27,6 @@ import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteFolderForm.java index b72ed2715cc..8e6d0d653c9 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteFolderForm.java @@ -10,9 +10,9 @@ package org.eclipse.rse.files.ui.internal.search; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; +import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl; import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.view.SystemSelectRemoteObjectAPIProviderImpl; /** * The selection form to use is search selection dialogs. diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteObjectAPIProvider.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteObjectAPIProvider.java index 6aeb64efacd..2b4874c3273 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteObjectAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/internal/search/SystemSearchRemoteObjectAPIProvider.java @@ -15,9 +15,9 @@ import java.util.Vector; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl; import org.eclipse.rse.services.search.ISearchService; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; -import org.eclipse.rse.ui.view.SystemSelectRemoteObjectAPIProviderImpl; /** * This is the input provider for selection dialogs related to search. @@ -51,7 +51,7 @@ public class SystemSearchRemoteObjectAPIProvider extends SystemSelectRemoteObjec } /** - * @see org.eclipse.rse.ui.view.SystemSelectRemoteObjectAPIProviderImpl#getConnections() + * @see org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl#getConnections() */ protected Object[] getConnections() { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java index 9e6431f4469..6aa62424425 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java @@ -39,6 +39,7 @@ import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; +import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.GenericMessages; import org.eclipse.rse.ui.ISystemMessages; @@ -48,7 +49,6 @@ import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java index 3e154c2adfb..403a8400582 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java @@ -34,6 +34,8 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.internal.search.SystemSearchRemoteFolderAction; +import org.eclipse.rse.internal.ui.view.search.SystemSearchUI; +import org.eclipse.rse.internal.ui.view.search.SystemSearchViewPart; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; @@ -49,8 +51,6 @@ import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.search.SystemSearchUI; -import org.eclipse.rse.ui.view.search.SystemSearchViewPart; import org.eclipse.search.ui.ISearchPage; import org.eclipse.search.ui.ISearchPageContainer; import org.eclipse.swt.SWT; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java index 7539a2142de..c874e330afd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java @@ -36,11 +36,11 @@ import org.eclipse.rse.files.ui.actions.SystemNewFolderAction; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.files.ui.wizards.SystemFileNewConnectionWizardPage; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.model.ISystemRegistryUI; 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.view.SubSystemConfigurationAdapter; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java index 95951c65d9c..ba27e41c103 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java @@ -74,6 +74,9 @@ import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility; import org.eclipse.rse.filters.SystemFilterReference; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; +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; @@ -128,9 +131,6 @@ import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewDropDestination; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemDNDTransferRunnable; -import org.eclipse.rse.ui.view.SystemViewResources; -import org.eclipse.rse.ui.view.search.SystemSearchTableView; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -175,8 +175,6 @@ public class SystemViewRemoteFileAdapter //private SystemCommandAction commandAction, shellAction; private SystemSearchAction searchAction; - private SystemShowInTableAction showInTableAction; - private SystemShowInMonitorAction showInMonitorAction; private SystemExtractAction extractAction; private SystemExtractToAction extractToAction; private SystemConvertAction convertAction; @@ -429,16 +427,6 @@ public class SystemViewRemoteFileAdapter { copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard); } - /** FIXME - these show now be contributed via plugin.xml from the shells plugin - if (commandAction == null) - { - commandAction = new SystemCommandAction(shell, false, null); - } - if (shellAction == null) - { - shellAction = new SystemCommandAction(shell, true, null); - } - **/ if (searchAction == null) { searchAction = new SystemSearchAction(shell); @@ -455,15 +443,6 @@ public class SystemViewRemoteFileAdapter { replaceEditionAction = new SystemReplaceWithEditionAction(shell); } - if (showInTableAction == null) - { - showInTableAction = new SystemShowInTableAction(shell); - } - if (showInMonitorAction == null) - { - showInMonitorAction = new SystemShowInMonitorAction(shell); - } - if (canEdit && supportsSearch) { //menu.add(ISystemContextMenuConstants.GROUP_IMPORTEXPORT, addToArchiveAction); @@ -489,20 +468,6 @@ public class SystemViewRemoteFileAdapter { menu.add(menuGroup, pasteClipboardAction); } - menu.add(ISystemContextMenuConstants.GROUP_OPEN, showInTableAction); - - - menu.add(ISystemContextMenuConstants.GROUP_OPEN, showInMonitorAction); - - /** FIXME - shells now separate plugin - if (elementType == 1) - { - if (!isVirtual) - { - menu.add(menuGroup, shellAction); - } - } - */ } if (!firstFile.isRoot() && canEdit) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java index 4c4f683eaaf..f2d5a670e08 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java @@ -31,6 +31,7 @@ import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.actions.SystemRemoteFileSearchOpenWithMenu; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.shells.core.model.ISystemOutputRemoteTypes; @@ -46,7 +47,6 @@ import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index 8962bc455d3..ae64cb0015f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -34,6 +34,9 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.filters.SystemFilterSimple; +import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; +import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes; @@ -50,9 +53,6 @@ import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemPropertySheetForm; -import org.eclipse.rse.ui.view.SystemSelectRemoteObjectAPIProviderImpl; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java index dc532533318..29c2d0ac6f3 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java @@ -23,6 +23,7 @@ import java.util.Map; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.rse.files.ui.SystemFileTreeAndListGroup; import org.eclipse.rse.files.ui.actions.SystemSelectFileTypesAction; +import org.eclipse.rse.internal.ui.view.SystemViewLabelAndContentProvider; 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.RemoteFileRoot; @@ -31,7 +32,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.SystemViewLabelAndContentProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java index e29c855983b..1f9049a8166 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java @@ -22,9 +22,9 @@ import org.eclipse.jface.action.IAction; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.processes.ui.actions.SystemNewProcessFilterAction; import org.eclipse.rse.processes.ui.actions.SystemProcessUpdateFilterAction; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java index a7825c6e6f7..1146c66f09c 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java @@ -28,6 +28,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.rse.core.subsystems.ISubSystem; +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; @@ -45,7 +46,6 @@ 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.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.dnd.Clipboard; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java index a1e47ccce69..fe8f3808d02 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java @@ -23,6 +23,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; import org.eclipse.rse.shells.ui.RemoteCommandHelpers; import org.eclipse.rse.shells.ui.actions.SystemCommandAction; import org.eclipse.rse.shells.ui.actions.SystemExportShellHistoryAction; @@ -31,7 +32,6 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorView.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorView.java index 1a0aae6e2d2..2545f4bcd09 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorView.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorView.java @@ -18,12 +18,12 @@ package org.eclipse.rse.shells.ui.view; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; +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.subsystems.IRemoteError; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.SystemTableView; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java index ce45e6a52bc..3eb981139f8 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java @@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.subsystems.IRemoteLineReference; +import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; import org.eclipse.rse.model.ISystemResourceChangeEvent; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeListener; @@ -42,7 +43,6 @@ import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewProvider.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewProvider.java index f920e7bee33..e4d516f0073 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewProvider.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewProvider.java @@ -22,11 +22,11 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.subsystems.IRemoteLineReference; +import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; 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.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableViewProvider; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java index 2287773f747..ef12df65e2c 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java @@ -40,11 +40,11 @@ import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorUserActionCommand; -import org.eclipse.rse.ui.view.SystemViewMenuListener; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.VerifyKeyListener; 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 3e7663df60f..50983131e1b 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 @@ -20,6 +20,7 @@ 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.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; @@ -28,7 +29,6 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; import org.eclipse.rse.ui.ISystemThemeConstants; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.SystemTableView; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewProvider.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewProvider.java index 5c05a035a4c..5632bd4e310 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewProvider.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewProvider.java @@ -16,7 +16,7 @@ package org.eclipse.rse.shells.ui.view; -import org.eclipse.rse.ui.view.SystemTableViewProvider; +import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; public class SystemCommandsViewProvider extends SystemTableViewProvider { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteErrorAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteErrorAdapter.java index de6ca9a3b74..77a4984fa1c 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteErrorAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteErrorAdapter.java @@ -17,9 +17,9 @@ package org.eclipse.rse.shells.ui.view; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; import org.eclipse.rse.ui.SystemMenuManager; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; 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 7707bdc15f9..caf1ff28971 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 @@ -33,6 +33,8 @@ import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.files.ui.actions.SystemRemoteFileLineOpenWithMenu; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; +import org.eclipse.rse.internal.ui.view.SystemView; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.shells.ui.ShellResources; import org.eclipse.rse.shells.ui.actions.SystemShowInShellViewAction; import org.eclipse.rse.shells.ui.actions.SystemTerminateRemoveShellAction; @@ -56,8 +58,6 @@ import org.eclipse.rse.ui.view.ISystemEditableRemoteObject; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemView; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorDescriptor; 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 c99030c1f39..75d014a2e76 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 @@ -17,11 +17,11 @@ 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.subsystems.files.core.model.ISystemFileAPIProvider; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.SystemAbstractAPIProvider; /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java index 76f8874b0d0..4ad5153fbaa 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java @@ -442,7 +442,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur /** * Populate a new subsystem with our unique attributes, and/or create default filter references. * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#initializeSubSystem(ISubSystem,ISystemNewConnectionWizardPage[]) - * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) + * @see org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) */ protected void initializeSubSystem(ISubSystem ss, ISystemNewConnectionWizardPage[] yourNewConnectionWizardPages) { 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 f38f182af90..22815e75b61 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -26,6 +26,12 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.filters, org.eclipse.rse.internal.filters;x-internal:=true, org.eclipse.rse.internal.model;x-internal:=true, + org.eclipse.rse.internal.ui;x-internal:=true, + org.eclipse.rse.internal.ui.view;x-internal:=true, + org.eclipse.rse.internal.ui.view.monitor;x-internal:=true, + org.eclipse.rse.internal.ui.view.scratchpad;x-internal:=true, + org.eclipse.rse.internal.ui.view.search;x-internal:=true, + org.eclipse.rse.internal.ui.view.team;x-internal:=true, org.eclipse.rse.model, org.eclipse.rse.ui, org.eclipse.rse.ui.actions, @@ -39,10 +45,6 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.ui.propertypages, org.eclipse.rse.ui.validators, org.eclipse.rse.ui.view, - org.eclipse.rse.ui.view.monitor, - org.eclipse.rse.ui.view.scratchpad, - org.eclipse.rse.ui.view.search, - org.eclipse.rse.ui.view.team, org.eclipse.rse.ui.widgets, org.eclipse.rse.ui.widgets.services, org.eclipse.rse.ui.wizards diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSESystemTypeAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSESystemTypeAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java index e137d8e778b..9d6ae94c243 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSESystemTypeAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java @@ -13,7 +13,7 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.internal; +package org.eclipse.rse.internal.ui; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.rse.core.IRSESystemType; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSEUIRegistry.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIRegistry.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSEUIRegistry.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIRegistry.java index 84120367349..323bd56c075 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/internal/RSEUIRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIRegistry.java @@ -13,7 +13,7 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.internal; +package org.eclipse.rse.internal.ui; import org.eclipse.rse.ui.IRSEUIRegistry; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SafeTreeViewer.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SafeTreeViewer.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SafeTreeViewer.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SafeTreeViewer.java index 3c05dfc998f..f3c59111181 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SafeTreeViewer.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SafeTreeViewer.java @@ -8,7 +8,7 @@ * Contributors: * Uwe Stieber (Wind River) - initial API and implementation. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.IDelayedLabelDecorator; import org.eclipse.jface.viewers.TreeViewer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapter.java index 14798153529..73e8a06de55 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.Hashtable; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapterFactory.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapterFactory.java index 37651c43b9e..752e34c06cf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SubSystemConfigurationAdapterFactory.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java index 11df1ea555f..b902d6f0528 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; @@ -23,6 +23,9 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemActionViewerFilter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemActionViewerFilter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemActionViewerFilter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemActionViewerFilter.java index 8935025cf03..8a353c1e516 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemActionViewerFilter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemActionViewerFilter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +25,7 @@ import java.util.Set; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; /** * This class is a viewer filter that tests attributes of thise diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxCellEditor.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxCellEditor.java index add173b2175..f1b96270b09 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxCellEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxCellEditor.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.text.MessageFormat; import org.eclipse.jface.viewers.CellEditor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxPropertyDescriptor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxPropertyDescriptor.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxPropertyDescriptor.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxPropertyDescriptor.java index eb06f625e32..330483b0ffc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemComboBoxPropertyDescriptor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemComboBoxPropertyDescriptor.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java index 84ab34d08a5..2a8fea74450 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.List; @@ -46,6 +46,7 @@ import org.eclipse.rse.ui.GenericMessages; 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.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.progress.UIJob; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDecoratingLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDecoratingLabelProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDecoratingLabelProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDecoratingLabelProvider.java index d8aed0a7f48..8a4b187aebe 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDecoratingLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDecoratingLabelProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDeferredTableTreeContentManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDeferredTableTreeContentManager.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDeferredTableTreeContentManager.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDeferredTableTreeContentManager.java index 02d99d97a54..c61fa00014c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDeferredTableTreeContentManager.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDeferredTableTreeContentManager.java @@ -12,10 +12,11 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.ui.operations.SystemDeferredTreeContentManager; +import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDropActionDelegate.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDropActionDelegate.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDropActionDelegate.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDropActionDelegate.java index 4593f38711a..9af682f76b9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDropActionDelegate.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDropActionDelegate.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java index 31bb88970f6..788a8167ace 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java @@ -14,8 +14,9 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritablePropertyData.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritablePropertyData.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritablePropertyData.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritablePropertyData.java index 97c6e3fba3c..1ef8dc167ac 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritablePropertyData.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritablePropertyData.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.ui.SystemPropertyResources; /** * This class captures the data needed to populate a diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextCellEditor.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextCellEditor.java index 09f77f75ed8..82422818513 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextCellEditor.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.text.MessageFormat; import org.eclipse.core.runtime.Assert; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextPropertyDescriptor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextPropertyDescriptor.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextPropertyDescriptor.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextPropertyDescriptor.java index d3893b9d0fb..c46c86f6b60 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextPropertyDescriptor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemInheritableTextPropertyDescriptor.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemLongRunningRequestEvent.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemLongRunningRequestEvent.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemLongRunningRequestEvent.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemLongRunningRequestEvent.java index 4c620cd8b35..c984e45302b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemLongRunningRequestEvent.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemLongRunningRequestEvent.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.swt.widgets.Event; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveHelpers.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveHelpers.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveHelpers.java index 4df797bfcdc..c19e9e184c5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveHelpers.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IViewPart; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveLayout.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveLayout.java index ec3818ba610..92caeacf15f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPerspectiveLayout.java @@ -14,12 +14,12 @@ * Martin Oberhuber (Wind River) - Fix 164628: get rid of dependency to debug.ui ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; -import org.eclipse.rse.ui.view.scratchpad.SystemScratchpadViewPart; -import org.eclipse.rse.ui.view.team.SystemTeamViewPart; +import org.eclipse.rse.internal.ui.view.scratchpad.SystemScratchpadViewPart; +import org.eclipse.rse.internal.ui.view.team.SystemTeamViewPart; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPropertySheetForm.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPropertySheetForm.java index 64ba8907997..4a5ebae9d70 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemPropertySheetForm.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.ISelection; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.swt.events.KeyAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResolveFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResolveFilterStringAPIProviderImpl.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java index eb3bdc0914b..ee27593a48c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResolveFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.subsystems.ISubSystem; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java index 87a0bd603fd..c9a6f878f9f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionForm.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.HashMap; import java.util.Iterator; @@ -37,6 +37,8 @@ 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.validators.IValidatorRemoteSelection; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java index c0181d93538..f2cb796387b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResourceSelectionInputProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index acc22f5ac31..08d4814a404 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.SystemAdapterHelpers; @@ -27,6 +27,10 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.filters.SystemFilterSimple; import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java index 8a6c7811f5b..d8e8aadb0c2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; @@ -78,6 +78,12 @@ import org.eclipse.rse.ui.actions.SystemShowInTableAction; import org.eclipse.rse.ui.actions.SystemSubMenuManager; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.SystemMessageDialog; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ContextObject; +import org.eclipse.rse.ui.view.IContextObject; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemSelectAllTarget; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.dnd.DND; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java index 5d843032a66..2a690db8f9c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -36,6 +36,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.ui.view.IContextObject; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java index 31648265898..6c430f48e1c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewColumnManager.java @@ -14,11 +14,12 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.HashMap; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemPreferencesManager; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewFilter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewFilter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewFilter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewFilter.java index 78cce057eb3..c858d68e0f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewFilter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewFilter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TableViewer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java index ed1e339915d..10771ee2039 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java @@ -14,7 +14,7 @@ * Michael Berger (IBM) - 146339 Added refresh action graphic. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.net.MalformedURLException; import java.net.URL; @@ -72,6 +72,9 @@ 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.view.IRSEViewPart; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java index 49ded4fd57d..162b9f3ba46 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -34,6 +34,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.model.ISystemContainer; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -142,12 +143,14 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi public Object[] getElements(Object object) { Object[] results = null; - if (object == _lastObject && _lastResults != null) + /* + if (object == _lastObject && (_lastResults != null && _lastResults.length > 0) { return _lastResults; } else if (object instanceof IAdaptable) + */ { ISystemViewElementAdapter adapter = getAdapterFor(object); if (adapter != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewSorter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewSorter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java index 3d892348c63..6ea93a1d6ff 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewSorter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewSorter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Date; @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java index 7ee39e73bd0..d43dd2f9e0e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; @@ -23,6 +23,7 @@ import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForConnections.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForConnections.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java index 7de2e6b0cdf..ebabf1601f1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForConnections.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.model.IHost; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterPools.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterPools.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java index fa3c38cfe91..eab0de999e0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterPools.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.model.IHost; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java index c4f0cb344c7..639ac8cc887 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilterStrings.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java index a3cf061a9e3..954a4c5dbab 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilter; @@ -34,6 +34,7 @@ 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.view.ISystemViewInputProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForSubSystems.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForSubSystems.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java index a3c7dcb4191..55df5570a1a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForSubSystems.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java index fee1c6c7e7f..221bb81b0b1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterManager; @@ -29,12 +29,15 @@ 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.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.team.SystemTeamViewCategoryAdapter; -import org.eclipse.rse.ui.view.team.SystemTeamViewCategoryNode; -import org.eclipse.rse.ui.view.team.SystemTeamViewProfileAdapter; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationAdapter; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode; +import org.eclipse.rse.ui.view.ISystemDragDropAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewCompositeActionGroup.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewCompositeActionGroup.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewCompositeActionGroup.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewCompositeActionGroup.java index 148b7fc7c42..0fa8f766f19 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewCompositeActionGroup.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewCompositeActionGroup.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IMenuManager; import org.eclipse.ui.IActionBars; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java index 9d22ac6662d..f34a8f8bea9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -46,6 +46,11 @@ import org.eclipse.rse.ui.actions.SystemNewConnectionFromExistingConnectionActio import org.eclipse.rse.ui.actions.SystemWorkOfflineAction; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorSpecialChar; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemMementoConstants; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionSelectionInputProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java index d43aa10630f..62117bfab8f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewConnectionSelectionInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java @@ -14,11 +14,12 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +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.view.ISystemViewInputProvider; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDragAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDragAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java index f1c22faa4f3..3045b70f435 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDragAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDragAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Iterator; @@ -26,6 +26,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; 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; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSourceAdapter; import org.eclipse.swt.dnd.DragSourceEvent; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java index 40ebd948f50..38ae8d78479 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDropAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDataDropAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.List; @@ -36,6 +36,7 @@ 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.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/ui/view/SystemViewDummyObject.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDummyObject.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDummyObject.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDummyObject.java index 897d0f59cd4..a1dbb6ffe32 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDummyObject.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewDummyObject.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; /** * Sometimes we need to supply a dummy object in our events just to prevent a crash. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java index f745ff80e7c..c3011290dc7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -47,6 +47,10 @@ import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolAdapter.java index 67862d0221c..436124c77bf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -32,6 +32,9 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java index 9960a52286c..5e227d044bd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -34,6 +34,10 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterPoolName; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemMementoConstants; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index 020f7d06ac0..6da73e4fdfc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; @@ -55,6 +55,12 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorFilterName; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemMementoConstants; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterStringAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterStringAdapter.java index f9fca5bec00..2c1b5148846 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterStringAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -30,6 +30,9 @@ import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewForm.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java index 04258f31b6d..1d891fbcf3b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Vector; import org.eclipse.jface.action.ToolBarManager; @@ -28,6 +28,9 @@ import org.eclipse.rse.ui.actions.SystemCascadingPulldownMenuAction; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.view.ISystemLongRunningRequestListener; +import org.eclipse.rse.ui.view.ISystemTree; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java index 23f37c94c9a..5c5e1e4dcce 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.Collection; @@ -39,6 +39,10 @@ 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.operations.SystemDeferredTreeContentManager; +import org.eclipse.rse.ui.view.IContextObject; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.model.IWorkbenchAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMenuListener.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMenuListener.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java index 371466cd5fc..9c3d1861e43 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMenuListener.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMessageAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMessageAdapter.java index a464367271e..d7981d07754 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMessageAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; @@ -23,6 +23,8 @@ import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewNewConnectionPromptAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewNewConnectionPromptAdapter.java similarity index 90% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewNewConnectionPromptAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewNewConnectionPromptAdapter.java index e4fa0b699ce..615f57d0e79 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewNewConnectionPromptAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewNewConnectionPromptAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Shell; public class SystemViewNewConnectionPromptAdapter extends SystemViewPromptableAdapter { /** - * @see org.eclipse.rse.ui.view.SystemViewPromptableAdapter#getRunAction(org.eclipse.swt.widgets.Shell) + * @see org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter#getRunAction(org.eclipse.swt.widgets.Shell) */ protected SystemRunAction getRunAction(Shell shell) { return (new SystemRunAction(SystemResources.ACTION_NEWCONN_LABEL, SystemResources.ACTION_NEWCONN_TOOLTIP, diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index 11d16babc1e..c1cb6e33626 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.ArrayList; import java.util.Enumeration; @@ -78,6 +78,12 @@ import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.rse.ui.actions.SystemStartCommunicationsDaemonAction; import org.eclipse.rse.ui.actions.SystemWorkWithProfilesAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.view.IRSEViewPart; +import org.eclipse.rse.ui.view.ISystemMementoConstants; +import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; +import org.eclipse.rse.ui.view.ISystemShellProvider; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ScrollBar; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartFrameSource.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartFrameSource.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartFrameSource.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartFrameSource.java index 1b69fea34e9..af84876d3e5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartFrameSource.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartFrameSource.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.ui.views.framelist.TreeFrame; import org.eclipse.ui.views.framelist.TreeViewerFrameSource; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartGotoActionGroup.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartGotoActionGroup.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartGotoActionGroup.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartGotoActionGroup.java index e75f688327f..c7ff9e00c45 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartGotoActionGroup.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPartGotoActionGroup.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPromptableAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPromptableAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java index 75ac918586a..b9fd7ec53cb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPromptableAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPromptableAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; @@ -22,6 +22,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemRunAction; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java index 93506999ecc..9564a0e4b4b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.osgi.util.NLS; @@ -23,7 +23,7 @@ import org.eclipse.osgi.util.NLS; * Constants used throughout the SystemView plugin */ public class SystemViewResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.ui.view.SystemViewResources"; //$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.ui.view.SystemViewResources"; //$NON-NLS-1$ // ------------------------- // Property names... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewRootInputAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewRootInputAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java index e7817565915..4199b3edf6d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewRootInputAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; @@ -26,6 +26,9 @@ import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.ISystemValidator; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java index 4c6cea1e0c9..ed39a9ae821 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import java.util.List; @@ -27,6 +27,10 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; 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.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java index f18fe4a72e6..79297613861 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IAction; @@ -32,6 +32,10 @@ import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorPortInput; +import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; +import org.eclipse.rse.ui.view.ISystemMementoConstants; +import org.eclipse.rse.ui.view.ISystemPropertyConstants; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/BrowseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/BrowseAction.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/BrowseAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/BrowseAction.java index c773e65d3cf..235dedcbe0b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/BrowseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/BrowseAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearAction.java index c8c9f535def..eeefb6c6027 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearSelectedAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearSelectedAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearSelectedAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearSelectedAction.java index a63128ae525..7edcbaa4e25 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/ClearSelectedAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/ClearSelectedAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.core.runtime.IAdaptable; 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/view/monitor/MonitorViewPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java similarity index 94% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewPage.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java index a55b56ad69e..47646b59f5a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; @@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; import org.eclipse.rse.model.ISystemRegistryUI; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; @@ -44,8 +45,7 @@ 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.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableTreeView; -import org.eclipse.rse.ui.view.SystemTableTreeViewProvider; +import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.rse.ui.widgets.ISystemCollapsableSectionListener; import org.eclipse.rse.ui.widgets.SystemCollapsableSection; import org.eclipse.swt.SWT; @@ -65,8 +65,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Scale; +import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.IActionBars; import org.eclipse.ui.part.CellEditorActionHandler; @@ -207,14 +207,14 @@ FocusListener public void run() { - SystemTableTreeView view = _viewer; - view.getTree().selectAll(); + SystemTableView view = _viewer; + view.getTable().selectAll(); view.setSelection(view.getSelection()); } } - private SystemTableTreeView _viewer; + private SystemTableView _viewer; private boolean _isPolling = false; private int _pollingInterval; @@ -320,11 +320,11 @@ FocusListener { if (!flag) { - Tree tree = _viewer.getTree(); + Table table = _viewer.getTable(); Color bgcolour = _tabFolderPage.getBackground(); - tree.setBackground(bgcolour); + table.setBackground(bgcolour); } } @@ -419,11 +419,11 @@ FocusListener parent.setLayout(gridLayout); // create table portion - //Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); - //_viewer = new SystemTableView(table, _viewPart); + Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); + _viewer = new SystemTableView(table, _viewPart); - Tree tree = new Tree(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); - _viewer = new SystemTableTreeView(tree, _viewPart); + //Tree tree = new Tree(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); + //_viewer = new SystemTableTreeView(tree, _viewPart); _viewer.addDoubleClickListener(new IDoubleClickListener() { @@ -439,11 +439,11 @@ FocusListener //TableLayout layout = new TableLayout(); //tree.setLayout(layout); //tree.setLayout(new GridLayout()) - tree.setHeaderVisible(false); - tree.setLinesVisible(false); + table.setHeaderVisible(false); + table.setLinesVisible(false); GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL); - tree.setLayoutData(gridData); + table.setLayoutData(gridData); createPollControls(_tabFolderPage); } @@ -518,7 +518,7 @@ FocusListener } } - public SystemTableTreeView getViewer() + public SystemTableView getViewer() { return _viewer; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java index 504d04d0286..93ab05fe09a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java @@ -14,12 +14,12 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableTreeView; +import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; @@ -175,7 +175,7 @@ public class MonitorViewWorkbook extends Composite return null; } - public SystemTableTreeView getViewer() + public SystemTableView getViewer() { if (getCurrentTabItem() != null) { @@ -227,7 +227,7 @@ public class MonitorViewWorkbook extends Composite monitorViewPage.setInput(root); - SystemTableTreeView viewer = monitorViewPage.getViewer(); + SystemTableView viewer = monitorViewPage.getViewer(); _viewPart.getSite().setSelectionProvider(viewer); _viewPart.getSite().registerContextMenu(viewer.getContextMenuManager(), viewer); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorUI.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorUI.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorUI.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorUI.java index d1fcb46f043..edc93d02fc5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorUI.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorUI.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.ui.IWorkbenchPage; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java index 86da05c922d..0834cc36597 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/SystemMonitorViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java @@ -14,7 +14,7 @@ * Michael Berger (IBM) - 146339 Added refresh action graphic. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import java.util.ArrayList; import java.util.Vector; @@ -30,6 +30,8 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; import org.eclipse.rse.core.model.ISystemContainer; +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; @@ -47,9 +49,7 @@ import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableTreeView; -import org.eclipse.rse.ui.view.SystemTableTreeViewProvider; -import org.eclipse.rse.ui.view.SystemTableViewColumnManager; +import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -590,7 +590,7 @@ class SubSetAction extends BrowseAction } public void run() { - SystemTableTreeView viewer = getViewer(); + SystemTableView viewer = getViewer(); SystemTableViewColumnManager mgr = viewer.getColumnManager(); ISystemViewElementAdapter adapter = viewer.getAdapterForContents(); SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr); @@ -634,7 +634,7 @@ class SubSetAction extends BrowseAction return _folder.getShell(); } - public SystemTableTreeView getViewer() + public SystemTableView getViewer() { return _folder.getViewer(); } @@ -802,7 +802,7 @@ class SubSetAction extends BrowseAction { Object child = event.getSource(); - SystemTableTreeView viewer = getViewer(); + SystemTableView viewer = getViewer(); if (viewer != null) { Object input = viewer.getInput(); @@ -856,7 +856,7 @@ class SubSetAction extends BrowseAction Object child = event.getResource(); - SystemTableTreeView viewer = getViewer(); + SystemTableView viewer = getViewer(); if (viewer != null) { Object input = viewer.getInput(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/TabFolderLayout.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/TabFolderLayout.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/TabFolderLayout.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/TabFolderLayout.java index 7b3493d154f..04182af8986 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/TabFolderLayout.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/TabFolderLayout.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.monitor; +package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/BrowseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/BrowseAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java index 6dab5756b69..88f3eb6fe52 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/BrowseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/BrowseAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +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; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java index 35f9e44209f..56b10095f7d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearAction.java @@ -15,7 +15,7 @@ ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +package org.eclipse.rse.internal.ui.view.scratchpad; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.ui.ISystemIconConstants; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearSelectedAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearSelectedAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java index 311cfc53b4a..aed8c3ab868 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/ClearSelectedAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/ClearSelectedAction.java @@ -15,7 +15,7 @@ ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +package org.eclipse.rse.internal.ui.view.scratchpad; import java.util.Iterator; import org.eclipse.jface.viewers.StructuredSelection; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java index 7bec3a7e3ce..5e8fcb95bad 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +package org.eclipse.rse.internal.ui.view.scratchpad; import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; @@ -50,6 +50,10 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.references.IRSEBaseReferencingObject; import org.eclipse.rse.core.subsystems.ISubSystem; +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; @@ -80,10 +84,6 @@ import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemSelectAllTarget; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemView; -import org.eclipse.rse.ui.view.SystemViewDataDragAdapter; -import org.eclipse.rse.ui.view.SystemViewDataDropAdapter; -import org.eclipse.rse.ui.view.SystemViewMenuListener; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.dnd.DND; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java index d6331caf582..6054c1eaeed 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +package org.eclipse.rse.internal.ui.view.scratchpad; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.action.IMenuManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewProvider.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewProvider.java index b5905bdb635..1cfad2e51e4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.scratchpad; +package org.eclipse.rse.internal.ui.view.scratchpad; import java.util.Hashtable; import java.util.Map; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchClearHistoryAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchClearHistoryAction.java index 8e57c9415ec..22cf1c21502 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchClearHistoryAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; 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/view/search/SystemSearchCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchCopyToClipboardAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchCopyToClipboardAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchCopyToClipboardAction.java index 3c1c99cb3a3..728a07d4778 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchCopyToClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchCopyToClipboardAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchHistoryAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchHistoryAction.java index d5cb56c4c4c..3558fb6708d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchHistoryAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveAllMatchesAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveAllMatchesAction.java index 6ff05e1ffe8..168fc7ab459 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveAllMatchesAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; 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/view/search/SystemSearchRemoveSelectedMatchesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java index bf612a096af..65ef5f99a64 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; 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/view/search/SystemSearchTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java index 8f545b04302..1e2b0e5ca31 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableView.java @@ -14,11 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import java.util.Vector; 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; @@ -28,9 +31,6 @@ import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemDecoratingLabelProvider; -import org.eclipse.rse.ui.view.SystemTableTreeView; -import org.eclipse.rse.ui.view.SystemTableTreeViewProvider; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Widget; @@ -369,7 +369,7 @@ public class SystemSearchTableView extends SystemTableTreeView /** * Does nothing. - * @see org.eclipse.rse.ui.view.SystemTableTreeView#handleKeyPressed(org.eclipse.swt.events.KeyEvent) + * @see org.eclipse.rse.internal.ui.view.SystemTableTreeView#handleKeyPressed(org.eclipse.swt.events.KeyEvent) */ protected void handleKeyPressed(KeyEvent event) { } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableViewProvider.java similarity index 88% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableViewProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableViewProvider.java index 992e7f45987..d4bcbf0ef6e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableViewProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchTableViewProvider.java @@ -14,10 +14,10 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; -import org.eclipse.rse.ui.view.SystemTableTreeViewProvider; -import org.eclipse.rse.ui.view.SystemTableViewColumnManager; +import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider; +import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager; public class SystemSearchTableViewProvider extends SystemTableTreeViewProvider { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchUI.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchUI.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchUI.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchUI.java index 663da94ff2e..9bd4f059e62 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchUI.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchUI.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.ui.PartInitException; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewContentProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java index e6f3b6ba2a0..46b2e02e836 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewContentProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewLabelProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java index a8eee8db1c5..5e2977d2268 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewLabelProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java index 4ca821a3787..7c914b69d72 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.search; +package org.eclipse.rse.internal.ui.view.search; import java.util.ArrayList; import java.util.Iterator; @@ -40,6 +40,8 @@ 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.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; @@ -58,8 +60,6 @@ import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemRemoveElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableTreeViewProvider; -import org.eclipse.rse.ui.view.SystemView; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemResourceAdaptableProfile.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemResourceAdaptableProfile.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemResourceAdaptableProfile.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemResourceAdaptableProfile.java index 7bcd0b77d4e..d64ce8c5603 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemResourceAdaptableProfile.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemResourceAdaptableProfile.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamView.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java index 1897c9352e1..6f54fc3936d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamView.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import java.util.Vector; import org.eclipse.jface.viewers.AbstractTreeViewer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewActiveProfileAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java index 0a6928308db..20ca8143cb9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewActiveProfileAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; @@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.Shell; * The action allows users to activate/de-activate a selected profile. * @deprecated * TODO: delete this action after next MRI rev, as it will be replaced by - * {@link org.eclipse.rse.ui.view.team.SystemTeamViewActiveProfileAction} and - * {@link org.eclipse.rse.ui.view.team.SystemTeamViewMakeInActiveProfileAction}. + * {@link org.eclipse.rse.internal.ui.view.team.SystemTeamViewActiveProfileAction} and + * {@link org.eclipse.rse.internal.ui.view.team.SystemTeamViewMakeInActiveProfileAction}. */ public class SystemTeamViewActiveProfileAction extends SystemBaseAction diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java index 2567e79e4a3..b1907063948 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import java.util.Vector; import org.eclipse.core.runtime.IAdaptable; @@ -25,12 +25,12 @@ import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryNode.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryNode.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryNode.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryNode.java index 403a80a2166..ab8335d6270 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryNode.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewCategoryNode.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java index 1161539f047..cdafcf3327a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewInputProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java index 7a4390f7385..cc08fa2564e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewLabelProvider.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java index d2d4b1623d8..a4f596fe01a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import java.util.Collection; import java.util.Hashtable; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeActiveProfileAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java index ed91464a68b..2d1332b47da 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeActiveProfileAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java index 458d707b7a1..9df1bdde60c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewMakeInActiveProfileAction.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java index ef405cec265..d393aa9fe1d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import java.net.MalformedURLException; import java.net.URL; @@ -66,6 +66,8 @@ 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.subsystems.ISubSystemConfiguration; +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; @@ -88,8 +90,6 @@ import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemMementoConstants; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewMenuListener; -import org.eclipse.rse.ui.view.SystemViewPart; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java index debd2b13139..9810d0ce0bf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewProfileAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import java.util.Hashtable; import org.eclipse.core.runtime.IAdaptable; @@ -24,6 +24,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.model.ISystemProfile; +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; @@ -39,7 +40,6 @@ import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemMementoConstants; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewRefreshAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewRefreshAllAction.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewRefreshAllAction.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewRefreshAllAction.java index b2ba2831b72..5a54030b1d8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewRefreshAllAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewRefreshAllAction.java @@ -14,7 +14,7 @@ * Michael Berger (IBM) - 146339 Added refresh action graphic. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemResourceManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewResourceAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewResourceAdapterFactory.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewResourceAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewResourceAdapterFactory.java index bdfa5c26da0..43c24131311 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewResourceAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewResourceAdapterFactory.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java index f5e82e29301..b09a397adbd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; @@ -23,12 +23,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.filters.actions.SystemFilterWorkWithFilterPoolsAction; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java index 87cba6ccece..b360ecd2f51 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewSubSystemConfigurationNode.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.ui.view.team; +package org.eclipse.rse.internal.ui.view.team; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; 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 a93c4b2f4c0..5ac59b1276c 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 @@ -42,6 +42,11 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.internal.model.SystemProfileManager; +import org.eclipse.rse.internal.ui.RSESystemTypeAdapterFactory; +import org.eclipse.rse.internal.ui.RSEUIRegistry; +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; @@ -54,11 +59,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.ui.actions.ISystemDynamicPopupMenuExtension; import org.eclipse.rse.ui.actions.SystemDynamicPopupMenuExtensionManager; import org.eclipse.rse.ui.actions.SystemShowPreferencesPageAction; -import org.eclipse.rse.ui.internal.RSESystemTypeAdapterFactory; -import org.eclipse.rse.ui.internal.RSEUIRegistry; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapterFactory; -import org.eclipse.rse.ui.view.SystemViewAdapterFactory; -import org.eclipse.rse.ui.view.team.SystemTeamViewResourceAdapterFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java index 662997f000c..6db7f717b02 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java @@ -26,7 +26,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.rse.ui.view.SystemViewMenuListener; +import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.swt.widgets.Shell; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingGoToAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingGoToAction.java index 4e9389ed7c9..a207e3ed027 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingGoToAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingGoToAction.java @@ -16,9 +16,9 @@ package org.eclipse.rse.ui.actions; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.rse.internal.ui.view.SystemViewPart; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.view.SystemViewPart; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.framelist.BackAction; import org.eclipse.ui.views.framelist.ForwardAction; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingPulldownMenuAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingPulldownMenuAction.java index 5a0a6f6f960..29ae23d58fe 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingPulldownMenuAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingPulldownMenuAction.java @@ -19,10 +19,10 @@ import org.eclipse.jface.action.IMenuCreator; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.rse.internal.ui.view.SystemViewPart; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.view.SystemViewPart; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java index 9869f1ede3b..e0900170fe7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java @@ -23,6 +23,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemDropActionDelegate; +import org.eclipse.rse.internal.ui.view.SystemViewDataDropAdapter; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -30,8 +32,6 @@ import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemDropActionDelegate; -import org.eclipse.rse.ui.view.SystemViewDataDropAdapter; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java index c04c1561ee9..2ea1c2148fe 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java @@ -17,11 +17,11 @@ package org.eclipse.rse.ui.actions; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.rse.internal.ui.view.team.SystemTeamView; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.view.team.SystemTeamView; import org.eclipse.rse.ui.wizards.SystemNewProfileWizard; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenRSEPerspectiveAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenRSEPerspectiveAction.java index 4cde0964570..60092737f50 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenRSEPerspectiveAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemOpenRSEPerspectiveAction.java @@ -17,7 +17,7 @@ package org.eclipse.rse.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; /** 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 93e2713e1f7..6e38bf0f362 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 @@ -27,6 +27,7 @@ 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.internal.ui.view.SystemDNDTransferRunnable; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; @@ -34,7 +35,6 @@ import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemDNDTransferRunnable; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInMonitorAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInMonitorAction.java index 15c80ad13da..8721df31fd1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInMonitorAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInMonitorAction.java @@ -20,12 +20,12 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.ui.view.monitor.SystemMonitorUI; +import org.eclipse.rse.internal.ui.view.monitor.SystemMonitorViewPart; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.monitor.SystemMonitorUI; -import org.eclipse.rse.ui.view.monitor.SystemMonitorViewPart; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInTableAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInTableAction.java index 9d2f6415924..f8455ed04c6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInTableAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowInTableAction.java @@ -20,11 +20,11 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.ui.view.SystemTableViewPart; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemTableViewPart; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemTablePrintAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemTablePrintAction.java index 40a11389847..02100a0f9af 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemTablePrintAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemTablePrintAction.java @@ -19,9 +19,9 @@ package org.eclipse.rse.ui.actions; import java.text.DateFormat; import java.util.Date; +import org.eclipse.rse.internal.ui.view.SystemDecoratingLabelProvider; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.view.SystemDecoratingLabelProvider; import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.GC; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemViewExpandToBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemViewExpandToBaseAction.java index 5231d71a5d0..98d2d5c5a7b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemViewExpandToBaseAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemViewExpandToBaseAction.java @@ -17,8 +17,8 @@ package org.eclipse.rse.ui.actions; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.ui.view.ISystemTree; -import org.eclipse.rse.ui.view.SystemView; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkWithProfilesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkWithProfilesAction.java index 5793e53e00a..c0a15094b97 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkWithProfilesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkWithProfilesAction.java @@ -15,10 +15,10 @@ ********************************************************************************/ package org.eclipse.rse.ui.actions; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.team.SystemTeamViewPart; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.ui.view.team.SystemTeamViewPart; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemControlEnableState.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemControlEnableState.java index 23b35feb392..6471c235087 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemControlEnableState.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemControlEnableState.java @@ -18,8 +18,8 @@ package org.eclipse.rse.ui.dialogs; import java.util.ArrayList; import java.util.List; -import org.eclipse.rse.ui.view.SystemPropertySheetForm; -import org.eclipse.rse.ui.view.SystemViewForm; +import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; +import org.eclipse.rse.internal.ui.view.SystemViewForm; 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/ui/dialogs/SystemDeleteTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java index e166955c228..cd57a7cbc10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteTableRow.java @@ -22,11 +22,11 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java index b8d552f106d..b245af11ed8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java @@ -25,13 +25,13 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.window.Window; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; import org.eclipse.rse.services.clientserver.StringComparePatternMatcher; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.SystemTableView; -import org.eclipse.rse.ui.view.SystemTableViewProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java index c2cd357f13c..b2ca7ea6274 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java @@ -17,11 +17,11 @@ package org.eclipse.rse.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; +import org.eclipse.rse.internal.ui.view.SystemResourceSelectionForm; +import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.validators.IValidatorRemoteSelection; -import org.eclipse.rse.ui.view.SystemActionViewerFilter; -import org.eclipse.rse.ui.view.SystemResourceSelectionForm; -import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index 2391ef46bc8..2c703b0d391 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -24,6 +24,7 @@ import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; @@ -37,7 +38,6 @@ import org.eclipse.rse.ui.validators.ValidatorUniqueString; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Button; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemResolveFilterStringDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemResolveFilterStringDialog.java index 2551346e69e..085c1269170 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemResolveFilterStringDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemResolveFilterStringDialog.java @@ -16,10 +16,10 @@ package org.eclipse.rse.ui.dialogs; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemResolveFilterStringAPIProviderImpl; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.view.SystemResolveFilterStringAPIProviderImpl; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java index cdce86d13f9..4415b737516 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java @@ -19,10 +19,10 @@ package org.eclipse.rse.ui.dialogs; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.ISystemPropertyConstants; import org.eclipse.rse.ui.view.ISystemViewInputProvider; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.swt.SWT; 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/ui/dialogs/SystemTestFilterStringDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java index 3babc51fc47..dd4a77612c7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java @@ -20,11 +20,11 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.ui.view.SystemTestFilterStringAPIProviderImpl; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.view.SystemTestFilterStringAPIProviderImpl; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.rse.ui.widgets.SystemHostCombo; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java index fbf97432cf0..945f9ba7269 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java @@ -29,6 +29,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterReference; +import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemContextMenuConstants; @@ -48,7 +49,6 @@ import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidatorUniqueString; import org.eclipse.rse.ui.validators.ValidatorFilterString; -import org.eclipse.rse.ui.view.SystemViewMenuListener; import org.eclipse.rse.ui.widgets.ISystemEditPaneStates; import org.eclipse.rse.ui.widgets.SystemEditPaneStateMachine; import org.eclipse.swt.dnd.Clipboard; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java index a1a7df8ff28..55fc1ba1159 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java @@ -22,12 +22,12 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.actions.ISystemAction; import org.eclipse.rse.ui.actions.SystemSubMenuManager; import org.eclipse.rse.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog; -import org.eclipse.rse.ui.view.SystemView; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java index 3b78fee0d43..ece5df2a9d9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java @@ -19,13 +19,13 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; +import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction; -import org.eclipse.rse.ui.view.SystemViewMenuListener; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java index f414febf3d3..08034953c7c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java @@ -20,9 +20,9 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; +import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; import org.eclipse.rse.ui.actions.SystemBaseAction; import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction; -import org.eclipse.rse.ui.view.SystemViewMenuListener; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewCategoryPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewCategoryPropertyPage.java index 14cd692c1b8..254f042f33a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewCategoryPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewCategoryPropertyPage.java @@ -15,10 +15,10 @@ ********************************************************************************/ package org.eclipse.rse.ui.propertypages; +import org.eclipse.rse.internal.ui.view.SystemViewResources; +import org.eclipse.rse.internal.ui.view.team.SystemTeamViewCategoryNode; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.view.SystemViewResources; -import org.eclipse.rse.ui.view.team.SystemTeamViewCategoryNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewProfilePropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewProfilePropertyPage.java index 48f0ca8fd3b..5bd821b8894 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewProfilePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewProfilePropertyPage.java @@ -16,10 +16,10 @@ package org.eclipse.rse.ui.propertypages; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.internal.ui.view.SystemViewResources; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java index f5d5b5c1deb..5c918da64f0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java @@ -17,11 +17,11 @@ package org.eclipse.rse.ui.propertypages; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; +import org.eclipse.rse.internal.ui.view.SystemViewResources; +import org.eclipse.rse.internal.ui.view.team.SystemTeamViewSubSystemConfigurationNode; import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.view.SystemViewResources; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; 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 8d8cac796c4..6b3cb4954b7 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 @@ -40,6 +40,8 @@ import org.eclipse.rse.core.subsystems.AbstractResource; 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.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; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemLongRunningRequestListener.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemLongRunningRequestListener.java index 0a082e930a2..36ccf4db967 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemLongRunningRequestListener.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemLongRunningRequestListener.java @@ -15,6 +15,9 @@ ********************************************************************************/ package org.eclipse.rse.ui.view; + +import org.eclipse.rse.internal.ui.view.SystemLongRunningRequestEvent; + /** * This interface allows listeners to be kept informed when a long * running request starts and stops. 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 60fb386ad70..93c3be2e728 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 @@ -39,7 +39,7 @@ import org.eclipse.ui.views.properties.IPropertySource; * Any input into the system viewer must register an adapter that implements this interface. *

* This interface supports a union of all the methods needed to support a TreeViewer - * content provider and label provider. The {@link org.eclipse.rse.ui.view.SystemViewLabelAndContentProvider} + * content provider and label provider. The {@link org.eclipse.rse.internal.ui.view.SystemViewLabelAndContentProvider} * delegates to objects of this interface almost completely. It gets such an * object by calling:

*

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 85cb3ddf4e1..4e462c1c2f6 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
@@ -51,6 +51,16 @@ import org.eclipse.rse.core.model.ISystemContainer;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
 import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.internal.ui.view.SystemDecoratingLabelProvider;
+import org.eclipse.rse.internal.ui.view.SystemInheritableTextCellEditor;
+import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
+import org.eclipse.rse.internal.ui.view.SystemTableViewFilter;
+import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
+import org.eclipse.rse.internal.ui.view.SystemTableViewSorter;
+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;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
deleted file mode 100644
index cb6a6d37217..00000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
+++ /dev/null
@@ -1,5423 +0,0 @@
-/********************************************************************************
- * 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:
- * Michael Berger (IBM) - Patch to remove non-standard expand/collapse from menu.
- * Tobias Schwarz (Wind River) - Fix 166343 getChildCount() counts invalid items
- * Martin Oberhuber (Wind River) - Improve fix for 166343 getChildCount()
- * Uwe Stieber (Wind River) - [172492] Use SafeTreeViewer
- ********************************************************************************/
-
-package org.eclipse.rse.ui.view;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.SameShellProvider;
-import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPreferencesManager;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterContainer;
-import org.eclipse.rse.core.filters.ISystemFilterContainerReference;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.filters.ISystemFilterStringReference;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemContainer;
-import org.eclipse.rse.core.model.ISystemMessageObject;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemMessageObject;
-import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
-import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-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;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.ISystemRenameTarget;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemMenuManager;
-import org.eclipse.rse.ui.SystemResources;
-import org.eclipse.rse.ui.actions.ISystemAction;
-import org.eclipse.rse.ui.actions.SystemCascadingGoToAction;
-import org.eclipse.rse.ui.actions.SystemCollapseAction;
-import org.eclipse.rse.ui.actions.SystemCommonDeleteAction;
-import org.eclipse.rse.ui.actions.SystemCommonRenameAction;
-import org.eclipse.rse.ui.actions.SystemCommonSelectAllAction;
-import org.eclipse.rse.ui.actions.SystemExpandAction;
-import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
-import org.eclipse.rse.ui.actions.SystemOpenExplorerPerspectiveAction;
-import org.eclipse.rse.ui.actions.SystemRefreshAction;
-import org.eclipse.rse.ui.actions.SystemShowInMonitorAction;
-import org.eclipse.rse.ui.actions.SystemShowInTableAction;
-import org.eclipse.rse.ui.actions.SystemSubMenuManager;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.TreeEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-import org.eclipse.ui.part.EditorInputTransfer;
-import org.eclipse.ui.part.PluginTransfer;
-import org.eclipse.ui.progress.PendingUpdateAdapter;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.views.framelist.GoIntoAction;
-
-/**
- * This subclass of the standard JFace tree viewer is used to show a tree
- * view of connections to remote systems, which can be manipulated and expanded
- * to access remote objects in the remote system.
- */
-/*
- * At one time implemented the following as well: MenuListener, IDoubleClickListener, ArmListener, IWireEventTarget
- */
-public class SystemView extends SafeTreeViewer implements ISystemTree, ISystemResourceChangeListener, ISystemRemoteChangeListener, IMenuListener,
-		ISelectionChangedListener, ISelectionProvider, ITreeViewerListener, ISystemResourceChangeEvents, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelectAllTarget
-{
-
-	protected Shell shell; // shell hosting this viewer
-	protected ISystemViewInputProvider inputProvider; // who is supplying our tree root elements?
-	protected ISystemViewInputProvider previousInputProvider; // who is supplying our tree root elements?
-	protected Object previousInput;
-	protected IHost previousInputConnection;
-	// protected actions
-	protected SystemNewConnectionAction newConnectionAction;
-	protected SystemRefreshAction refreshAction;
-	protected PropertyDialogAction propertyDialogAction;
-	protected SystemCollapseAction collapseAction; // defect 41203
-	protected SystemExpandAction expandAction; // defect 41203
-	protected SystemOpenExplorerPerspectiveAction openToPerspectiveAction;
-
-	protected SystemShowInTableAction showInTableAction;
-	protected SystemShowInMonitorAction showInMonitorAction;
-	protected GoIntoAction goIntoAction;
-	protected SystemCascadingGoToAction gotoActions;
-	// global actions
-	// Note the Edit menu actions are set in SystemViewPart. Here we use these
-	//   actions from our own popup menu actions.
-	protected SystemCommonDeleteAction deleteAction; // for global delete menu item	
-	protected SystemCommonRenameAction renameAction; // for common rename menu item	
-	protected SystemCommonSelectAllAction selectAllAction; // for common Ctrl+A select-all
-	// special flags needed when building popup menu, set after examining selections
-	protected boolean selectionShowRefreshAction;
-	protected boolean selectionShowOpenViewActions;
-	protected boolean selectionShowGenericShowInTableAction;
-	protected boolean selectionShowDeleteAction;
-	protected boolean selectionShowRenameAction;
-	protected boolean selectionEnableDeleteAction;
-	protected boolean selectionEnableRenameAction;
-	protected boolean selectionIsRemoteObject;
-	protected boolean selectionHasAncestorRelation;
-	protected boolean selectionFlagsUpdated = false;
-	// misc
-	protected MenuManager menuMgr;
-	protected boolean showActions = true;
-	protected boolean hardCodedConnectionSelected = false;
-	protected boolean mixedSelection = false;
-	protected boolean specialMode = false;
-	protected boolean menuListenerAdded = false;
-	protected boolean fromSystemViewPart = false;
-	protected boolean areAnyRemote = false;
-	protected boolean enabledMode = true;
-	protected Widget previousItem = null;
-	protected int searchDepth = 0;
-	//protected Vector      remoteItemsToSkip = null;
-	protected Cursor busyCursor;
-	protected TreeItem inputTreeItem = null;
-	protected static final int SEARCH_INFINITE = 10; // that's far enough down to search!
-	public boolean debug = false;
-	public boolean debugRemote = false;
-	public boolean debugProperties = debug && false;
-	// for support of Expand To actions ... transient filters really.
-	// we need to record these per tree node they are applied to.
-	protected Hashtable expandToFiltersByObject; // most efficient way to find these is by binary object
-	protected Hashtable expandToFiltersByTreePath; // however, we lose that after a refresh so we also record by tree path
-
-	// message line
-	protected ISystemMessageLine messageLine = null;
-	// button pressed
-	protected static final int LEFT_BUTTON = 1;
-	protected int mouseButtonPressed = LEFT_BUTTON; //d40615
-	protected boolean expandingTreeOnly = false; //d40615
-	protected ViewerFilter[] initViewerFilters = null;
-
-	protected List _setList;
-
-	/**
-	 * Constructor
-	 * @param shell The shell hosting this tree viewer widget
-	 * @param parent The composite widget into which to place this widget
-	 * @param inputProvider The input object which will supply the initial root objects in the tree.
-	 *                      Can be null initially, but be sure to call #setInputProvider(ISystemViewInputProvider) later.
-	 * @param msgLine Where to display messages and tooltip text
-	 */
-	public SystemView(Shell shell, Composite parent, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
-		super(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); // DKM - putting style here to avoid SWT.BORDER (defect 168972)
-		this.shell = shell;
-		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
-		this.messageLine = msgLine;
-		init();
-	}
-
-	/**
-	 * Constructor to use when you want to specify styles for the tree widget
-	 * @param shell The shell hosting this tree viewer widget
-	 * @param parent The composite widget into which to place this widget
-	 * @param style The style to give the tree widget
-	 * @param inputProvider The input object which will supply the initial root objects in the tree.
-	 *                      Can be null initially, but be sure to call #setInputProvider(ISystemViewInputProvider) later.
-	 * @param msgLine Where to display messages and tooltip text
-	 */
-	public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
-		super(parent, style);
-		this.shell = shell;
-		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
-		this.messageLine = msgLine;
-		init();
-	}
-
-	/**
-	 * Constructor to use when you want to specify styles for the tree widget
-	 * @param shell The shell hosting this tree viewer widget
-	 * @param parent The composite widget into which to place this widget
-	 * @param style The style to give the tree widget
-	 * @param inputProvider The input object which will supply the initial root objects in the tree.
-	 *                      Can be null initially, but be sure to call #setInputProvider(ISystemViewInputProvider) later.
-	 * @param msgLine Where to display messages and tooltip text
-	 * @param initViewerFilters the initial viewer filters to apply.
-	 */
-	public SystemView(Shell shell, Composite parent, int style, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine, ViewerFilter[] initViewerFilters) {
-		super(parent, style);
-		this.shell = shell;
-		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
-		this.messageLine = msgLine;
-		this.initViewerFilters = initViewerFilters;
-		init();
-	}
-
-	/**
-	 * Constructor to use when you create your own tree widget. 
-	 * @param shell The shell hosting this tree viewer widget
-	 * @param tree The Tree widget you created.
-	 * @param inputProvider The input object which will supply the initial root objects in the tree.
-	 *                      Can be null initially, but be sure to call #setInputProvider(ISystemViewInputProvider) later.
-	 * @param msgLine Where to display messages and tooltip text
-	 */
-	public SystemView(Shell shell, Tree tree, ISystemViewInputProvider inputProvider, ISystemMessageLine msgLine) {
-		super(tree);
-		this.shell = shell;
-		this.inputProvider = inputProvider;
-		this.inputProvider.setShell(shell); // DY:  defect 44544
-		this.messageLine = msgLine;
-		init();
-	}
-
-	/**
-	 * Set the input provider. Sometimes this is delayed, or can change.
-	 * @param inputProvider the input provider for this view.
-	 */
-	public void setInputProvider(ISystemViewInputProvider inputProvider) {
-		this.inputProvider = inputProvider;
-		inputProvider.setViewer(this);
-		inputProvider.setShell(getShell()); // DY:  Defect 44544, shell was not being set for Test dialogs, when they
-		// tried to connect there was not shell for the password prompt
-		// and an error message (expand failed) occured.
-		setInput(inputProvider);
-	}
-
-	/**
-	 * Get the SystemViewPart that encapsulates us.
-	 * Will be null unless fromSystemViewPart is true.
-	 */
-	public SystemViewPart getSystemViewPart() {
-		if (fromSystemViewPart)
-			return ((SystemViewPart) messageLine);
-		else
-			return null;
-	}
-
-	/**
-	 * Get the workbench window containing this view part. Will only be non-null for the explorer view part,
-	 * not when used within, say, a dialog
-	 */
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		if (fromSystemViewPart)
-			return getSystemViewPart().getSite().getWorkbenchWindow();
-		else
-			return null;
-	}
-
-	/**
-	 * Get the workbench part containing this view. Will only be non-null for the explorer view part,
-	 * not when used within, say, a dialog
-	 */
-	protected IWorkbenchPart getWorkbenchPart() {
-		return getSystemViewPart();
-	}
-
-	/**
-	 * Disable/Enable the viewer. We do this by blocking keystrokes without visually greying out
-	 */
-	public void setEnabled(boolean enabled) {
-		enabledMode = enabled;
-	}
-
-	/**
-	 * Sets the label and content provider for the system view.
-	 * This can be called externally if a custom RSE label and content provider is desired
-	 * @param lcProvider the provider
-	 */
-	public void setLabelAndContentProvider(SystemViewLabelAndContentProvider lcProvider) {
-		ILabelDecorator decorator = null;
-		if (PlatformUI.isWorkbenchRunning()) {
-			IWorkbench wb = PlatformUI.getWorkbench();
-			decorator = wb.getDecoratorManager().getLabelDecorator();
-		}
-		setLabelProvider(new DecoratingLabelProvider(lcProvider, decorator));
-		setContentProvider(lcProvider);
-	}
-
-	protected void init() {
-		_setList = new ArrayList();
-		busyCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
-		//setUseHashlookup(true); // new for our 2nd release. Attempt to fix 38 minutes to refresh for 15K elements
-
-		// set content provider
-		SystemViewLabelAndContentProvider lcProvider = new SystemViewLabelAndContentProvider();
-		setLabelAndContentProvider(lcProvider);
-
-		// set initial viewer filters
-		if (initViewerFilters != null) {
-
-			for (int i = 0; i < initViewerFilters.length; i++) {
-				addFilter(initViewerFilters[i]);
-			}
-		}
-
-		fromSystemViewPart = ((messageLine != null) && (messageLine instanceof SystemViewPart));
-
-		// set the tree's input. Provides initial roots.	
-		if (inputProvider != null) {
-			inputProvider.setViewer(this);
-			setInput(inputProvider);
-			if (fromSystemViewPart) {
-				previousInputConnection = getInputConnection(getWorkbenchPart().getSite().getPage().getInput());
-			}
-		}
-		//addDoubleClickListener(this);
-		addSelectionChangedListener(this);
-		addTreeListener(this);
-		// ----------------------------------------
-		// register with system registry for events
-		// ----------------------------------------
-		RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this);
-		RSEUIPlugin.getTheSystemRegistry().addSystemRemoteChangeListener(this);
-		// -----------------------------
-		// Enable right-click popup menu
-		// -----------------------------
-		menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(this);
-		Menu menu = menuMgr.createContextMenu(getTree());
-		getTree().setMenu(menu);
-		// -------------------------------------------
-		// Enable specific keys: dbl-click, Delete, F5
-		// -------------------------------------------		
-		addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleDoubleClick(event);
-			}
-		});
-		getControl().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent e) {
-				handleKeyPressed(e);
-			}
-		});
-		getControl().addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent e) {
-				mouseButtonPressed = e.button; //d40615 	    
-				if (!enabledMode) {
-					//e.doit = false;
-					return;
-				}
-			}
-		});
-
-		initRefreshKey();
-
-		// initialize drag and drop
-		initDragAndDrop();
-	}
-
-	/**
-	 * Create the KeyListener for doing the refresh on the viewer.
-	 */
-	protected void initRefreshKey() {
-		/* DKM - no need for explicit key listener since we
-		 * have global action
-		 getControl().addKeyListener(new KeyAdapter() 
-		 {
-		 public void keyReleased(KeyEvent event) 
-		 {
-		 if (!enabledMode)
-		 return;
-		 if (event.keyCode == SWT.F5) 
-		 {
-		 //if (debug)
-		 //  System.out.println("F5 pressed");
-		 refreshAll();
-		 }
-		 }
-		 });
-		 */
-	}
-
-	/**
-	 * Handles double clicks in viewer.
-	 * Opens editor if file double-clicked.
-	 */
-	protected void handleDoubleClick(DoubleClickEvent event) {
-		if (!enabledMode) {
-			//event.doit = false;
-			return;
-		}
-		IStructuredSelection s = (IStructuredSelection) event.getSelection();
-		Object element = s.getFirstElement();
-		if (element == null) return;
-		ISystemViewElementAdapter adapter = getAdapter(element);
-		boolean alreadyHandled = false;
-		if (adapter != null) alreadyHandled = adapter.handleDoubleClick(element);
-		if (!alreadyHandled && isExpandable(element)) {
-			boolean expandedState = getExpandedState(element);
-			setExpandedState(element, !expandedState);
-			// DY:  fire collapse / expand event
-			if (expandedState) {
-				fireTreeCollapsed(new TreeExpansionEvent(this, element));
-			} else {
-				fireTreeExpanded(new TreeExpansionEvent(this, element));
-			}
-			return;
-		}
-	}
-
-	/**
-	 * Handles key events in viewer.
-	 */
-	void handleKeyPressed(KeyEvent event) {
-		if ((event.character == SWT.DEL) && (event.stateMask == 0) && (((IStructuredSelection) getSelection()).size() > 0)) {
-			scanSelections("handleKeyPressed"); //$NON-NLS-1$
-			/* DKM - 53694
-			 if (showDelete() && canDelete())
-			 {
-			 
-			 SystemCommonDeleteAction dltAction = (SystemCommonDeleteAction)getDeleteAction();
-			 dltAction.setShell(getShell());
-			 dltAction.setSelection(getSelection());
-			 dltAction.setViewer(this);
-			 dltAction.run();
-			 
-			 }
-			 */
-		} else if ((event.character == '-') && (event.stateMask == SWT.CTRL)) {
-			collapseAll();
-		} else if ((event.character == 1) && // for some reason Ctrl+A comes in as Ctrl plus the number 1!
-				(event.stateMask == SWT.CTRL) && !fromSystemViewPart) {
-			//System.out.println("Inside Ctrl+A processing");
-			if (enableSelectAll(null)) doSelectAll(null);
-		} else if ((event.character == '-') && (((IStructuredSelection) getSelection()).size() > 0)) {
-			//System.out.println("Inside Ctrl+- processing");
-			collapseSelected();
-		} else if ((event.character == '+') && (((IStructuredSelection) getSelection()).size() > 0)) {
-			//System.out.println("Inside Ctrl++ processing");
-			expandSelected();
-		}
-
-	}
-
-	/**
-	 * Handles a collapse-selected request
-	 */
-	public void collapseSelected() {
-		TreeItem[] selectedItems = ((Tree) getControl()).getSelection();
-		if ((selectedItems != null) && (selectedItems.length > 0)) {
-			for (int idx = 0; idx < selectedItems.length; idx++)
-				selectedItems[idx].setExpanded(false);
-		}
-	}
-
-	/**
-	 * Handles an expand-selected request
-	 */
-	public void expandSelected() {
-		TreeItem[] selectedItems = ((Tree) getControl()).getSelection();
-		if ((selectedItems != null) && (selectedItems.length > 0)) {
-			for (int idx = 0; idx < selectedItems.length; idx++) {
-				if (!selectedItems[idx].getExpanded()) {
-					createChildren(selectedItems[idx]);
-				}
-				selectedItems[idx].setExpanded(true);
-			}
-		}
-	}
-
-	/**
-	 * Display a message/status on the message/status line
-	 */
-	public void displayMessage(String msg) {
-		if (messageLine != null) messageLine.setMessage(msg);
-	}
-
-	/**
-	 * Clear message/status shown on the message/status line
-	 */
-	public void clearMessage() {
-		if (messageLine != null) messageLine.clearMessage();
-	}
-
-	/**
-	 * Turn off right-click actions
-	 */
-	public void setShowActions(boolean show) {
-		this.showActions = show;
-	}
-
-	/**
-	 * Return the input provider
-	 */
-	public ISystemViewInputProvider getInputProvider() {
-		inputProvider.setViewer(this); // just in case. Added by Phil in V5.0
-		inputProvider.setShell(getShell()); // just in case. Added by Phil
-		return inputProvider;
-	}
-
-	/**
-	 * Return the popup menu for the tree
-	 */
-	public Menu getContextMenu() {
-		return getTree().getMenu();
-	}
-
-	/**
-	 * Return the popup menu for the tree
-	 */
-	public MenuManager getContextMenuManager() {
-		return menuMgr;
-	}
-
-	/**
-	 * Rather than pre-defining this common action we wait until it is first needed,
-	 *  for performance reasons.
-	 */
-	public IAction getNewConnectionAction() {
-		if (newConnectionAction == null) newConnectionAction = new SystemNewConnectionAction(getShell(), true, this); // true=>from popup menu
-		return newConnectionAction;
-	}
-
-	/**
-	 * Return the refresh action
-	 */
-	public IAction getRefreshAction() {
-		if (refreshAction == null) refreshAction = new SystemRefreshAction(getShell());
-		return refreshAction;
-	}
-
-	/**
-	 * @return the collapse action. Lazily creates it.
-	 */
-	public IAction getCollapseAction() {
-		if (collapseAction == null) collapseAction = new SystemCollapseAction(getShell());
-		return collapseAction;
-	}
-
-	/**
-	 * @return the expand action. Lazily creates it.
-	 */
-	public IAction getExpandAction() {
-		if (expandAction == null) expandAction = new SystemExpandAction(getShell());
-		return expandAction;
-	}
-
-	/**
-	 * Rather than pre-defining this common action we wait until it is first needed,
-	 *  for performance reasons.
-	 */
-	public PropertyDialogAction getPropertyDialogAction() {
-		if (propertyDialogAction == null) {
-			propertyDialogAction = new PropertyDialogAction(new SameShellProvider(getShell()), this);
-			//propertyDialogAction.setToolTipText(" "); 
-		}
-
-
-		propertyDialogAction.selectionChanged(getSelection());
-
-		return propertyDialogAction;
-	}
-
-
-	/**
-	 * Return the select All action
-	 */
-	public IAction getSelectAllAction() {
-		if (selectAllAction == null) selectAllAction = new SystemCommonSelectAllAction(getShell(), this, this);
-		return selectAllAction;
-	}
-
-	/**
-	 * Rather than pre-defined this common action we wait until it is first needed,
-	 *  for performance reasons.
-	 */
-	public IAction getRenameAction() {
-		if (renameAction == null) renameAction = new SystemCommonRenameAction(getShell(), this);
-		return renameAction;
-	}
-
-	/**
-	 * Rather than pre-defined this common action we wait until it is first needed,
-	 *  for performance reasons.
-	 */
-	public IAction getDeleteAction() {
-		if (deleteAction == null) deleteAction = new SystemCommonDeleteAction(getShell(), this);
-		return deleteAction;
-	}
-
-	/*
-	 * Get the common "Open to->" action for opening a new Remote System Explorer view,
-	 *  scoped to the currently selected object.
-	 *
-	 protected SystemCascadingOpenToAction getOpenToAction()
-	 {
-	 if (openToAction == null)
-	 openToAction = new SystemCascadingOpenToAction(getShell(),getWorkbenchWindow());
-	 return openToAction;
-	 } NOT USED YET */
-
-	/**
-	 * Get the common "Open to->" action for opening a new Remote System Explorer view,
-	 *  scoped to the currently selected object.
-	 */
-	public SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction() {
-		if (openToPerspectiveAction == null) openToPerspectiveAction = new SystemOpenExplorerPerspectiveAction(getShell(), getWorkbenchWindow());
-		return openToPerspectiveAction;
-	}
-
-	public SystemShowInTableAction getShowInTableAction() {
-		if (showInTableAction == null) showInTableAction = new SystemShowInTableAction(getShell());
-		return showInTableAction;
-	}
-
-	public SystemShowInMonitorAction getShowInMonitorAction() {
-		if (showInMonitorAction == null) showInMonitorAction = new SystemShowInMonitorAction(getShell());
-		return showInMonitorAction;
-	}
-
-	/**
-	 * Get the common "Go Into" action for drilling down in the Remote System Explorer view,
-	 *  scoped to the currently selected object.
-	 */
-	public GoIntoAction getGoIntoAction() {
-		if (goIntoAction == null) {
-			goIntoAction = new GoIntoAction(getSystemViewPart().getFrameList());
-			goIntoAction.setText(SystemResources.ACTION_CASCADING_GOINTO_LABEL);
-			goIntoAction.setToolTipText(SystemResources.ACTION_CASCADING_GOINTO_TOOLTIP);
-		}
-		return goIntoAction;
-	}
-
-	/**
-	 * Get the common "Go To->" cascading menu action for navigating the frame list.
-	 */
-	public SystemCascadingGoToAction getGoToActions() {
-		if (gotoActions == null) gotoActions = new SystemCascadingGoToAction(getShell(), getSystemViewPart());
-		return gotoActions;
-	}
-
-	/**
-	 * Helper method to collapse a node in the tree.
-	 * Called when a currently expanded subsystem is disconnected.
-	 * @param forceRefresh true if children should be deleted from memory so re-expand forces refresh.
-	 */
-	public void collapseNode(Object element, boolean forceRefresh) {
-		// First, collapse this element and all its children.
-		collapseToLevel(element, ALL_LEVELS);
-
-		// Collapsed just changes expanded state but leaves existing child
-		//  widgets in memory so they are re-shown on next expansion.
-		// To force the next expand to re-get the children, we have to delete the
-		//  children.
-		if (forceRefresh) {
-			refresh(element); // look at AbstractTreeViewer.updateChildren which this
-			// will call. If the element is collapsed (which we just
-			// did) then its children are simply disposed of, and
-			// not re-queried. Just what we want!
-		}
-	}
-
-	/**
-	 * This is method is called to populate the popup menu
-	 */
-	public void fillContextMenu(IMenuManager menu) {
-		
-		if (!showActions) return;
-		//SystemViewPlugin.getDefault().logMessage("inside fillContextMenu");
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
-		boolean allSelectionsFromSameParent = true;
-		int selectionCount = selection.size();
-
-		if (selectionCount == 0) // nothing selected
-		{
-			menu.add(getNewConnectionAction());
-			menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
-		} else {
-			if (selectionCount > 1) {
-				allSelectionsFromSameParent = sameParent();
-				if (!allSelectionsFromSameParent) {
-					if (selectionHasAncestryRelationship()) {
-						// don't show the menu because actions with
-						//  multiple select on objects that are ancestors 
-						//  of each other is problematic
-						// still create the standard groups
-						createStandardGroups(menu);
-						return;
-					}
-				}
-			}
-			// Partition into groups...
-			createStandardGroups(menu);
-
-			// PRESET INSTANCE VARIABLES ABOUT WHAT COMMON ACTIONS ARE TO BE SHOWN...
-			// PERFORMANCE TWEAK: OUR GLOBAL DELETE ACTION LISTENS FOR SELECTION CHANGES, AND
-			//  WHEN THAT CHANGES, WILL CALL CANDELETE() HERE. THAT IN TURN WILL CALL SCANSELECTIONS.
-			//  THIS MEANS SCAN SELECTIONS GETS CALL TWICE ON MOST RIGHT CLICK ACTIONS.
-			if (!selectionFlagsUpdated) // might already be called by the global delete action wh
-				scanSelections("fillContextMenu"); //$NON-NLS-1$
-
-			// ADD COMMON ACTIONS...
-
-			// COMMON REFRESH ACTION...
-			if (showRefresh()) {
-				menu.appendToGroup(ISystemContextMenuConstants.GROUP_BUILD, getRefreshAction());
-
-				// MJB: Removed as per bugzilla entry # 145843
-				//menu.appendToGroup(ISystemContextMenuConstants.GROUP_BUILD, getExpandAction());  // defect 41203
-				//menu.appendToGroup(ISystemContextMenuConstants.GROUP_BUILD, getCollapseAction());  // defect 41203
-			}
-
-			// COMMON RENAME ACTION...
-			if (showRename()) {
-				menu.appendToGroup(ISystemContextMenuConstants.GROUP_REORGANIZE, getRenameAction());
-				((ISystemAction) getRenameAction()).setInputs(getShell(), this, selection);
-			}
-
-			// ADAPTER SPECIFIC ACTIONS   	      
-			SystemMenuManager ourMenu = new SystemMenuManager(menu);
-
-			// yantzi:artemis 6.0 (defect 53970), do not show adapter specific actions when 
-			// there is not a common adapter for all selected elements (i.e. there are 2 or 
-			// more selected elements that have different adapters
-			Iterator elements = selection.iterator();
-			//Hashtable adapters = new Hashtable();
-			ISystemViewElementAdapter adapter = null;
-			boolean skipAdapterActions = false;
-
-			while (elements.hasNext() && !skipAdapterActions) {
-				Object element = elements.next();
-				if (adapter == null) {
-					adapter = getAdapter(element);
-				} else if (adapter != getAdapter(element)) {
-					// selected elements have different adapters
-					skipAdapterActions = true;
-				}
-				//if (adapter != null)
-				//	adapters.put(adapter,element); // want only unique adapters
-			}
-
-	
-			//Enumeration uniqueAdapters = adapters.keys();
-			if (!skipAdapterActions && adapter != null) {
-				Shell shell = getShell();
-
-				//while (uniqueAdapters.hasMoreElements())
-				//{
-				//	 ISystemViewElementAdapter nextAdapter = (ISystemViewElementAdapter)uniqueAdapters.nextElement();
-				adapter.addActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-				
-			     if (adapter instanceof AbstractSystemViewAdapter)
-			     {
-		
-						AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter)adapter;
-						
-						// add dynamic menu popups
-						aVA.addDynamicPopupMenuActions(ourMenu, selection, shell,  ISystemContextMenuConstants.GROUP_ADDITIONS);
-						
-						// add remote actions
-						aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-			     }
-				//}
-			}
-	
-
-			// whale through all actions, updating shell and selection
-			IContributionItem[] items = menu.getItems();
-			for (int idx = 0; idx < items.length; idx++) {
-				if ((items[idx] instanceof ActionContributionItem) && (((ActionContributionItem) items[idx]).getAction() instanceof ISystemAction)) {
-					ISystemAction item = (ISystemAction) (((ActionContributionItem) items[idx]).getAction());
-					try {
-						item.setInputs(getShell(), this, selection);
-					} catch (Exception e) {
-						SystemBasePlugin.logError("Error configuring action " + item.getClass().getName(), e); //$NON-NLS-1$
-					}
-				} else if (items[idx] instanceof SystemSubMenuManager) {
-					SystemSubMenuManager item = (SystemSubMenuManager) items[idx];
-					item.setInputs(getShell(), this, selection);
-				}
-			}
-
-			// COMMON DELETE ACTION...
-			if (showDelete()) {
-				//menu.add(getDeleteAction());
-				menu.appendToGroup(ISystemContextMenuConstants.GROUP_REORGANIZE, getDeleteAction());
-				((ISystemAction) getDeleteAction()).setInputs(getShell(), this, selection);
-				menu.add(new Separator());
-			}
-
-
-	
-
-			
-			// PROPERTIES ACTION...
-			// This is supplied by the system, so we pretty much get it for free. It finds the
-			// registered propertyPages extension points registered for the selected object's class type.
-			//propertyDialogAction.selectionChanged(selection);		  
-
-			PropertyDialogAction pdAction = getPropertyDialogAction();
-
-			if (pdAction.isApplicableForSelection()) menu.appendToGroup(ISystemContextMenuConstants.GROUP_PROPERTIES, pdAction);
-
-			
-			// GO INTO ACTION...
-			// OPEN IN NEW WINDOW ACTION...
-			if (fromSystemViewPart && showOpenViewActions() && !selectionIsRemoteObject) {
-
-				
-				GoIntoAction goIntoAction = getGoIntoAction();
-				goIntoAction.setEnabled(selection.size() == 1);
-				menu.appendToGroup(ISystemContextMenuConstants.GROUP_GOTO, goIntoAction);
-
-				SystemOpenExplorerPerspectiveAction openToPerspectiveAction = getOpenToPerspectiveAction();
-				openToPerspectiveAction.setSelection(selection);
-				menu.appendToGroup(openToPerspectiveAction.getContextMenuGroup(), openToPerspectiveAction);
-
-				if (showGenericShowInTableAction()) {
-
-					
-					SystemShowInTableAction showInTableAction = getShowInTableAction();
-					showInTableAction.setSelection(selection);
-					menu.appendToGroup(openToPerspectiveAction.getContextMenuGroup(), showInTableAction);
-
-					SystemShowInMonitorAction showInMonitorAction = getShowInMonitorAction();
-					showInMonitorAction.setSelection(selection);
-					menu.appendToGroup(openToPerspectiveAction.getContextMenuGroup(), showInMonitorAction);
-
-				}
-
-				
-			}
-
-
-			
-			// GO TO CASCADING ACTIONS...
-			if (fromSystemViewPart && (selectionIsRemoteObject || showOpenViewActions())) {
-				SystemCascadingGoToAction gotoActions = getGoToActions();
-				gotoActions.setSelection(selection);
-				menu.appendToGroup(gotoActions.getContextMenuGroup(), gotoActions.getSubMenu());
-			}
-			
-		
-		}
-
-	}
-
-
-	/**
-	 * Called when the context menu is about to open.
-	 * Calls {@link #fillContextMenu(IMenuManager)}
-	 */
-	public void menuAboutToShow(IMenuManager menu) {
-		if (!enabledMode) return;
-		fillContextMenu(menu);
-		if (!menuListenerAdded) {
-			if (menu instanceof MenuManager) {
-				Menu m = ((MenuManager) menu).getMenu();
-				if (m != null) {
-					menuListenerAdded = true;
-					SystemViewMenuListener ml = new SystemViewMenuListener();
-					if (messageLine != null) ml.setShowToolTipText(true, messageLine);
-					m.addMenuListener(ml);
-				}
-			}
-		}
-		//System.out.println("Inside menuAboutToShow: menu null? "+( ((MenuManager)menu).getMenu()==null));
-	}
-
-	/**
-	 * Creates the Systems plugin standard groups in a context menu.
-	 */
-	public static IMenuManager createStandardGroups(IMenuManager menu) {
-		if (!menu.isEmpty()) return menu;
-		// simply sets partitions in the menu, into which actions can be directed.
-		// Each partition can be delimited by a separator (new Separator) or not (new GroupMarker).
-		// Deleted groups are not used yet.
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_NEW)); // new->
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_GOTO)); // goto into, go->
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_EXPANDTO)); // expand to->
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_EXPAND)); // expand, collapse
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_OPEN)); // open xxx
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_OPENWITH)); // open with->
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_BROWSEWITH)); // open with->
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_WORKWITH)); // work with->
-		//menu.add(new Separator(ISystemContextMenuConstants.GROUP_SHOW));         // show->type hierarchy, in-navigator
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_BUILD)); // build, rebuild, refresh
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_CHANGE)); // update, change
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_REORGANIZE)); // rename,move,copy,delete,bookmark,refactoring
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_REORDER)); // move up, move down		
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_GENERATE)); // getters/setters, etc. Typically in editor
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_SEARCH)); // search
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_CONNECTION)); // connection-related actions
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_STARTSERVER)); // start/stop remote server actions
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_IMPORTEXPORT)); // get or put actions
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADAPTERS)); // actions queried from adapters
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
-		//menu.add(new Separator(ISystemContextMenuConstants.GROUP_VIEWER_SETUP)); // ? Probably View->by xxx, yyy
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_TEAM)); // Team
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_COMPAREWITH));
-		menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_REPLACEWITH));
-		menu.add(new Separator(ISystemContextMenuConstants.GROUP_PROPERTIES)); // Properties
-
-		return menu;
-	}
-
-	/**
-	 * protected helper method to add an Action to a given menu.
-	 * To give the action the opportunity to grey out, we call selectionChanged, but
-	 * only if the action implements ISelectionChangedListener
-	 */
-	protected void menuAdd(MenuManager menu, IAction action) {
-		if (action instanceof ISelectionChangedListener) ((ISelectionChangedListener) action).selectionChanged(new SelectionChangedEvent(this, getSelection()));
-	}
-
-	/**
-	 * Determines whether the view has an ancestor relation selection so
-	 * that actions can be enable/disabled appropriately.
-	 * For example, delete needs to be disabled when a parent and it's child
-	 * are both selected. 
-	 * @return true if the selection has one or more ancestor relations
-	 */
-	protected boolean hasAncestorRelationSelection() {
-		return selectionHasAncestryRelationship();
-		/*
-		TreeItem[] elements = getTree().getSelection();
-		
-				
-		//Item[] elements = getSelection(getControl());
-		for (int i = 0; i < elements.length; i++) {
-			TreeItem parentItem = elements[i];
-			//for (int j = 0; j < elements.length; j++) {
-				//if (j != i) {
-					if (isAncestorOf(parentItem, elements))
-					{
-						return true;
-					}
-				//}
-		//	}
-		}
-		return false; 
-		*/
-	}
-
-	/**
-	 * Handles selection changed in viewer.
-	 * Updates global actions.
-	 * Links to editor (if option enabled)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		selectionFlagsUpdated = false;
-		_setList = new ArrayList();
-		IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-		Object firstSelection = sel.getFirstElement();
-		if (firstSelection == null) return;
-
-		//	added by Phil. Noticed Edit->Delete not enabled when it should be
-		boolean enableDelete = true;
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
-		Iterator elements = selection.iterator();
-
-		while (enableDelete && elements.hasNext()) {
-			Object element = elements.next();
-			ISystemViewElementAdapter adapter = getAdapter(element);
-			if (adapter == null) continue;
-			if (enableDelete) enableDelete = adapter.showDelete(element) && adapter.canDelete(element);
-		}
-		//System.out.println("Enabling delete action: "+enableDelete);                
-		//System.out.println("Enabling selectAll action: "+enableSelectAll(sel));
-		((SystemCommonDeleteAction) getDeleteAction()).setEnabled(enableDelete);
-		((SystemCommonSelectAllAction) getSelectAllAction()).setEnabled(enableSelectAll(sel)); // added by Phil. Noticed Edit->Select All not enabled when it should be
-
-		ISystemViewElementAdapter adapter = getAdapter(firstSelection);
-		if (adapter != null) {
-			displayMessage(adapter.getStatusLineText(firstSelection));
-			if ((mouseButtonPressed == LEFT_BUTTON) && (!expandingTreeOnly)) //d40615
-				adapter.selectionChanged(firstSelection); //d40615  
-		} else
-			clearMessage();
-		//System.out.println("Inside selectionChanged in SystemView");
-		expandingTreeOnly = false; //d40615
-	}
-
-	protected void logMyDebugMessage(String prefix, String msg) {
-		if (!debugProperties) return;
-		//RSEUIPlugin.logDebugMessage(prefix, msg);		
-		System.out.println(prefix + " " + msg); //$NON-NLS-1$
-	}
-
-	/**
-	 * Convenience method for returning the shell of this viewer.
-	 */
-	public Shell getShell() {
-		//return shell;
-		return getTree().getShell();
-	}
-
-	/**
-	 * Helper method to determine if a given object is currently selected.
-	 * Does not consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isSelected(Object element) {
-		return isSelected(element, (IStructuredSelection) getSelection());
-	}
-
-	/**
-	 * Helper method to determine if a given tree item is currently selected.
-	 * Does not consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isTreeItemSelected(Widget w) {
-		boolean match = false;
-		TreeItem[] items = getTree().getSelection();
-		if ((items != null) && (items.length > 0)) {
-			for (int idx = 0; !match && (idx < items.length); idx++)
-				if (items[idx] == w) match = true;
-		}
-		return match;
-	}
-
-	/**
-	 * Helper method to determine if any of a given array of objects is currently selected
-	 * Does not consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isSelected(Object[] elementArray) {
-		return isSelected(elementArray, (IStructuredSelection) getSelection());
-	}
-
-	/**
-	 * Helper method to determine if a given object is in given selection
-	 * Does not consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isSelected(Object element, IStructuredSelection selection) {
-		boolean isSelected = false;
-		Iterator elements = selection.iterator();
-		while (!isSelected && elements.hasNext()) {
-			if (element.equals(elements.next())) isSelected = true;
-		}
-		return isSelected;
-	}
-
-	/**
-	 * Helper method to determine if any of a given array of objects is in given selection
-	 * Does not consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isSelected(Object[] elementArray, IStructuredSelection selection) {
-		boolean isSelected = false;
-		Iterator elements = selection.iterator();
-		while (!isSelected && elements.hasNext()) {
-			Object nextSelection = elements.next();
-			for (int idx = 0; !isSelected && (idx < elementArray.length); idx++) {
-				if (elementArray[idx].equals(nextSelection)) isSelected = true;
-			}
-		}
-		return isSelected;
-	}
-
-	/**
-	 * Helper method to determine if a given object is currently selected.
-	 * Does consider if a child node of the given object is currently selected.
-	 */
-	protected boolean isSelectedOrChildSelected(Object[] parentElements) {
-		boolean isSelected = false;
-		if ((parentElements == null) || (parentElements.length == 0)) return false;
-		for (int idx = 0; !isSelected && (idx < parentElements.length); idx++)
-			isSelected = isSelectedOrChildSelected(parentElements[idx]);
-		return isSelected;
-	}
-
-	protected boolean searchToRoot(TreeItem selectedItem, TreeItem searchItem) {
-		boolean found = false;
-		boolean done = false;
-		while (!found && !done) {
-			if (selectedItem == searchItem)
-				found = true;
-			else {
-				if (selectedItem != null)
-				{
-					selectedItem = selectedItem.getParentItem();
-					if (selectedItem == null) done = true;
-				}
-			}
-		}
-		return found;
-	}
-
-	/**
-	 * Called after tree item collapsed. Updates the children of the tree item being
-	 * collapsed by removing the widgets associated with any transient message objects
-	 * that were in the tree.
-	 * @param event the event that caused the collapse. The event data will include the
-	 * tree element being collapsed.
-	 */
-	public void treeCollapsed(TreeExpansionEvent event) {
-		final Object element = event.getElement(); // get parent node being collapsed
-		// we always allow adapters opportunity to show a different icon depending on collapsed state
-		getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				String[] allProps = {IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE};
-				update(element, allProps); // for refreshing non-structural properties in viewer when model changes   	   	          	    
-			}
-		});
-	}
-
-	/**
-	 *	Called after tree item expanded.
-	 *  We need this hook to potentially undo user expand request.
-	 *  @param event the SWT TreeExpansionEvent that caused the expansion.
-	 */
-	public void treeExpanded(TreeExpansionEvent event) {
-		expandingTreeOnly = true;
-		final Object element = event.getElement();
-		// we always allow adapters opportunity to show a different icon depending on expanded state
-		getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				updatePropertySheet();
-				String[] allProps = { IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE };
-				update(element, allProps); // for refreshing non-structural properties in viewer when model changes   	   	          	    
-			}
-		});
-	}
-	
-	/* (non-Javadoc)
-	 * Here only for observability.
-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#handleTreeCollapse(org.eclipse.swt.events.TreeEvent)
-	 */
-	protected void handleTreeCollapse(TreeEvent event) {
-		super.handleTreeCollapse(event);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#handleTreeExpand(org.eclipse.swt.events.TreeEvent)
-	 */
-	protected void handleTreeExpand(TreeEvent event) {
-		TreeItem item = (TreeItem) event.item;
-		// Remove any transient messages prior to finding children. They will be regenerated if they are needed.
-		Item[] children = getItems(item);
-		if (children != null) {
-			for (int i = 0; i < children.length; i++) {
-				Item child = children[i];
-				Object data = child.getData();
-				if (data instanceof ISystemMessageObject) {
-					ISystemMessageObject message = (ISystemMessageObject) data;
-					if (message.isTransient()) {
-						remove(message);
-					}
-				}
-			}
-		}
-		Shell shell = getShell();
-		Object data = item.getData();
-		boolean showBusy = (data instanceof IHost) && ((IHost)data).isOffline();
-		if (showBusy) SystemPromptDialog.setDisplayCursor(shell, busyCursor);
-		super.handleTreeExpand(event);
-		if (showBusy) SystemPromptDialog.setDisplayCursor(shell, null);
-	}
-
-	/**
-	 * Clear current selection. Ignore widget disposed message.
-	 */
-	protected void clearSelection() {
-		try {
-			setSelection((ISelection) null);
-		} catch (Exception exc) {
-		}
-	}
-
-	/**
-	 * Returns the implementation of ISystemViewElement for the given
-	 * object.  Returns null if the adapter is not defined or the
-	 * object is not adaptable.
-	 */
-	protected ISystemViewElementAdapter getAdapter(Object o) {
-
-		ISystemViewInputProvider provider = getInputProvider();
-
-		// should never be null, but we check just to be safe
-		// the input provider should be set because for things like connections, the select
-		// dialogs may set a different input provider for the connection adapter which is subsequently
-		// not updated when selecting a connection in the Remote Systems view.
-		// This ensures that the input provider for the Remote Systems view is set for the adapter.
-		if (provider != null) {
-			return SystemAdapterHelpers.getAdapter(o, this, provider);
-		} else {
-			return SystemAdapterHelpers.getAdapter(o, this);
-		}
-	}
-
-	/**
-	 * Returns the implementation of IRemoteObjectIdentifier for the given
-	 * object.  Returns null if this object does not adaptable to this.
-	 */
-	protected IRemoteObjectIdentifier getRemoteAdapter(Object o) 
-	{
-		return (IRemoteObjectIdentifier)((IAdaptable)o).getAdapter(IRemoteObjectIdentifier.class);
-	}
-	
-	protected ISystemViewElementAdapter getViewAdapter(Object o)
-	{
-		return (ISystemViewElementAdapter)((IAdaptable)o).getAdapter(ISystemViewElementAdapter.class);
-	}
-
-	/**
-	 *
-	 */
-	public void handleDispose(DisposeEvent event) {
-		//if (debug)
-		//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Inside handleDispose for SystemView");
-		RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
-		RSEUIPlugin.getTheSystemRegistry().removeSystemRemoteChangeListener(this);
-		busyCursor.dispose();
-		super.handleDispose(event);
-	}
-
-	/**
-	 * Return the connection of the selected object, whatever it is. 
-	 */
-	public IHost getSelectedConnection() {
-		Object firstSelection = ((StructuredSelection) getSelection()).getFirstElement();
-		if (firstSelection == null)
-			return null;
-		else if (firstSelection instanceof IHost)
-			return (IHost) firstSelection;
-		else if (firstSelection instanceof ISubSystem)
-			return ((ISubSystem) firstSelection).getHost();
-		else if (firstSelection instanceof ISystemFilterPoolReference)
-			return ((ISubSystem) (((ISystemFilterPoolReference) firstSelection).getProvider())).getHost();
-		else if (firstSelection instanceof ISystemFilterReference)
-			return ((ISubSystem) (((ISystemFilterReference) firstSelection).getProvider())).getHost();
-		else if (getRemoteAdapter(firstSelection) != null) {
-			ISubSystem ss = getAdapter(firstSelection).getSubSystem(firstSelection);
-			if (ss != null)
-				return ss.getHost();
-			else
-				return null;
-		} else
-			return null;
-	}
-
-	/**
-	 * We override getSelection(Control) so that a list of items
-	 * under the same parent always gets returned in the order in which
-	 * they appear in the tree view.  Otherwise, after a "move up" or
-	 * "move down", the order of selection can come back wrong.
-	 */
-	protected Item[] getSelection(Control widget) {
-		Tree tree = (Tree) widget;
-		Item[] oldResult = tree.getSelection();
-		if (oldResult != null && oldResult.length > 0) {
-			if (oldResult[0] instanceof TreeItem) {
-				Widget parentItem = ((TreeItem) oldResult[0]).getParentItem();
-				if (parentItem == null) {
-					parentItem = tree;
-				}
-				if (itemsShareParent(parentItem, oldResult)) {
-					Item[] newResult = sortSelection(parentItem, oldResult);
-					return newResult;
-				}
-			}
-		}
-		return oldResult;
-	}
-
-	protected boolean itemsShareParent(Widget parentItem, Item[] items) {
-		for (int i = 0; i < items.length; i++) {
-			Widget itemParent = ((TreeItem) items[i]).getParentItem();
-			if (parentItem instanceof TreeItem) {
-				if (itemParent != parentItem) {
-					return false;
-				}
-			} else if (itemParent != null) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	protected Item[] sortSelection(Widget parentItem, Item[] oldResult) {
-		Item[] children = null;
-		Item[] newResult = new Item[oldResult.length];
-		if (parentItem instanceof Item) {
-				children = oldResult;
-		} else
-			children = getChildren(parentItem);
-		
-		for (int i = 0; i < oldResult.length; i++) 
-		{
-			Item first = removeFirstItem(oldResult, children);
-			newResult[i] = first;
-		}
-
-		return newResult;
-
-	}
-
-	
-	protected Item removeFirstItem(Item[] items, Item[] children) 
-	{	
-		if (items != null)
-		{
-			for (int i = 0; i < items.length; i++) 
-			{
-				if (items[i] != null) 
-				{
-					Item current = items[i];
-					items[i] = null;
-					return current;			
-				}
-			}
-		}
-		return null;
-	}
-
-	
-	
-	/**
-	 * Move one tree item to a new location
-	 */
-	protected void moveTreeItem(Widget parentItem, Item item, Object src, int newPosition) {
-		if (getExpanded(item)) {
-			setExpanded(item, false);
-			refresh(src); // flush items from memory  	  
-		}
-
-		createTreeItem(parentItem, src, newPosition);
-
-		//createTreeItem(parentItem, (new String("New")), newPosition);
-		//remove(src);    
-
-		disassociate(item);
-		item.dispose();
-		// TODO: make this work so the selection order doesn't get screwed up!
-	}
-
-	/**
-	 * Move existing items a given number of positions within the same node.
-	 * If the delta is negative, they are all moved up by the given amount. If 
-	 * positive, they are all moved down by the given amount.

- */ - protected void moveTreeItems(Widget parentItem, Object[] src, int delta) { - int[] oldPositions = new int[src.length]; - Item[] oldItems = new Item[src.length]; - - for (int idx = 0; idx < src.length; idx++) - oldItems[idx] = (Item) internalFindRelativeItem(parentItem, src[idx], 1); - - Item[] children = null; - if (parentItem instanceof Item) { - children = getItems((Item) parentItem); - } else - children = getChildren(parentItem); - - for (int idx = 0; idx < src.length; idx++) - { - oldPositions[idx] = getTreeItemPosition(oldItems[idx], children) + 1; - } - - if (delta > 0) // moving down, process backwards - { - for (int idx = src.length - 1; idx >= 0; idx--) { - moveTreeItem(parentItem, oldItems[idx], src[idx], oldPositions[idx] + delta); - } - } else // moving up, process forewards - { - for (int idx = 0; idx < src.length; idx++) { - moveTreeItem(parentItem, oldItems[idx], src[idx], oldPositions[idx] + delta - 1); - } - } - } - - - - /** - * Get the position of a tree item within its parent - */ - /* - protected int getTreeItemPosition(Widget parentItem, Item childItem, Item[] items) { - int pos = -1; - Item[] children = null; - if (parentItem instanceof Item) { - if (items == null) - children = getItems((Item) parentItem); - else - children = items; - } else - children = getChildren(parentItem); - for (int idx = 0; (pos == -1) && (idx < children.length); idx++) { - if (children[idx] == childItem) pos = idx; - } - return pos; - } - */ - - - /** - * Get the position of a tree item within its parent - */ - protected int getTreeItemPosition(Item childItem, Item[] children) { - int pos = -1; - for (int idx = 0; (pos == -1) && (idx < children.length); idx++) { - if (children[idx] == childItem) pos = idx; - } - return pos; - } - - - /** - * Expand a given filter, given a subsystem that contains a reference to the filter's pool. - * This will expand down to the filter if needed - * @param parentSubSystem - the subsystem containing a reference to the filter's parent pool - * @param filter - the filter to find, reveal, and expand within the subsystem context - * @return the filter reference to the filter if found and expanded. This is a unique binary address - * within the object's in this tree, so can be used in the viewer methods to affect this particular - * node. - */ - public ISystemFilterReference revealAndExpand(ISubSystem parentSubSystem, ISystemFilter filter) { - setExpandedState(parentSubSystem.getHost(), true); // expand the connection - setExpandedState(parentSubSystem, true); // expand the subsystem - Object filterParentInTree = parentSubSystem; // will be case unless in show filter pool mode - // if showing filter pools, expand parent filter pool reference... - if (SystemPreferencesManager.getShowFilterPools()) { - ISystemFilterPoolReference poolRef = parentSubSystem.getFilterPoolReferenceManager().getReferenceToSystemFilterPool(filter.getParentFilterPool()); - setExpandedState(poolRef, true); - filterParentInTree = poolRef; - } - // now, find the filter reference, and expand it... - Widget parentItem = findItem(filterParentInTree); // find tree widget of parent - if ((parentItem == null) || !(parentItem instanceof Item)) return null; - TreeItem child = (TreeItem) internalFindReferencedItem(parentItem, filter, 1); - if (child == null) return null; - // found it! Now expand it... - setExpandedState(child.getData(), true); - return (ISystemFilterReference) child.getData(); - } - - // ------------------------------------ - // ISYSTEMRESOURCEChangeListener METHOD - // ------------------------------------ - - /** - * Called when something changes in the model - */ - public void systemResourceChanged(ISystemResourceChangeEvent event) { - ResourceChangedJob job = new ResourceChangedJob(event, this); - job.setPriority(Job.INTERACTIVE); - //job.setUser(true); - job.schedule(); - /* - Display display = Display.getCurrent(); - try { - while (job.getResult() == null) { - while (display != null && display.readAndDispatch()) { - //Process everything on event queue - } - if (job.getResult() == null) Thread.sleep(200); - } - } catch (InterruptedException e) { - } - */ - } - - /** - * Inner class which extends UIJob to connect this connection - * on the UI Thread when no Shell is available from - * the caller - */ - public class ResourceChangedJob extends UIJob { - - protected ISystemResourceChangeEvent _event; - protected SystemView _originatingViewer; - - public ResourceChangedJob(ISystemResourceChangeEvent event, SystemView originatingViewer) { - super("Resource Changed..."); //$NON-NLS-1$ - _originatingViewer = originatingViewer; - _event = event; - } - - public IStatus runInUIThread(IProgressMonitor monitor) { - int type = _event.getType(); - Object src = _event.getSource(); - Object parent = _event.getParent(); - - String[] properties = new String[1]; - if (parent == RSEUIPlugin.getTheSystemRegistry()) parent = inputProvider; - ISubSystem ss = null; - Widget item = null; - 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); - - //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: - findAndUpdateFilter(_event, type); - break; - case EVENT_CHANGE_FILTERSTRING_REFERENCE: - findAndUpdateFilterString(_event, type); - break; - - case EVENT_ADD_FILTERSTRING_REFERENCE: - case EVENT_DELETE_FILTERSTRING_REFERENCE: - case EVENT_MOVE_FILTERSTRING_REFERENCES: - //findAndUpdateFilterStringParent(event, type); - //break; - case EVENT_ADD_FILTER_REFERENCE: - case EVENT_DELETE_FILTER_REFERENCE: - case 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)) { - close(); - return Status.OK_STATUS; - } - - findAndUpdateFilterParent(_event, type); - break; - - case EVENT_ADD: - case EVENT_ADD_RELATIVE: - if (debug) { - logDebugMsg("SV event: EVENT_ADD "); //$NON-NLS-1$ - } - clearSelection(); - //refresh(parent); - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) { - refresh(parent); // flush cached stuff so next call will show new item - } else if ((parentItem instanceof Item) || // regular node - (parent == inputProvider)) // root node. Hmm, hope this is going to work in all cases - { - boolean addingConnection = (src instanceof IHost); - //System.out.println("ADDING CONNECTIONS.........................: " + addingConnection); - //System.out.println("event.getParent() instanceof SystemRegistry: " + (event.getParent() instanceof SystemRegistry)); - //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) { - previous = _event.getRelativePrevious(); - if (previous != null) pos = getItemIndex(parentItem, previous); - if (pos >= 0) pos++; // want to add after previous - } else - pos = _event.getPosition(); - //logDebugMsg("ADDING CONN? "+ addingConnection + ", position="+pos); - createTreeItem(parentItem, src, pos); - setSelection(new StructuredSelection(src), true); - } - break; - case EVENT_ADD_MANY: - if (debug) { - logDebugMsg("SV event: EVENT_ADD_MANY"); //$NON-NLS-1$ - } - multiSource = _event.getMultiSource(); - clearSelection(); - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) { - refresh(parent); // flush cached stuff so next call will show new items - } else if (multiSource.length > 0) { - boolean addingConnections = (multiSource[0] instanceof IHost); - // are we restoring connections previously removed due to making a profile inactive, - // and is one of these connections the one we were opened with? - if (addingConnections && (_event.getParent() instanceof ISystemRegistry) && (inputProvider instanceof SystemEmptyListAPIProviderImpl)) { - boolean done = false; - for (int idx = 0; !done && (idx < multiSource.length); idx++) { - if (multiSource[idx] == previousInputConnection) { - done = true; - setInputProvider(previousInputProvider); - previousInput = null; - previousInputProvider = null; - } - } - if (done) return Status.OK_STATUS; - } - // are we adding connections and yet we are not a secondary perspective? - // If so, this event does not apply to us. - else if (addingConnections && (_event.getParent() instanceof ISystemRegistry) && !inputProvider.showingConnections()) return Status.OK_STATUS; - - for (int idx = 0; idx < multiSource.length; idx++) { - if (debug && addingConnections) logDebugMsg("... new connection " + ((IHost) multiSource[idx]).getAliasName()); //$NON-NLS-1$ - createTreeItem(parentItem, multiSource[idx], -1); - } - setSelection(new StructuredSelection(multiSource), true); - } - break; - case EVENT_REPLACE_CHILDREN: - if (debug) { - logDebugMsg("SV event: EVENT_REPLACE_CHILDREN"); //$NON-NLS-1$ - } - multiSource = _event.getMultiSource(); - //logDebugMsg("MULTI-SRC LENGTH : " + multiSource.length); - clearSelection(); - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if (multiSource.length > 0 && parentItem instanceof Item) { - getControl().setRedraw(false); - collapseNode(parent, true); // collapse and flush gui widgets from memory - //setExpandedState(parent, true); // expand the parent - setExpanded((Item) parentItem, true); // expand the parent without calling resolveFilterString - TreeItem[] kids = ((TreeItem) parentItem).getItems(); // any kids? Like a dummy node? - if (kids != null) for (int idx = 0; idx < kids.length; idx++) - kids[idx].dispose(); - //boolean addingConnections = (multiSource[0] instanceof SystemConnection); - for (int idx = 0; idx < multiSource.length; idx++) { - //if (debug && addingConnections) - // logDebugMsg("... new connection " + ((SystemConnection)multiSource[idx]).getAliasName()); - createTreeItem(parentItem, multiSource[idx], -1); - } - getControl().setRedraw(true); - //setSelection(new StructuredSelection(multiSource),true); - } - break; - case 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(); - //e.fillInStackTrace(); - //e.printStackTrace(); - } - // I HAVE DECIDED TO CHANGE THE SELECTION ALGO TO ONLY RESELECT IF THE CURRENT - // SELECTION IS A CHILD OF THE PARENT... PHIL - boolean wasSrcSelected = false; - if (src != null) { - wasSrcSelected = isSelectedOrChildSelected(src); - //System.out.println("WAS SELECTED? " + wasSrcSelected); - } - item = findItem(parent); - //logDebugMsg(" parent = " + parent); - //logDebugMsg(" item = " + item); - // INTERESTING BUG HERE. GETEXPANDED WILL RETURN TRUE IF THE TREE ITEM HAS EVER BEEN - // EXPANDED BUT IS NOW COLLAPSED! I CANNOT FIND ANY API IN TreeItem or TreeViewer THAT - // WILL TELL ME IF A TREE ITEM IS SHOWING OR NOT! - if ((item != null) && (item instanceof TreeItem) && ((TreeItem) item).getExpanded()) { - if (wasSrcSelected) { - //System.out.println("...Clearing selection"); - clearSelection(); - } - //refresh(parent); - if (debug) System.out.println("Found item and it was expanded for " + parent); //$NON-NLS-1$ - getControl().setRedraw(false); - collapseNode(parent, true); // collapse and flush gui widgets from memory - setExpandedState(parent, true); // expand the parent - getControl().setRedraw(true); - if (wasSrcSelected) { - //System.out.println("Setting selection to " + src); - setSelection(new StructuredSelection(src), true); - } - } else - collapseNode(parent, true); - break; - case 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)) { - close(); - return Status.OK_STATUS; - } - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) - refresh(parent); // flush memory - else { - wasSelected = isSelectedOrChildSelected(src); - if (wasSelected) clearSelection(); - _originatingViewer.remove(src); - if (wasSelected) setSelection(new StructuredSelection(parent), true); - } - break; - - case 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? - if (affectsInput(multiSource)) { - close(); - return Status.OK_STATUS; - } - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) - refresh(parent); // flush memory - else if (parentItem instanceof Tree) { - refresh(); - } else { - wasSelected = isSelectedOrChildSelected(multiSource); - if (wasSelected) clearSelection(); - if (_originatingViewer != null) _originatingViewer.remove(multiSource); - if (wasSelected) setSelection(new StructuredSelection(parent), true); - } - break; - /* Now done below in systemRemoteResourceChanged - case EVENT_DELETE_REMOTE: - if (debug) - logDebugMsg("SV event: EVENT_DELETE_REMOTE "); - deleteRemoteObject(src); - break; - - case EVENT_DELETE_REMOTE_MANY: - // multi-source: array of objects to delete - if (debug) - logDebugMsg("SV event: EVENT_DELETE_REMOTE_MANY "); - multiSource = event.getMultiSource(); - //remoteItemsToSkip = null; // reset - if ((multiSource == null) || (multiSource.length==0)) - return; - for (int idx=0; idx 0) { - Widget w = findItem(src); - if (w == null) { - refresh(parent); - } else { - properties[0] = IBasicPropertyConstants.P_IMAGE; - update(src, properties); // for refreshing non-structural properties in viewer when model changes - - } - } else { - properties[0] = IBasicPropertyConstants.P_IMAGE; - update(src, properties); // for refreshing non-structural properties in viewer when model changes - } - - //updatePropertySheet(); - break; - //case EVENT_CHANGE: - //if (debug) - //logDebugMsg("SV event: EVENT_CHANGE "); - //refresh(src); THIS IS AN EVIL OPERATION: CAUSES ALL EXPANDED NODES TO RE-REQUEST THEIR CHILDREN. OUCH! - //updatePropertySheet(); - //break; - case 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 - //else - // refresh(); // refresh entire tree - if ((src == null) || (src == RSEUIPlugin.getTheSystemRegistry())) - refreshAll(); - else { - //smartRefresh(src, false); - smartRefresh(src, true); - } - updatePropertySheet(); - break; - // refresh the parent of the currently selected items. - // todo: intelligently re-select previous selections - case 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)) { - //System.out.println("Selection not empty"); - parentItem = getParentItem(items[0]); // get parent of first selection. Only allowed to select items of same parent. - if ((parentItem != null) && (parentItem instanceof Item)) { - //System.out.println("parent of selection not empty: "+parentItem.getData()); - smartRefresh(new TreeItem[] { (TreeItem) parentItem }); - } - //else - //System.out.println("parent of selection is empty"); - } - //else - //System.out.println("Selection is empty"); - break; - case EVENT_REFRESH_SELECTED: - if (debug) logDebugMsg("SV event: EVENT_REFRESH_SELECTED "); //$NON-NLS-1$ - IStructuredSelection selected = (IStructuredSelection) getSelection(); - Iterator i = selected.iterator(); - // the following is a tweak. Refresh only re-queries the children. If the selected item has no - // childen, then refresh does nothing. Instead of that outcome, we re-define it to mean refresh - // the parent. The tricky part is to prevent multiple refreshes on multiple selections so we have - // to pre-scan for this scenario. - // We also want to re-select any remote objects currently selected. They lose their selection as their - // memory address changes. - Item parentElementItem = null; - Vector selectedRemoteObjects = new Vector(); - items = getTree().getSelection(); - int itemIdx = 0; - //System.out.println("Inside EVENT_REFRESH_SELECTED. FIRST SELECTED OBJECT = " + items[0].handle); - while (i.hasNext()) { - - Object element = i.next(); - ISystemViewElementAdapter adapter = _originatingViewer.getAdapter(element); - if ((parentElementItem == null) && (adapter != null) && (!adapter.hasChildren(element))) { - //parentItem = getParentItem((Item)findItem(element)); - parentItem = getParentItem(items[itemIdx]); - if ((parentItem != null) && (parentItem instanceof Item)) parentElementItem = (Item) parentItem; //.getData(); - } - if (getViewAdapter(element) != null) { - selectedRemoteObjects.addElement(element); - if (ss == null) ss = getViewAdapter(element).getSubSystem(element); - } - itemIdx++; - } - if (parentElementItem != null) { - //refresh(parentElement); - smartRefresh(new TreeItem[] { (TreeItem) parentElementItem }); - if (selectedRemoteObjects.size() > 0) { - selectRemoteObjects(selectedRemoteObjects, ss, parentElementItem); - } - } - // the following is another tweak. If an expanded object is selected for refresh, which has remote children, - // and any of those children are expanded, then on refresh the resulting list may be in a different - // order and the silly algorithm inside tree viewer will simply re-expand the children at the previous - // relative position. If that position has changed, the wrong children are re-expanded! - // How to fix this? Ugly code to get the query the list of expanded child elements prior to refresh, - // collapse them, do the refresh, then re-expand them based on absolute name versus tree position. - // Actually, to do this right we need to test if the children of the selected item are remote objects - // versus just the selected items because they may have selected a filter! - // We go straight the TreeItem level for performance and ease of programming. - else { - smartRefresh(getTree().getSelection()); - } - //else - //{ - //i = selected.iterator(); - //while (i.hasNext()) - //refresh(i.next()); - //} - - updatePropertySheet(); - break; - case EVENT_REFRESH_SELECTED_FILTER: - if (debug) logDebugMsg("SV event: EVENT_REFRESH_SELECTED_FILTER "); //$NON-NLS-1$ - IStructuredSelection selectedItems = (IStructuredSelection) getSelection(); - Iterator j = selectedItems.iterator(); - // We climb up the tree here until we find a SystemFilterReference data member in the tree. - // If we do find a reference of SystemFilterReference we refresh on it. - // If we do not find a reference of SystemFilterReference we.....TODO: WHAT DO WE DO??? - // We also want to re-select any remote objects currently selected. They lose their selection as their - // memory address changes. - Item parentElemItem = null; - Vector selRemoteObjects = new Vector(); - if (j.hasNext()) { - Object element = j.next(); - ISystemViewElementAdapter adapter = _originatingViewer.getAdapter(element); - if (adapter != null) { - Item parItem = getParentItem((Item) findItem(element)); - - if (parItem != null) parentElemItem = parItem; //.getData(); - - while (parItem != null && !(parItem.getData() instanceof ISystemFilterReference)) { - parItem = getParentItem(parItem); - - if (parItem != null) parentElemItem = parItem; //.getData(); - } - } - if (getViewAdapter(element) != null) { - selRemoteObjects.addElement(element); - ss = getViewAdapter(element).getSubSystem(element); - } - } - - if (parentElemItem != null && (parentElemItem.getData() instanceof ISystemFilterReference)) { - smartRefresh(new TreeItem[] { (TreeItem) parentElemItem }); - if (selRemoteObjects.size() > 0) { - selectRemoteObjects(selRemoteObjects, ss, parentElemItem); - } - - updatePropertySheet(); - } else { - // if we cannot find a parent element that has a system filter reference then we refresh - // everything since the explorer must be within a filter - _event.setType(ISystemResourceChangeEvents.EVENT_REFRESH); - systemResourceChanged(_event); - } - break; - case 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: - 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: - if (debug) logDebugMsg("SV event: EVENT_MOVE_MANY "); //$NON-NLS-1$ - multiSource = _event.getMultiSource(); - if ((multiSource == null) || (multiSource.length == 0)) return Status.OK_STATUS; - parentItem = findItem(parent); - if (parentItem == null) return Status.OK_STATUS; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) - refresh(parent); // flush memory - else { - clearSelection(); - moveTreeItems(parentItem, multiSource, _event.getPosition()); - setSelection(new StructuredSelection(multiSource), true); - } - break; - case EVENT_PROPERTY_CHANGE: - if (debug) logDebugMsg("SV event: EVENT_PROPERTY_CHANGE "); //$NON-NLS-1$ - String[] allProps = { IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE }; - ISystemViewElementAdapter ra = getViewAdapter(src); - if (ra != null) { - updateRemoteObjectProperties(src); - } else - update(src, allProps); // for refreshing non-structural properties in viewer when model changes - updatePropertySheet(); - break; - case EVENT_PROPERTYSHEET_UPDATE: - if (debug) logDebugMsg("SV event: EVENT_PROPERTYSHEET_UPDATE "); //$NON-NLS-1$ - updatePropertySheet(); - break; - case 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: - 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$ - { - } else - refresh(); // flush gui widgets from memory - break; - case EVENT_COLLAPSE_SELECTED: // defect 41203 - if (debug) logDebugMsg("SV event: EVENT_COLLAPSE_SELECTED "); //$NON-NLS-1$ - collapseSelected(); - break; - case EVENT_EXPAND_SELECTED: // defect 41203 - if (debug) logDebugMsg("SV event: EVENT_EXPAND_SELECTED "); //$NON-NLS-1$ - expandSelected(); - break; - - case 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; - if ((parentItem instanceof Item) && !getExpanded((Item) parentItem)) { - setExpandedState(parent, true); - Object toSelect = src; - //if (event.getMultiSource() != null) - //toSelect = event.getMultiSource(); - //clearSelection(); - if (toSelect != null) { - if (parent instanceof IRSEBaseReferencingObject) { - TreeItem child = (TreeItem) internalFindReferencedItem(parentItem, toSelect, 1); - if (child != null) toSelect = child.getData(); - } else if ((parent instanceof ISystemFilterPoolReferenceManagerProvider) && !(src instanceof IRSEBaseReferencingObject)) { - // we are in "don't show filter pools" mode and a new filter was created - // (we get the actual filter, vs on pool ref creation when we get the pool ref) - TreeItem child = (TreeItem) internalFindReferencedItem(parentItem, toSelect, 1); - if (child != null) toSelect = child.getData(); - } - setSelection(new StructuredSelection(toSelect), true); - } - } - break; - case 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: - 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 - return Status.OK_STATUS; - if (!getExpanded((Item) item)) setExpandedState(src, true); - setSelection(new StructuredSelection(src), true); - break; - - } - return Status.OK_STATUS; - } - } - - // ------------------------------------ - // ISYSTEMREMOTEChangeListener METHOD - // ------------------------------------ - - /** - * 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 - */ - public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) { - int eventType = event.getEventType(); - Object remoteResourceParent = event.getResourceParent(); - Object remoteResource = event.getResource(); - boolean originatedHere = (event.getOriginatingViewer() == this); - Vector remoteResourceNames = null; - if (remoteResource instanceof Vector) { - remoteResourceNames = (Vector) remoteResource; - remoteResource = remoteResourceNames.elementAt(0); - } - getRemoteResourceAbsoluteName(remoteResourceParent); // DWD may not be necessary - String remoteResourceName = getRemoteResourceAbsoluteName(remoteResource); - if (remoteResourceName == null) return; - - ISubSystem ss = getSubSystem(event, remoteResource, remoteResourceParent); - - Vector filterMatches = null; - - switch (eventType) { - // -------------------------- - // REMOTE RESOURCE CHANGED... - // -------------------------- - case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CHANGED: - updatePropertySheet(); // just in case - break; - // -------------------------- - // REMOTE RESOURCE CREATED... - // -------------------------- - case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED: - // we can easily lose our original selection so we need save and restore it if needed - Vector prevSelection = null; - TreeItem parentSelectionItem = null; - if (originatedHere) { - prevSelection = getRemoteSelection(); - parentSelectionItem = getSelectedParentItem(); - } - - // when a new remote resource is created, we need to interrogate all filters - // within connections to the same hostname, to see if the filter results are - // affected by this change. If so, we refresh the filter. - filterMatches = findAllRemoteItemFilterReferences(remoteResourceName, ss, null); - ArrayList selectedFilters = null; - if (filterMatches != null) { - for (int idx = 0; idx < filterMatches.size(); idx++) { - FilterMatch match = (FilterMatch) filterMatches.elementAt(idx); - TreeItem filterItem = match.getTreeItem(); - if (isTreeItemSelected(filterItem)) // if this filter is currently selected, we will lose that selection! - { - if (selectedFilters == null) selectedFilters = new ArrayList(); - selectedFilters.add(filterItem); - } - smartRefresh(new TreeItem[] { filterItem }, null, true); - } - } - // now, refresh all occurrences of the remote parent object. - refreshRemoteObject(remoteResourceParent, null, false); - // restore selected filters... - if (selectedFilters != null) setSelection(selectedFilters); - // if the create event originated here, then expand the selected node and - // select the new resource under it. - if (originatedHere) { - // first, restore previous selection... - if (prevSelection != null) selectRemoteObjects(prevSelection, ss, parentSelectionItem); - TreeItem selectedItem = getFirstSelectedTreeItem(); - if (selectedItem != null) { - if (!selectedItem.getExpanded()) // if the filter is expanded, then we already refreshed it... - { - createChildren(selectedItem); - selectedItem.setExpanded(true); - } - if (remoteResourceNames != null) - selectRemoteObjects(remoteResourceNames, ss, selectedItem); - else - selectRemoteObjects(remoteResourceName, ss, selectedItem); - } - //else - //System.out.println("Hmm, nothing selected"); - } - break; - // -------------------------- - // REMOTE RESOURCE DELETED... - // -------------------------- - case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED: - // delete all existing references to the remote object(s)... - if (remoteResourceNames != null) { - for (int idx = 0; idx < remoteResourceNames.size(); idx++) - deleteRemoteObject(remoteResourceNames.elementAt(idx), ss); - } else - deleteRemoteObject(remoteResourceName, ss); - - // now, find all filters that either list this remote resource or list the contents of it, - // if it is a container... for expediency we only test for the first resource, even if given - // a list of them... - filterMatches = findAllRemoteItemFilterReferences(remoteResourceName, ss, null); - if (filterMatches != null) { - for (int idx = 0; idx < filterMatches.size(); idx++) { - FilterMatch match = (FilterMatch) filterMatches.elementAt(idx); - TreeItem filterItem = match.getTreeItem(); - if (match.listsElement()) { - // if the filter is expanded, we are ok. If not, we need to flush its memory... - if (!getExpanded(filterItem)) refresh(filterItem.getData()); - } else // else this filter lists the contents of the deleted container element, so refresh it: - { - // if the filter is not expanded, we need to flush its memory... - if (!getExpanded(filterItem)) - refresh(filterItem.getData()); - else - // if the filter is expanded, we need to refresh it - smartRefresh(new TreeItem[] { filterItem }, null, true); - } - } - } - - break; - - // -------------------------- - // REMOTE RESOURCE RENAMED... - // -------------------------- - case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED: - // we can easily lose our original selection so we need save and restore it if needed - prevSelection = null; - parentSelectionItem = null; - if (originatedHere) { - prevSelection = getRemoteSelection(); - parentSelectionItem = getSelectedParentItem(); - } - - // rename all existing references to the remote object... - renameRemoteObject(remoteResource, event.getOldName(), ss); - - // now, find all filters that list the contents of the OLD name container. - filterMatches = findAllRemoteItemFilterReferences(event.getOldName(), ss, null); - if (filterMatches != null) { - for (int idx = 0; idx < filterMatches.size(); idx++) { - FilterMatch match = (FilterMatch) filterMatches.elementAt(idx); - TreeItem filterItem = match.getTreeItem(); - if (match.listsElementContents()) // this filter lists the contents of the renamed container element, so refresh it: - { - // if the filter is not expanded, we need only flush its memory... - if (!getExpanded(filterItem)) - refresh(filterItem.getData()); - else - // the filter is expanded, so refresh its contents. This will likely result in an empty list - smartRefresh(new TreeItem[] { filterItem }, null, true); - } - } - } - // now, find all filters that list the contents of the NEW name container. - filterMatches = findAllRemoteItemFilterReferences(remoteResourceName, ss, null); - if (filterMatches != null) { - for (int idx = 0; idx < filterMatches.size(); idx++) { - FilterMatch match = (FilterMatch) filterMatches.elementAt(idx); - TreeItem filterItem = match.getTreeItem(); - if (match.listsElementContents()) // this filter lists the contents of the renamed container element, so refresh it: - { - // if the filter is not expanded, we need only flush its memory... - if (!getExpanded(filterItem)) - refresh(filterItem.getData()); - else - // the filter is expanded, so refresh its contents. This will likely result in an empty list - smartRefresh(new TreeItem[] { filterItem }, null, true); - } - } - } - - // restore selection - if (originatedHere && (prevSelection != null)) { - selectRemoteObjects(prevSelection, ss, parentSelectionItem); - updatePropertySheet(); // just in case - } - break; - } - } - - /** - * Turn selection into an array of remote object names - */ - protected Vector getRemoteSelection() { - Vector prevSelection = null; - IStructuredSelection selection = (IStructuredSelection) getSelection(); - Iterator i = selection.iterator(); - while (i.hasNext()) { - Object element = i.next(); - IRemoteObjectIdentifier ra = getRemoteAdapter(element); - if (ra != null) { - if (prevSelection == null) prevSelection = new Vector(); - prevSelection.addElement(ra.getAbsoluteName(element)); - } - } - return prevSelection; - } - - /** - * Turn a given remote object reference into a fully qualified absolute name - */ - protected String getRemoteResourceAbsoluteName(Object remoteResource) { - if (remoteResource == null) return null; - String remoteResourceName = null; - if (remoteResource instanceof String) - remoteResourceName = (String) remoteResource; - else { - IRemoteObjectIdentifier ra = getRemoteAdapter(remoteResource); - if (ra == null) return null; - remoteResourceName = ra.getAbsoluteName(remoteResource); - } - return remoteResourceName; - } - - /** - * Deduce the subsystem from the event or remote object - */ - protected ISubSystem getSubSystem(ISystemRemoteChangeEvent event, Object remoteResource, Object remoteParent) { - if (event.getSubSystem() != null) return event.getSubSystem(); - ISubSystem ss = null; - if ((remoteResource != null) && !(remoteResource instanceof String)) { - if (remoteResource instanceof Vector) { - Vector v = (Vector) remoteResource; - if (v.size() > 0) ss = getSubSystem(event, v.elementAt(0), null); - } else { - ISystemViewElementAdapter ra = getViewAdapter(remoteResource); - if (ra != null) ss = ra.getSubSystem(remoteResource); - } - } - if ((ss == null) && (remoteParent != null) && !(remoteParent instanceof String)) { - if (remoteParent instanceof Vector) { - Vector v = (Vector) remoteParent; - if (v.size() > 0) ss = getSubSystem(event, null, v.elementAt(0)); - } else { - ISystemViewElementAdapter ra = getViewAdapter(remoteParent); - if (ra != null) ss = ra.getSubSystem(remoteParent); - } - } - return ss; - } - - // ------------------------------------ - // MISCELLANEOUS METHODS... - // ------------------------------------ - - /** - * Close us! - */ - protected void close() { - previousInputProvider = inputProvider; - previousInput = getWorkbenchPart().getSite().getPage().getInput(); - ISystemViewInputProvider ip = new SystemEmptyListAPIProviderImpl(); - setInputProvider(ip); - } - - /** - * Test if the given input is our view's input object. This is designed to only - * consider instances of ourself in non-primary perspectives. - */ - protected boolean affectsInput(Object[] elements) { - boolean affected = false; - IWorkbenchPart viewPart = getWorkbenchPart(); - if ((viewPart != null) && (getInput() != RSEUIPlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) { - for (int idx = 0; !affected && (idx < elements.length); idx++) - affected = affectsInput(elements[idx]); - } - return affected; - } - - /** - * Test if the given input is our view's input object. This is designed to only - * consider instances of ourself in non-primary perspectives. - */ - protected boolean affectsInput(Object element) { - boolean affected = false; - IWorkbenchPart viewPart = getWorkbenchPart(); - if ((viewPart != null) && (getInput() != RSEUIPlugin.getTheSystemRegistry()) && !(getInput() instanceof SystemEmptyListAPIProviderImpl)) { - - Object input = viewPart.getSite().getPage().getInput(); - if (input != null) { - Object referencedElement = getReferencedObject(element); - Object referencedInput = getReferencedObject(input); - //System.out.println("TESTING1 " + input + " vs " + element); - //System.out.println("TESTING2 " + referencedInput + " vs " + referencedElement); - if ((input == element) || (referencedInput == referencedElement)) - affected = true; - else { - while (!affected && (input != null)) { - input = getElementParent(input); - if (input != null) { - referencedInput = getReferencedObject(input); - //System.out.println("...TESTING1 " + input + " vs " + element); - //System.out.println("...TESTING2 " + referencedInput + " vs " + referencedElement); - affected = ((input == element) || (referencedInput == referencedElement)); - } - } - } - } - } - return affected; - } - - protected Object getReferencedObject(Object inputObj) { - if (inputObj instanceof ISystemFilterPoolReference) - return ((ISystemFilterPoolReference) inputObj).getReferencedFilterPool(); - else if (inputObj instanceof ISystemFilterReference) - return ((ISystemFilterReference) inputObj).getReferencedFilter(); - else if (inputObj instanceof ISystemFilterStringReference) - return ((ISystemFilterStringReference) inputObj).getReferencedFilterString(); - else - return inputObj; - } - - protected Object getElementParent(Object inputObj) { - if (inputObj instanceof IHost) - return ((IHost) inputObj).getSystemProfile(); - else if (inputObj instanceof ISubSystem) - return ((ISubSystem) inputObj).getHost(); - else if (inputObj instanceof ISystemFilterPoolReference) - return ((ISystemFilterPoolReference) inputObj).getProvider(); // will be a subsystem - else if (inputObj instanceof ISystemFilterPool) - return ((ISystemFilterPool) inputObj).getProvider(); // will be a subsystem factory. Hmm! - else if (inputObj instanceof ISystemFilterReference) - return ((ISystemFilterReference) inputObj).getParent(); // will be filter reference or filter pool reference - else if (inputObj instanceof ISystemFilter) { - ISystemFilter filter = (ISystemFilter) inputObj; - if (filter.getParentFilter() != null) - return filter.getParentFilter(); - else - return filter.getParentFilterPool(); - } else if (inputObj instanceof ISystemFilterStringReference) - return ((ISystemFilterStringReference) inputObj).getParent(); // will be a SystemFilterReference - else if (inputObj instanceof ISystemFilterString) - return ((ISystemFilterString) inputObj).getParentSystemFilter(); - else - return null; - } - - protected IHost getInputConnection(Object inputObj) { - if (inputObj instanceof IHost) - return (IHost) inputObj; - else if (inputObj instanceof ISubSystem) - return ((ISubSystem) inputObj).getHost(); - else if (inputObj instanceof ISystemFilterPoolReference) { - ISubSystem ss = (ISubSystem) ((ISystemFilterPoolReference) inputObj).getProvider(); // will be a subsystem - if (ss == null) return null; - return ss.getHost(); - } else if (inputObj instanceof ISystemFilterReference) { - ISubSystem ss = (ISubSystem) ((ISystemFilterReference) inputObj).getProvider(); // will be a subsystem - if (ss == null) return null; - return ss.getHost(); - } else if (inputObj instanceof ISystemFilterStringReference) { - ISubSystem ss = (ISubSystem) ((ISystemFilterStringReference) inputObj).getProvider(); // will be a subsystem - if (ss == null) return null; - return ss.getHost(); - } else - return null; - } - - /** - * Handy debug method to print a tree item - */ - protected String printTreeItem(Item item) { - if (item == null) - return ""; //$NON-NLS-1$ - else if (item instanceof TreeItem) { - TreeItem ti = (TreeItem) item; - return printTreeItem(ti.getParentItem()) + "/" + ti.getText(); //$NON-NLS-1$ - } else - return item.toString(); - } - - /** - * Delete all occurrences of a given remote object - */ - protected void deleteRemoteObject(Object deleteObject, ISubSystem subsystem) { - Vector matches = null; - String oldElementName = null; - - // STEP 1: get the object's remote adapter and subsystem - if (deleteObject instanceof String) - oldElementName = (String) deleteObject; - else { - ISystemViewElementAdapter rmtAdapter = getViewAdapter(deleteObject); - if (rmtAdapter == null) return; - oldElementName = rmtAdapter.getAbsoluteName(deleteObject); - subsystem = rmtAdapter.getSubSystem(deleteObject); - } - // STEP 2: find all references to the object - matches = findAllRemoteItemReferences(oldElementName, deleteObject, subsystem, matches); - if (matches == null) { - //System.out.println("matches is null"); - return; - } - - boolean wasSelected = false; - Item parentItem = null; - - boolean dupes = false; - Object prevData = null; - for (int idx = 0; !dupes && (idx < matches.size()); idx++) { - Item match = (Item) matches.elementAt(idx); - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { - if (match.getData() == prevData) - dupes = true; - else - prevData = match.getData(); - } - } - //System.out.println("matches size = " + matches.size() + ", any binary duplicates? " + dupes); - - List toRemove = new ArrayList(); - // STEP 3: process all references to the object - for (int idx = 0; idx < matches.size(); idx++) { - Item match = (Item) matches.elementAt(idx); - //System.out.println("...match " + idx + ": TreeItem? " + (match instanceof TreeItem) + ", disposed? " + ((TreeItem)match).isDisposed()); - // a reference to this remote object - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { - ((TreeItem) match).getParentItem(); // DWD may not be necessary - Object data = match.getData(); - if (!wasSelected) { - //wasSelected = isSelectedOrChildSelected(data); - wasSelected = isTreeItemSelectedOrChildSelected(match); - if (wasSelected) { - clearSelection(); - parentItem = ((TreeItem) match).getParentItem(); - //System.out.println("...current item was selected"); - } - } - if (dupes) // defect 46818 - { // if there are multiple references to the same binary object, ... - //System.out.println(".....calling refresh(data) on this match"); - /* - if (pItem!=null) - smartRefresh(new TreeItem[] {pItem}); // just refresh the parent node - else - refreshAll(); - */ - disassociate(match); - match.dispose(); - } else { - toRemove.add(data); - //System.out.println(".....calling remove(data) on this match"); - //remove(data); // remove this item from the tree - } - } - } - - // do the remove now - remove(toRemove.toArray()); - - // STEP 4: if we removed a selected item, select its parent - if (wasSelected && (parentItem != null) && (parentItem instanceof TreeItem) && (parentItem.getData() != null)) { - //System.out.println("Resetting selection to parent"); - setSelection(new StructuredSelection(parentItem.getData()), true); - } - return; - } - - /** - * Rename a remote object. Renames all references to it currently displayed in this tree. - */ - protected void renameRemoteObject(Object renameObject, String oldElementName, ISubSystem subsystem) { - String[] properties = new String[1]; - properties[0] = IBasicPropertyConstants.P_TEXT; - - // STEP 0: do we have the physical remote object that has been renamed? If so, update it directly - /* - Item item = (Item)findItem(renameObject); - if (item != null) - { - update(renameObject, properties); // for refreshing non-structural properties in viewer when model changes - if (item instanceof TreeItem) - smartRefresh(new TreeItem[] {(TreeItem)item}); // we update the kids because they typically store references to their parent - } - */ - - Vector matches = null; - - // STEP 1: get the object's remote adapter and subsystem - String newElementName = null; - ISystemViewElementAdapter rmtAdapter = null; - if (renameObject instanceof String) { - //FIXME How to get the adapter based on the String name? - newElementName = (String)renameObject; - } else { - rmtAdapter = getViewAdapter(renameObject); - subsystem = rmtAdapter.getSubSystem(renameObject); - newElementName = rmtAdapter.getName(renameObject); - } - - // STEP 2: find all references to the old name object - matches = findAllRemoteItemReferences(oldElementName, renameObject, subsystem, matches); - if (matches == null) return; - - TreeItem[] selected = getTree().getSelection(); - getTree().deselectAll(); - - boolean refresh = false; - // STEP 3: process all references to the old name object - for (int idx = 0; idx < matches.size(); idx++) { - Item match = (Item) matches.elementAt(idx); - // a reference to this remote object - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) - { - Object data = match.getData(); - - ISystemRemoteElementAdapter remoteAdapter = (ISystemRemoteElementAdapter)((IAdaptable)data).getAdapter(ISystemRemoteElementAdapter.class); - - if (data != renameObject) // not a binary match - { - if (remoteAdapter != null) - { - // DKM - would be nice to eventually get rid of remote element adapter - refresh = remoteAdapter.refreshRemoteObject(data, renameObject); // old, new - } - } else { - refresh = true; - } - - // rename explicitly here (since internalUpdate doesn't seem to have an effect - match.setText(newElementName); - //updateItem(match, renameObject); - internalUpdate(match, data, properties); - - //update(data, properties); // for refreshing non-structural properties in viewer when model changes - //System.out.println("Match found. refresh required? " + refresh); -// if (refresh) - //refreshRemoteObject(data,null,false); - // smartRefresh(new TreeItem[] { (TreeItem) match }); - } - } - - if (refresh) - { - // causes duplicates to appear when there are more than one rename objects - //smartRefresh((TreeItem[])matches.toArray(new TreeItem[matches.size()])); - getTree().setSelection(selected); - } - - // STEP 4: update property sheet, just in case. - updatePropertySheet(); - - return; - } - - /** - * Update properties of remote object. Update all references to this object - */ - protected void updateRemoteObjectProperties(Object remoteObject) { - Vector matches = new Vector(); - - // STEP 1: get the object's remote adapter and subsystem - ISystemRemoteElementAdapter rmtAdapter = (ISystemRemoteElementAdapter)((IAdaptable)remoteObject).getAdapter(ISystemRemoteElementAdapter.class); - - ISubSystem subsystem = rmtAdapter.getSubSystem(remoteObject); - - // STEP 2: find all references to the object - String oldElementName = rmtAdapter.getAbsoluteName(remoteObject); - findAllRemoteItemReferences(oldElementName, remoteObject, subsystem, matches); - - // STEP 3: process all references to the object - String[] allProps = { IBasicPropertyConstants.P_TEXT, IBasicPropertyConstants.P_IMAGE }; - for (int idx = 0; idx < matches.size(); idx++) { - Item match = (Item) matches.elementAt(idx); - // a reference to this remote object - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { - Object data = match.getData(); - if (data == remoteObject) // same binary object as given? - update(data, allProps); // for refreshing non-structural properties in viewer when model changes - else // match by name - { - - - rmtAdapter.refreshRemoteObject(data, remoteObject); // old, new - update(data, allProps); - } - } - } - - // STEP 4: update the property sheet in case we changed properties of first selected item - updatePropertySheet(); - return; - } - - /** - * Refresh contents of remote container. Refreshes all references to this container including filters that - * display the contents of this container. - * @param remoteObject - either an actual remote object, or the absolute name of a remote object - * @param toSelect - the child object to select after refreshing the given object. This will force the - * object to be expanded, and then select this object which can be a remote object or absolute name of a - * remote object. To simply force an expand of the remote object, without bothering to select a child, - * pass an instance of SystemViewDummyObject. - * @return true if a refresh done, false if given a non-remote object. - */ - protected boolean refreshRemoteObject(Object remoteObject, Object toSelect, boolean originatedHere) { - if (remoteObject == null) return false; - - // STEP 1: get the object's remote adapter and subsystem, or use its name if only given that - ISystemViewElementAdapter rmtAdapter = null; - ISubSystem subsystem = null; - String oldElementName = null; - if (!(remoteObject instanceof String)) { - rmtAdapter = getViewAdapter(remoteObject); - if (rmtAdapter == null) return false; - subsystem = rmtAdapter.getSubSystem(remoteObject); - oldElementName = rmtAdapter.getAbsoluteName(remoteObject); - } else - oldElementName = (String) remoteObject; - - Vector matches = new Vector(); - // STEP 2: find all references to the object - findAllRemoteItemReferences(oldElementName, remoteObject, subsystem, matches); - if (remoteObject instanceof String) remoteObject = getFirstRemoteObject(matches); - - if (remoteObject instanceof ISystemContainer) { - ((ISystemContainer) remoteObject).markStale(true); - } - - // STEP 3: process all references to the object - boolean firstSelection = true; - for (int idx = 0; idx < matches.size(); idx++) { - Item match = (Item) matches.elementAt(idx); - // a reference to this remote object - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { - Object data = match.getData(); - smartRefresh(new TreeItem[] { (TreeItem) match }); // refresh the remote object - if (firstSelection && // for now, we just select the first binary occurrence we find - (data == remoteObject)) // same binary object as given? - { - firstSelection = false; - if ((toSelect != null) && originatedHere) { - if (!getExpanded(match)) // assume if callers wants to select kids that they want to expand parent - { - createChildren(match); - setExpanded(match, true); - } - // todo: handle cumulative selections. - // STEP 4: If requested, select the kids in the newly refreshed object. - // If the same binary object appears multiple times, select the kids in the first occurrence. - // ... what else to do? - if (!(toSelect instanceof SystemViewDummyObject)) selectRemoteObjects(toSelect, null, match); // select the given kids in this parent - } - } - } - } - return true; - } - - protected void doUpdateItem(final Item item, Object element) - { - // adding this because base eclipse version isn't renaming properly on duplicates - ISystemViewElementAdapter adapter = getViewAdapter(element); - if (adapter != null && item != null && !item.isDisposed()) - { - String oldText = item.getText(); - String newText = adapter.getText(element); - if (!oldText.equals(newText)) - { - item.setText(newText); - } - } - - super.doUpdateItem(item, element); - } - - /** - * Given the result of findAllRemoteItemReferences, scan for first non-filter object - */ - protected Object getFirstRemoteObject(Vector matches) { - if ((matches == null) || (matches.size() == 0)) return null; - Object firstRemote = matches.elementAt(0); - if (firstRemote != null) firstRemote = ((Item) firstRemote).getData(); - return firstRemote; - } - - /** - * Refreshes the tree starting at the given widget. - * - * @param widget the widget - * @param element the element - * @param doStruct true if structural changes are to be picked up, - * and false if only label provider changes are of interest - */ - protected void ourInternalRefresh(Widget widget, Object element, boolean doStruct, boolean forceRemote) { - final Widget fWidget = widget; - final Object fElement = element; - final boolean fDoStruct = doStruct; - - // we have to take special care if one of our kids are selected and it is a remote object... - if (forceRemote || (isSelectionRemote() && isTreeItemSelectedOrChildSelected(widget))) { - if (!isTreeItemSelected(widget)) // it is one of our kids that is selected - { - clearSelection(); // there is nothing much else we can do. Calling code will restore it anyway hopefully - doOurInternalRefresh(fWidget, fElement, fDoStruct, true); - } else // it is us that is selected. This might be a refresh selected operation. TreeItem address won't change - { - doOurInternalRefresh(fWidget, fElement, fDoStruct, true); - } - } else { - preservingSelection(new Runnable() { - public void run() { - doOurInternalRefresh(fWidget, fElement, fDoStruct, true); - } - }); - } - } - - protected boolean isSelectionRemote() { - ISelection s = getSelection(); - if ((s != null) && (s instanceof IStructuredSelection)) { - IStructuredSelection ss = (IStructuredSelection) s; - Object firstSel = ss.getFirstElement(); - if ((firstSel != null) && (getRemoteAdapter(firstSel) != null)) return true; - } - return false; - } - - protected void doOurInternalRefresh(Widget widget, Object element, boolean doStruct, boolean firstCall) { - if (debug) { - logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$ - logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); //$NON-NLS-1$ - } - if (widget instanceof Item) { - if (doStruct) { - updatePlus((Item) widget, element); - } - updateItem(widget, element); - } - - // recurse - Item[] children = getChildren(widget); - if (children != null) { - for (int i = 0; i < children.length; i++) { - Widget item = children[i]; - Object data = item.getData(); - if (data != null) doOurInternalRefresh(item, data, doStruct, false); - } - } - if (firstCall) { - internalRefresh(element); - } - } - - protected Object[] getRawChildren(Widget w) { - Object parent = w.getData(); - - if (parent.equals(getRoot())) return super.getRawChildren(parent); - Object[] result = ((ITreeContentProvider) getContentProvider()).getChildren(parent); - if (result != null) return result; - - return new Object[0]; - } - - /* - protected void preservingSelection(Runnable updateCode) - { - super.preservingSelection(updateCode); - System.out.println("After preservingSelection: new selection = "+getFirstSelectionName(getSelection())); - } - protected void handleInvalidSelection(ISelection invalidSelection, ISelection newSelection) - { - System.out.println("Inside handleInvalidSelection: old = "+getFirstSelectionName(invalidSelection)+", new = "+getFirstSelectionName(newSelection)); - updateSelection(newSelection); - } - */ - protected String getFirstSelectionName(ISelection s) { - if ((s != null) && (s instanceof IStructuredSelection)) { - IStructuredSelection ss = (IStructuredSelection) s; - Object firstSel = ss.getFirstElement(); - String name = null; - if (firstSel != null) { - ISystemViewElementAdapter ra = getViewAdapter(firstSel); - if (ra != null) - name = ra.getAbsoluteName(firstSel); - else - name = getAdapter(firstSel).getName(firstSel); - } - return name; - } else - return null; - } - - /** - * Expand a remote object within the tree. Must be given its parent element within the tree, - * in order to uniquely find it. If not given this, we expand the first occurrence we find! - * @param remoteObject - either a remote object or a remote object absolute name - * @param subsystem - the subsystem that owns the remote objects, to optimize searches. - * @param parentObject - the parent that owns the remote objects, to optimize searches. Can - * be an object or the absolute name of a remote object. - * @return the tree item of the remote object if found and expanded, else null - */ - public Item expandRemoteObject(Object remoteObject, ISubSystem subsystem, Object parentObject) { - // given the parent? Should be easy - Item remoteItem = null; - if (parentObject != null) { - Item parentItem = null; - if (parentObject instanceof Item) - parentItem = (Item) parentObject; - else if (parentObject instanceof String) // given absolute name of remote object - parentItem = findFirstRemoteItemReference((String) parentObject, subsystem, (Item) null); // search all roots for the parent - else // given actual remote object - { - ISystemViewElementAdapter ra = getViewAdapter(parentObject); - if (ra != null) { - if (subsystem == null) subsystem = ra.getSubSystem(parentObject); - parentItem = findFirstRemoteItemReference(ra.getAbsoluteName(parentObject), subsystem, (Item) null); // search all roots for the parent - } else // else parent is not a remote object. Probably its a filter - { - Widget parentWidget = findItem(parentObject); - if (parentWidget instanceof Item) parentItem = (Item) parentWidget; - } - } - // ok, we have the parent item! Hopefully! - if (remoteObject instanceof String) - remoteItem = findFirstRemoteItemReference((String) remoteObject, subsystem, parentItem); - else - remoteItem = findFirstRemoteItemReference(remoteObject, parentItem); - if (remoteItem == null) return null; - setExpandedState(remoteItem.getData(), true); - } else // not given a parent to refine search with. Better have a subsystem!! - { - if (remoteObject instanceof String) - remoteItem = findFirstRemoteItemReference((String) remoteObject, subsystem, (Item) null); - else { - ISystemViewElementAdapter ra = getViewAdapter(remoteObject); - if (ra != null) { - if (subsystem == null) subsystem = ra.getSubSystem(remoteObject); - remoteItem = findFirstRemoteItemReference(ra.getAbsoluteName(remoteObject), subsystem, (Item) null); - } - } - if (remoteItem == null) return null; - setExpandedState(remoteItem.getData(), true); - } - return remoteItem; - } - - /** - * Select a remote object or objects given the parent remote object (can be null) and subsystem (can be null) - * @param src - either a remote object, a remote object absolute name, or a vector of remote objects or remote object absolute names - * @param subsystem - the subsystem that owns the remote objects, to optimize searches. - * @param parentObject - the parent that owns the remote objects, to optimize searches. - * @return true if found and selected - */ - public boolean selectRemoteObjects(Object src, ISubSystem subsystem, Object parentObject) { - //String parentName = null; - // given a parent object? That makes it easy... - if (parentObject != null) { - ISystemViewElementAdapter ra = getViewAdapter(parentObject); - if (ra != null) { - //parentName = ra.getAbsoluteName(parentObject); - if (subsystem == null) subsystem = ra.getSubSystem(parentObject); - Item parentItem = findFirstRemoteItemReference(parentObject, (Item) null); // search all roots for the parent - return selectRemoteObjects(src, subsystem, parentItem); - } else // else parent is not a remote object. Probably its a filter - { - Item parentItem = null; - if (parentObject instanceof Item) - parentItem = (Item) parentObject; - else { - Widget parentWidget = findItem(parentObject); - if (parentWidget instanceof Item) parentItem = (Item) parentWidget; - } - if (parentItem != null) - return selectRemoteObjects(src, (ISubSystem) null, parentItem); - else - return false; - } - } else - //return selectRemoteObjects(src, (SubSystem)null, (Item)null); // Phil test - return selectRemoteObjects(src, subsystem, (Item) null); - } - - /** - * Select a remote object or objects given the parent remote object (can be null) and subsystem (can be null) and parent TreeItem to - * start the search at (can be null) - * @param src - either a remote object, a remote object absolute name, or a vector of remote objects or remote object absolute names - * @param subsystem - the subsystem that owns the remote objects, to optimize searches. - * @param parentItem - the parent at which to start the search to find the remote objects. Else, starts at the roots. - * @return true if found and selected - */ - protected boolean selectRemoteObjects(Object src, ISubSystem subsystem, Item parentItem) { - clearSelection(); - Item selItem = null; - - if (parentItem != null && parentItem.isDisposed()) { - return false; - } - - if ((parentItem != null) && !getExpanded(parentItem)) - //setExpanded(parentItem, true); - setExpandedState(parentItem.getData(), true); - - //System.out.println("SELECT_REMOTE: PARENT = " + parent + ", PARENTITEM = " + parentItem); - if (src instanceof Vector) { - //String elementName = null; - Vector selVector = (Vector) src; - ArrayList selItems = new ArrayList(); - // our goal here is to turn the vector of names or remote objects into a collection of - // actual TreeItems we matched them on... - for (int idx = 0; idx < selVector.size(); idx++) { - Object o = selVector.elementAt(idx); - //elementName = null; - if (o instanceof String) - selItem = findFirstRemoteItemReference((String) o, subsystem, parentItem); - else - selItem = findFirstRemoteItemReference(o, parentItem); - - if (selItem != null) { - selItems.add(selItem); - // when selecting multiple items, we optimize by assuming they have the same parent... - if ((parentItem == null) && (selItem instanceof TreeItem)) parentItem = ((TreeItem) selItem).getParentItem(); - } - } - if (selItems.size() > 0) { - setSelection(selItems); - updatePropertySheet(); - return true; - } - } else { - if (src instanceof String) - //selItem = (Item)findFirstRemoteItemReference((String)src, (SubSystem)null, parentItem); Phil test - selItem = findFirstRemoteItemReference((String) src, subsystem, parentItem); - else - selItem = findFirstRemoteItemReference(src, parentItem); - - if (selItem != null) { - ArrayList selItems = new ArrayList(); - selItems.add(selItem); - setSelection(selItems); - updatePropertySheet(); - return true; - } - } - return false; - } - - /** - * Refresh the whole tree. We have special code to reselect remote objects after the refresh - */ - public void refreshAll() { - IStructuredSelection selected = (IStructuredSelection) getSelection(); - Iterator i = selected.iterator(); - Object parentElement = null; - Vector selectedRemoteObjects = new Vector(); - Widget parentItem = null; - ISubSystem ss = null; - while (i.hasNext()) { - Object element = i.next(); - if (parentElement == null) { - parentItem = getParentItem((Item) findItem(element)); - if ((parentItem != null) && (parentItem instanceof Item)) parentElement = ((Item) parentItem).getData(); - } - if (getViewAdapter(element) != null) { - selectedRemoteObjects.addElement(element); - if (ss == null) ss = getViewAdapter(element).getSubSystem(element); - } - } - - //super.refresh(); - smartRefresh((Object) null, (selectedRemoteObjects.size() > 0)); - - if (selectedRemoteObjects.size() > 0) { - selectRemoteObjects(selectedRemoteObjects, ss, parentElement); - } - } - - /** - * Do an intelligent refresh of an expanded item. The inherited algorithm for refresh is stupid, - * in that it reexpands children based on their original ordinal position which can change after a - * refresh, resulting in the wrong children being expanded. Currently this only truly comes to light - * for remote objects, where refresh really can change the resulting list and hence each child's - * ordinal position. So, to be safe we only override the inherited algorithm if any nested child - * is a remote object - */ - protected void smartRefresh(TreeItem[] itemsToRefresh) { - smartRefresh(itemsToRefresh, null, false); - } - - protected void smartRefresh(TreeItem[] itemsToRefresh, ArrayList expandedChildren, boolean forceRemote) { - areAnyRemote = false; // set in ExpandedItem constructor - boolean fullRefresh = false; - // for each selected tree item gather a list of expanded child nodes... - if (expandedChildren == null) - expandedChildren = new ArrayList(); - else - fullRefresh = true; - boolean[] wasExpanded = new boolean[itemsToRefresh.length]; - //boolean anyGivenItemsRemote = false; - for (int idx = 0; idx < itemsToRefresh.length; idx++) { - TreeItem currItem = itemsToRefresh[idx]; - // ...if this selected item is expanded, recursively gather up all its expanded descendents - Object data = currItem.getData(); - ISystemViewElementAdapter adapter = null; - if (data != null) adapter = getAdapter(data); - //if (adapter instanceof ISystemRemoteElementAdapter) { - // anyGivenItemsRemote = true; - //} - if (currItem.getExpanded() && (adapter != null) && adapter.isPromptable(data)) - setExpandedState(data, false); // collapse temp expansion of prompts - else if (currItem.getExpanded()) { - //expandedChildren.add(new ExpandedItem(currItem)); we don't need special processing for given items themselves as they will not be refreshed, only their kids - gatherExpandedChildren((fullRefresh ? null : currItem), currItem, expandedChildren); - wasExpanded[idx] = true; - } else - wasExpanded[idx] = false; - } - // ok, we have found all expanded descendents of all selected items. - - // If none of the expanded sub-nodes are remote simply use the inherited algorithm for refresh - if (!areAnyRemote) { - for (int idx = 0; idx < itemsToRefresh.length; idx++) - //ourInternalRefresh(itemsToRefresh[idx], itemsToRefresh[idx].getData(), wasExpanded[idx]); - ourInternalRefresh(itemsToRefresh[idx], itemsToRefresh[idx].getData(), true, forceRemote); // defect 42321 - return; - } - getControl().setRedraw(false); - // If any selected nodes are remote use our own algorithm: - // 1. collapse each given node and refresh it to remove the children from memory, then - // expand it again. It doesn't matter if it is remote or not since its own memory - // address won't change, only that of its children. - for (int idx = 0; idx < itemsToRefresh.length; idx++) { - TreeItem currItem = itemsToRefresh[idx]; - setExpanded(currItem, false); // collapse node - ourInternalRefresh(currItem, currItem.getData(), true, true); // dispose of children, update plus - if (wasExpanded[idx]) { - createChildren(currItem); // re-expand - currItem.setExpanded(true); - } else // hmm, item was not expanded so just flush its memory - { - - } - } - // 2. expand each previously expanded sub-node, recursively - for (int idx = 0; idx < expandedChildren.size(); idx++) { - ExpandedItem itemToExpand = (ExpandedItem) expandedChildren.get(idx); - if (itemToExpand.isRemote()) { - // find remote item based on its original name and unchanged root parent - Item item = null; - //if (itemToExpand.parentItem != null) - //item = (Item)recursiveFindRemoteItem(itemToExpand.parentItem, itemToExpand.remoteName, itemToExpand.subsystem); - //else - //item = (Item)findRemoteItem(itemToExpand.remoteName, itemToExpand.subsystem); - item = findFirstRemoteItemReference(itemToExpand.remoteName, itemToExpand.subsystem, itemToExpand.parentItem); - // if found, re-expand it - if (item != null) { - //setExpanded(item, true); - createChildren(item); - ((TreeItem) item).setExpanded(true); - if (debug) System.out.println("Re-Expanded RemoteItem: " + itemToExpand.remoteName); //$NON-NLS-1$ - } else if (debug) System.out.println("Re-Expand of RemoteItem '" + itemToExpand.remoteName + "' failed. Not found"); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - setExpandedState(itemToExpand.data, true); - if (debug) System.out.println("Re-Expanded non-remote Item: " + itemToExpand.data); //$NON-NLS-1$ - } - } - getControl().setRedraw(true); - } - - public void refreshRemote(Object element) - { - smartRefresh(element, true); - } - - /** - * Do an intelligent refresh of the given element. Can be null for full refresh - */ - protected void smartRefresh(Object element, boolean forceRemote) { - if ((element == null) || (element == getInput())) { - // fullRefresh - Tree tree = getTree(); - TreeItem[] roots = tree.getItems(); - boolean anyExpanded = false; - areAnyRemote = false; // set in ExpandedItem constructor - ArrayList expandedChildren = new ArrayList(); - if (roots != null) { - for (int idx = 0; idx < roots.length; idx++) { - TreeItem currItem = roots[idx]; - Object data = currItem.getData(); - ISystemViewElementAdapter adapter = null; - if (data != null) adapter = getAdapter(data); - if (currItem.getExpanded() && (adapter != null) && adapter.isPromptable(data)) - setExpandedState(data, false); - else if (currItem.getExpanded()) { - //setExpanded(roots[idx], false); - expandedChildren.add(new ExpandedItem(null, currItem)); - anyExpanded = true; - //gatherExpandedChildren(currItem, currItem, expandedChildren); - } - } - } - if (!anyExpanded) - super.refresh(); - else { - internalRefresh(getInput()); - roots = tree.getItems(); // re-query roots - smartRefresh(roots, expandedChildren, forceRemote); - } - } else if (getRemoteAdapter(element) != null) { - - Item item = null; - if (element instanceof String) { - item = findFirstRemoteItemReference((String) element, (ISubSystem) null, (Item) null); - if (item != null) { - smartRefresh(new TreeItem[] { (TreeItem) item }); - } - } else { - ISystemViewElementAdapter adapter = getViewAdapter(element); - // DKM - taken out as per defect 174295 - //String elementName = adapter.getName(element); - - String searchString = adapter.getAbsoluteName(element); - ISubSystem subSystem = adapter.getSubSystem(element); - - Vector matches = new Vector(); - findAllRemoteItemReferences(searchString, element, subSystem, matches); - - // DKM - taken out as per defect 174295 - //findAllRemoteItemReferences(elementName, element, subSystem, matches); - if (matches.size() > 0) { - for (int i = 0; i < matches.size(); i++) { - Item match = (Item) matches.get(i); - if ((match instanceof TreeItem) && !((TreeItem) match).isDisposed()) { - smartRefresh(new TreeItem[] { (TreeItem) match }); - } - } - } - } - - /* - Item item = null; - if (element instanceof String) - item = findFirstRemoteItemReference((String)element, (SubSystem)null, (Item)null); - else - item = findFirstRemoteItemReference(element, (Item)null); - if (item != null) - smartRefresh(new TreeItem[] {(TreeItem)item}); - - */ - } else { - Item item = (Item) findItem(element); - //System.out.println("Inside SV smartRefresh for "+element+". Item found? " + (item!=null)); - if (item != null) smartRefresh(new TreeItem[] { (TreeItem) item }); - } - } - - class ExpandedItem { - TreeItem item, parentItem; - Object data; - String remoteName; - ISystemViewElementAdapter remoteAdapter; - ISubSystem subsystem; - - ExpandedItem(TreeItem parentItem, TreeItem item) { - this.parentItem = parentItem; - this.item = item; - this.data = item.getData(); - if (data != null) { - remoteAdapter = getViewAdapter(data); - if (remoteAdapter != null) { - remoteName = remoteAdapter.getAbsoluteName(data); - subsystem = remoteAdapter.getSubSystem(data); - areAnyRemote = true; - if (debug) System.out.println("ExpandedRemoteItem added. remoteName = " + remoteName); //$NON-NLS-1$ - } else if (debug) System.out.println("ExpandedItem added. Data = " + data); //$NON-NLS-1$ - } else if (debug) System.out.println("ExpandedItem added. Data = null"); //$NON-NLS-1$ - } - - boolean isRemote() { - return (remoteAdapter != null); - } - } - - /** - * Gather up all expanded children of the given tree item into a list that can be used later to - * reexpand. - * @param parentItem The root parent which will not be refreshed itself (only its kids) and hence will remain valid after refresh. - * In a full refresh this will be null. - * @param startingItem The starting item for this search. Usually same as parentItem, but changes via recursion - * @param listToPopulate An array list that will be populated with instances of our inner class ExpandedItem - */ - protected void gatherExpandedChildren(TreeItem parentItem, TreeItem startingItem, ArrayList listToPopulate) { - TreeItem[] itemChildren = startingItem.getItems(); - if (itemChildren != null) { - for (int idx = 0; idx < itemChildren.length; idx++) { - TreeItem currChild = itemChildren[idx]; - Object data = currChild.getData(); - ISystemViewElementAdapter adapter = null; - if (data != null) adapter = getAdapter(data); - if (currChild.getExpanded() && (adapter != null) && adapter.isPromptable(data)) - setExpandedState(data, false); - else if (currChild.getExpanded()) { - listToPopulate.add(new ExpandedItem(parentItem, currChild)); - gatherExpandedChildren(parentItem, currChild, listToPopulate); - } - } - } - } - - /** - * Get index of item given its data element - */ - protected int getItemIndex(Widget parent, Object element) { - int index = -1; - Item[] kids = getChildren(parent); - if (kids != null) for (int idx = 0; idx < kids.length; idx++) - if (kids[idx].getData() == element) index = idx; - return index; - } - - /** - * We don't show actual filters, only filter references that are unique generated - * for each subtree of each subsystem. Yet, each event is relative to the filter, - * not our special filter references. Hence, all this code!! - *

- * Special case handling for updates to filters which affect the filter - * but not the filter parent: - * 1. Existing filter renamed (RENAME) - * 2. Existing filter's filter strings changed (CHANGE) - *

- * Assumption: - * 1. event.getGrandParent() == subsystem (one event fired per affected subsystem) - * 2. event.getSource() == filter or filter string (not the reference, the real filter or string) - * 3. event.getParent() == parent of filter or filter string. One of: - * a. filterPool reference or filter reference (nested) - * b. filterPool for non-nested filters when showing filter pools - * c. subsystem for non-nested filters when not showing filter pools - * d. filter for nested filters - *

- * Our job here: - * 1. Determine if we are even showing the given subsystem - * 2. Find the reference to the updated filter in that subsystem's subtree - * 3. Ask that parent to either update its name or collapse and refresh its children - * 4. Forget selecting something ... the original item remains selected! - */ - protected void findAndUpdateFilter(ISystemResourceChangeEvent event, int type) { - ISystemFilter filter = (ISystemFilter) event.getSource(); - //Object parent = event.getParent(); - if (debug) { - String eventType = null; - switch (type) { - case EVENT_RENAME_FILTER_REFERENCE: - eventType = "EVENT_RENAME_FILTER_REFERENCE"; //$NON-NLS-1$ - break; - case EVENT_CHANGE_FILTER_REFERENCE: - eventType = "EVENT_CHANGE_FILTER_REFERENCE"; //$NON-NLS-1$ - break; - } - logDebugMsg("SV event: " + eventType); //$NON-NLS-1$ - } - - // STEP 1. ARE WE EVEN SHOWING THE GIVEN SUBSYSTEM? - ISubSystem ss = (ISubSystem) event.getGrandParent(); - Widget widget = findItem(ss); - - if (widget != null) { - - // STEP 2: ARE WE SHOWING A REFERENCE TO RENAMED OR UPDATED FILTER? - Widget item = null; - - Control c = getControl(); - - // KM: defect 53008. - // Yes we are showing the subsystem, so widget is the subsystem item - if (widget != c && widget instanceof Item) { - - if (debug) logDebugMsg("...Found ss " + ss); //$NON-NLS-1$ - - item = internalFindReferencedItem(widget, filter, SEARCH_INFINITE); - } - // No, we are not showing the subsystem, so widget is the control - else if (widget == c) { - - if (debug) logDebugMsg("...Din not find ss " + ss); //$NON-NLS-1$ - - item = internalFindReferencedItem(widget, filter, SEARCH_INFINITE); - } - - if (item == null) - logDebugMsg("......didn't find renamed/updated filter's reference!"); //$NON-NLS-1$ - else { - // STEP 3: UPDATE THAT FILTER... - if (type == 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) { - //if (((TreeItem)item).getExpanded()) - //refresh(item.getData()); - smartRefresh(new TreeItem[] { (TreeItem) item }); - /* - Object data = item.getData(); - boolean wasExpanded = getExpanded((Item)item); - setExpandedState(data, false); // collapse node - refresh(data); // clear all cached widgets - if (wasExpanded) - setExpandedState(data, true); // by doing this all subnodes that were expanded are now collapsed - */ - } - updatePropertySheet(); - } - } - } - - protected void findAndUpdateFilterString(ISystemResourceChangeEvent event, int type) { - ISystemFilterString filterString = (ISystemFilterString) event.getSource(); - // STEP 1. ARE WE EVEN SHOWING THE GIVEN SUBSYSTEM? - ISubSystem ss = (ISubSystem) event.getGrandParent(); - Widget item = findItem(ss); - if (item != null && item != getControl()) { - Item ssItem = (Item) item; - if (debug) logDebugMsg("...Found ss " + ss); //$NON-NLS-1$ - // STEP 2: ARE WE SHOWING A REFERENCE TO THE UPDATED FILTER STRING? - item = internalFindReferencedItem(ssItem, filterString, SEARCH_INFINITE); - if (item == null) - 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 (((TreeItem)item).getExpanded()) - //refresh(item.getData()); - // boolean wasExpanded = getExpanded((Item)item); - Object data = item.getData(); - setExpandedState(data, false); // collapse node - refresh(data); // clear all cached widgets - //if (wasExpanded) - //setExpandedState(data, true); // hmm, should we? - String properties[] = { IBasicPropertyConstants.P_TEXT }; - update(item.getData(), properties); // for refreshing non-structural properties in viewer when model changes - updatePropertySheet(); - } - } - } - } - - /** - * We don't show actual filters, only filter references that are unique generated - * for each subtree of each subsystem. Yet, each event is relative to the filter, - * not our special filter references. Hence, all this code!! - *

- * Special case handling for updates to filters which affect the parent of the - * filter, such that the parent's children must be re-generated: - * 1. New filter created (ADD) - * 2. Existing filter deleted (DELETE) - * 3. Existing filters reordered (MOVE) - *

- * Assumption: - * 1. event.getGrandParent() == subsystem (one event fired per affected subsystem) - * 2. event.getSource() == filter (not the reference, the real filter) - * 3. event.getParent() == parent of filter. One of: - * a. filterPool reference or filter reference (nested) - * b. filterPool for non-nested filters when showing filter pools - * c. subsystem for non-nested filters when not showing filter pools - * d. filter for nested filters - *

- * Our job here: - * 1. Determine if we are even showing the given subsystem - * 2. Find the parent to the given filter: filterPool or subsystem - * 3. Ask that parent to refresh its children (causes re-gen of filter references) - * 4. Select something: QUESTION: is this subsystem the origin of this action?? - * a. For ADD, select the newly created filter reference for the new filter - * ANSWER: IF PARENT OF NEW FILTER IS WITHIN THIS SUBSYSTEM, AND WAS SELECTED PREVIOUSLY - * b. For DELETE, select the parent of the filter? - * ANSWER: IF DELETED FILTER IS WITHING THIS SUBSYSTEM AND WAS SELECTED PREVIOUSLY - * c. For MOVE, select the moved filters - * ANSWER: IF MOVED FILTERS ARE WITHIN THIS SUBSYSTEM, AND WERE SELECTED PREVIOUSLY - */ - protected void findAndUpdateFilterParent(ISystemResourceChangeEvent event, int type) { - ISubSystem ss = (ISubSystem) event.getGrandParent(); - - - boolean add = false, move = false, delete = false; - boolean afilterstring = false; - //if (debug) - //{ - String eventType = null; - switch (type) { - case EVENT_ADD_FILTER_REFERENCE: - add = true; - if (debug) eventType = "EVENT_ADD_FILTER_REFERENCE"; //$NON-NLS-1$ - break; - case EVENT_DELETE_FILTER_REFERENCE: - delete = true; - if (debug) eventType = "EVENT_DELETE_FILTER_REFERENCE"; //$NON-NLS-1$ - break; - case EVENT_MOVE_FILTER_REFERENCES: - move = true; - if (debug) eventType = "EVENT_MOVE_FILTER_REFERENCES"; //$NON-NLS-1$ - break; - case EVENT_ADD_FILTERSTRING_REFERENCE: - add = true; - afilterstring = true; - if (debug) eventType = "EVENT_ADD_FILTERSTRING_REFERENCE"; //$NON-NLS-1$ - break; - case EVENT_DELETE_FILTERSTRING_REFERENCE: - delete = true; - afilterstring = true; - if (debug) eventType = "EVENT_DELETE_FILTERSTRING_REFERENCE"; //$NON-NLS-1$ - break; - case EVENT_MOVE_FILTERSTRING_REFERENCES: - move = true; - afilterstring = true; - if (debug) eventType = "EVENT_MOVE_FILTERSTRING_REFERENCES"; //$NON-NLS-1$ - break; - - } - if (debug) logDebugMsg("SV event: " + eventType); //$NON-NLS-1$ - //} - //clearSelection(); - - ISystemFilter filter = null; - ISystemFilterString filterstring = null; - if (!afilterstring) - filter = (ISystemFilter) event.getSource(); // for multi-source move, gets first filter - else - filterstring = (ISystemFilterString) event.getSource(); - - boolean multiSource = move; - // STEP 1: ARE WE SHOWING THE SUBSYSTEM GRANDPARENT OF CURRENT REFRESH? - Widget item = findItem(ss); - - if (item == null) { - refresh(); - - if (debug) logDebugMsg("...Did not find ss " + ss.getName()); //$NON-NLS-1$ - return; - } - Item ssItem = (Item) item; - boolean wasSelected = false; - IStructuredSelection oldSelections = (IStructuredSelection) getSelection(); - - Object parent = event.getParent(); - if (debug) logDebugMsg("...Found ss " + ss); //$NON-NLS-1$ - - // STEP 2: ARE WE SHOWING A REFERENCE TO THE FILTER's PARENT POOL? - Item parentRefItem = null; - ISystemFilterContainer refdParent = null; - // 3a (reference to filter pool or filter) - if (parent instanceof ISystemFilterContainerReference) // given a reference to parent? - { - refdParent = ((ISystemFilterContainerReference) parent).getReferencedSystemFilterContainer(); - parentRefItem = (Item) internalFindReferencedItem(ssItem, refdParent, SEARCH_INFINITE); - } - // 3b and 3d. (filter pool or filter) - else if (parent instanceof ISystemFilterContainer) { - refdParent = (ISystemFilterContainer) parent; - parentRefItem = (Item) internalFindReferencedItem(ssItem, refdParent, SEARCH_INFINITE); - } - // 3c (subsystem) - else { - parentRefItem = ssItem; - } - if (parentRefItem != null) { - if (debug) logDebugMsg("......We are showing reference to parent"); //$NON-NLS-1$ - // STEP 3... YES, SO REFRESH PARENT... IT WILL RE-GEN THE FILTER REFERENCES FOR EACH CHILD FILTER - // ... actually, call off the whole show if that parent is currently not expanded!! - // HMMM... WE NEED TO REFRESH EVEN IF NOT EXPANDED IF ADDING FIRST CHILD - if (!add) // move or delete - { - if (!(((TreeItem) parentRefItem).getExpanded())) { - refresh(parentRefItem.getData()); // flush cached widgets so next expand is fresh - return; - } - // move or delete and parent is expanded... - Item oldItem = (Item) internalFindReferencedItem(parentRefItem, afilterstring ? (Object) filterstring : (Object) filter, 1); - //if (debug) - //logDebugMsg("oldItem null? " + (oldItem==null)); - if (oldItem != null) // found moved or deleted filter in our subtree - { - wasSelected = isSelected(oldItem.getData(), oldSelections); // was it selected before? - //if (debug) - //logDebugMsg("was selected? " + wasSelected); - } else { - // else interesting case ... we are showing the parent, but can't find the child! - } - if (move) { - Object[] srcObjects = null; - if (multiSource) - srcObjects = event.getMultiSource(); - else { - srcObjects = new Object[1]; - srcObjects[0] = event.getSource(); - } - moveReferencedTreeItems(parentRefItem, srcObjects, event.getPosition()); - //refresh(parentRefItem.getData()); - } else // remove - { - if (oldItem != null) - remove(oldItem.getData()); - } - } else // add operation - { - if (!(((TreeItem) parentRefItem).getExpanded())) { - refresh(parentRefItem.getData()); // delete cached GUIs - //setExpandedState(parentRefItem,true); // not our job to expand here. - } else if (afilterstring) { - ISystemFilterReference fr = (ISystemFilterReference) parentRefItem.getData(); - ISystemFilterStringReference fsr = fr.getSystemFilterStringReference(filterstring); - createTreeItem(parentRefItem, fsr, event.getPosition()); - //setSelection(new StructuredSelection(fsr),true); - } else { - Object data = parentRefItem.getData(); - if (data instanceof ISystemFilterContainerReference) { - ISystemFilterContainerReference sfcr = (ISystemFilterContainerReference) data; - ISystemFilterReference sfr = sfcr.getSystemFilterReference(ss, filter); - createTreeItem(parentRefItem, sfr, event.getPosition()); - } else // hmm, could be parent is a subsystem, child is a filter in no-show-filter-pools mode - { - if (data instanceof ISystemFilterPoolReferenceManagerProvider) // that's a subsystem! - { - ISystemFilterPoolReferenceManagerProvider sfprmp = (ISystemFilterPoolReferenceManagerProvider) data; - ISystemFilterPoolReferenceManager sfprm = sfprmp.getSystemFilterPoolReferenceManager(); - ISystemFilterReference sfr = sfprm.getSystemFilterReference(ss, filter); - createTreeItem(parentRefItem, sfr, sfprm.getSystemFilterReferencePosition(sfr)); - } - } - } - //refresh(parentRefItem.getData()); - } - - // STEP 4: DECIDE WHAT TO SELECT: - - // 4a. ADD ... only select if parent of new filter was previously selected... - if (add && isSelected(parentRefItem.getData(), oldSelections)) { - if (debug) logDebugMsg(".........that parent was previously selected"); //$NON-NLS-1$ - // .... YES, SO SELECT NEW FILTER'S REFERENCE - Item filterItem = (Item) internalFindReferencedItem(parentRefItem, afilterstring ? (Object) filterstring : (Object) filter, 1); // start at filter's parent, search for filter - if (filterItem == null) { - if (debug) logDebugMsg("Hmm, didn't find new filter's reference!"); //$NON-NLS-1$ - } else { - if (debug) logDebugMsg(".........Trying to set selection to " + filterItem.getData()); //$NON-NLS-1$ - setSelection(new StructuredSelection(filterItem.getData()), true); - } - } - // 4b. DELETE ... select parent if deleted filter was previously selected - else if (delete && wasSelected) { - setSelection(new StructuredSelection(parentRefItem.getData())); // select parent - } - // 4c. MOVE ... only select if any of moved references were previously selected... - else if (move && wasSelected && !afilterstring) { - ISystemFilter[] filters = (ISystemFilter[]) event.getMultiSource(); - if (filters != null) { - ISystemFilterReference[] newRefs = new ISystemFilterReference[filters.length]; - for (int idx = 0; idx < newRefs.length; idx++) { - Widget w = internalFindReferencedItem(parentRefItem, filters[idx], 1); - newRefs[idx] = (ISystemFilterReference) ((Item) w).getData(); - } - setSelection(new StructuredSelection(newRefs), true); - } - } else if (move && wasSelected && afilterstring) { - ISystemFilterString[] filterStrings = (ISystemFilterString[]) event.getMultiSource(); - if (filterStrings != null) { - ISystemFilterStringReference[] newRefs = new ISystemFilterStringReference[filterStrings.length]; - for (int idx = 0; idx < newRefs.length; idx++) { - Widget w = internalFindReferencedItem(parentRefItem, filterStrings[idx], 1); - newRefs[idx] = (ISystemFilterStringReference) ((Item) w).getData(); - } - setSelection(new StructuredSelection(newRefs), true); - } - } - - } else if (debug) logDebugMsg("Did not find parent ref " + parent); //$NON-NLS-1$ - } - - /** - * Move existing items a given number of positions within the same node. - * If the delta is negative, they are all moved up by the given amount. If - * positive, they are all moved down by the given amount.

- */ - protected void moveReferencedTreeItems(Widget parentItem, Object[] masterSrc, int delta) { - int[] oldPositions = new int[masterSrc.length]; - Item[] oldItems = new Item[masterSrc.length]; - Object[] src = new Object[masterSrc.length]; - - for (int idx = 0; idx < src.length; idx++) { - oldItems[idx] = (Item) internalFindReferencedItem(parentItem, masterSrc[idx], 1); - src[idx] = oldItems[idx].getData(); - } - Item[] children = null; - if (parentItem instanceof Item) { - children = getItems((Item) parentItem); - } else - children = getChildren(parentItem); - - for (int idx = 0; idx < src.length; idx++) { - oldPositions[idx] = getTreeItemPosition(oldItems[idx], children) + 1; - //logDebugMsg("::: Old position : " + oldPositions[idx]); - } - - if (delta > 0) // moving down, process backwards - { - for (int idx = src.length - 1; idx >= 0; idx--) { - //logDebugMsg("DN: Old position : " + oldPositions[idx] + ", new position : " + (oldPositions[idx]+delta)); - moveTreeItem(parentItem, oldItems[idx], src[idx], oldPositions[idx] + delta); - } - } else // moving up, process forewards - { - for (int idx = 0; idx < src.length; idx++) { - //logDebugMsg("UP: Old position : " + oldPositions[idx] + ", new position : " + (oldPositions[idx]+delta-1)); - moveTreeItem(parentItem, oldItems[idx], src[idx], oldPositions[idx] + delta - 1); - } - } - } - - /** - * Recursively tries to find a reference to the given referenced item - * - * @param parent the parent item at which to start the search. - * @param element the master element to which we want to find a tree item which references it - * @param searchLimit how deep to search - */ - protected Widget internalFindReferencedItem(Widget parent, Object element, int searchLimit) { - previousItem = null; - searchDepth = 0; - return recursiveInternalFindReferencedItem(parent, element, searchLimit); - } - - /** - * Recursively tries to find a reference the given filtercontainer - * Limits search depth to when we find an item that is not a connection, - * subsystem, filter pool, filter or filter string. - * @param parent the parent item at which to start the search. - * @param element the master element to which we want to find a tree item which references it - * @param searchLimit how deep to search - */ - protected Widget recursiveInternalFindReferencedItem(Widget parent, Object element, int searchLimit) { - // compare with node - Object data = parent.getData(); - if ((data != null) && (data instanceof IRSEBaseReferencingObject)) { - IRSEBaseReferencingObject refingData = (IRSEBaseReferencingObject) data; - Object refedData = refingData.getReferencedObject(); - //logDebugMsg("data is a refing obj to " + refingData); - if (refedData == element) - //if (refedData.equals(element)) - return parent; - else - previousItem = parent; - } - // recurse over children if we are listing a subsystem or connection or - // filter framework reference object, and nesting limit not reached. - if (((data instanceof ISubSystem) || (data instanceof IHost) || (data instanceof ISystemFilterContainer) || (data instanceof ISystemFilterContainerReference) || (data instanceof ISystemFilterStringReference)) - && (searchDepth < searchLimit)) { - ++searchDepth; - int oldDepth = searchDepth; - Item[] items = getChildren(parent); - for (int i = 0; (i < items.length); i++) { - Widget o = recursiveInternalFindReferencedItem(items[i], element, searchLimit); - if (o != null) return o; - searchDepth = oldDepth; - } - } - return null; - } - - /** - * Recursively tries to find an item starting at the given item. - * (base viewer classes do not offer a relative search!) - * - * @param parent the parent item at which to start the search. - * @param element the element to match on. Matches on "==" versus equals() - */ - protected Widget internalFindRelativeItem(Widget parent, Object element, int searchLimit) { - searchDepth = 0; - return recursiveInternalFindRelativeItem(parent, element, searchLimit); - } - - /** - * Recursively tries to find an item starting at the given item. - * (base viewer classes do not offer a relative search!) - * - * @param parent the parent item at which to start the search. - * @param element the element to match on. Matches on "==" versus equals() - */ - protected Widget recursiveInternalFindRelativeItem(Widget parent, Object element, int searchLimit) { - // compare with node - Object data = parent.getData(); - if ((data != null) && (data == element)) return parent; - // recurse over children - if (searchDepth < searchLimit) { - ++searchDepth; - int oldDepth = searchDepth; - Item[] items = getChildren(parent); - for (int i = 0; i < items.length; i++) { - Widget o = recursiveInternalFindRelativeItem(items[i], element, searchLimit); - if (o != null) return o; - searchDepth = oldDepth; - } - } - return null; - } - - protected IRemoteObjectIdentifier getRemoteData(Item item, Object rawData) { - if (rawData != null) - return getRemoteAdapter(rawData); - else - return null; - } - - /** - * Find the first binary-match or name-match of remote object, given its absolute name. - * @param remoteObjectName The absolute name of the remote object to find. - * @param subsystem The subsystem of the remote object to find. Optional. - * @param parentItem The parent item at which to start the search. Optional. - * @return TreeItem hit if found - */ - public Item findFirstRemoteItemReference(String remoteObjectName, ISubSystem subsystem, Item parentItem) { - //Vector matches = new Vector(); - Item match = null; - if (parentItem == null) - //findAllRemoteItemReferences(remoteObjectName, null, subsystem, matches); - match = internalFindFirstRemoteItemReference(remoteObjectName, null, subsystem); - else { - //recursiveFindAllRemoteItemReferences(parentItem, remoteObjectName, null, subsystem, matches); - match = recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, null, subsystem); - if (debugRemote) System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2,3)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - //if (matches.size() > 0) - // return (Item)matches.elementAt(0); - //else - // return null; - return match; - } - - /** - * Find the first binary-match or name-match of a remote object, given its binary object. - * @param remoteObject - The remote object to find. - * @param parentItem - Optionally, the parent item to start the search at - * @return TreeItem hit if found - */ - public Item findFirstRemoteItemReference(Object remoteObject, Item parentItem) { - //Vector matches = new Vector(); - ISystemViewElementAdapter adapter = getViewAdapter(remoteObject); - if (adapter == null) return null; - Item match = null; - ISubSystem subsystem = adapter.getSubSystem(remoteObject); - String remoteObjectName = adapter.getAbsoluteName(remoteObject); - if (parentItem == null) - //findAllRemoteItemReferences(remoteObjectName, remoteObject, subsystem, matches); - match = internalFindFirstRemoteItemReference(remoteObjectName, remoteObject, subsystem); - else { - //recursiveFindAllRemoteItemReferences(parentItem, remoteObjectName, remoteObject, subsystem, matches); - match = recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem); - if (debugRemote) System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - //if (matches.size() > 0) - // return (Item)matches.elementAt(0); - //else - // return null; - return match; - } - - /** - * Recursively tries to find a given remote object. Since the object memory object - * for a remote object is not dependable we call getAbsoluteName() on the adapter to - * do the comparisons. Note this does not take into account the parent connection or - * subsystem or filter, hence you must know where to start the search, else you risk - * finding the wrong one. - * - * @param element the remote object to which we want to find a tree item which references it. Can be a string or an object - * @param elementObject the actual remote element to find, for binary matching, optionally for cases when element is a string - * @param matches the vector to populate with hits - */ - protected Vector findAllRemoteItemReferences(Object element, Object elementObject, Vector matches) { - String searchString = null; - ISubSystem subsystem = null; - if (element instanceof String) - searchString = (String) element; - else { - if (elementObject == null) elementObject = element; - ISystemViewElementAdapter adapter = getViewAdapter(element); - if (adapter == null) return matches; - subsystem = adapter.getSubSystem(element); - searchString = adapter.getAbsoluteName(element); - } - Tree tree = getTree(); - Item[] roots = tree.getItems(); - if (roots == null) return matches; - if (matches == null) matches = new Vector(); - for (int idx = 0; idx < roots.length; idx++) { - matches = recursiveFindAllRemoteItemReferences(roots[idx], searchString, elementObject, subsystem, matches); - } - return matches; - } - - /** - * Recursively tries to find all occurrences of a given remote object, starting at the tree root. - * Since the object memory object for a remote object is not dependable we call getAbsoluteName() - * on the adapter to do the comparisons. - *

- * This overload takes a string and a subsystem. - * - * @param searchString the absolute name of the remote object to which we want to find a tree item which references it. - * @param elementObject the actual remote element to find, for binary matching - * @param subsystem optional subsystem to search within - * @param matches the vector to populate with hits - */ - protected Vector findAllRemoteItemReferences(String searchString, Object elementObject, ISubSystem subsystem, Vector matches) { - Tree tree = getTree(); - Item[] roots = tree.getItems(); - if (roots == null) return matches; - if (matches == null) matches = new Vector(); - for (int idx = 0; idx < roots.length; idx++) - matches = recursiveFindAllRemoteItemReferences(roots[idx], searchString, elementObject, subsystem, matches); - return matches; - } - - /** - * Recursively tries to find the first occurrence of a given remote object, starting at the tree root. - * Optionally scoped to a specific subsystem. - * Since the object memory object for a remote object is not dependable we call getAbsoluteName() - * on the adapter to do the comparisons. - *

- * This overload takes a string and a subsystem. - * - * @param searchString the absolute name of the remote object to which we want to find a tree item which references it. - * @param elementObject the actual remote element to find, for binary matching - * @param subsystem optional subsystem to search within - * @return TreeItem hit if found - */ - protected Item internalFindFirstRemoteItemReference(String searchString, Object elementObject, ISubSystem subsystem) { - Item[] roots = getTree().getItems(); - if ((roots == null) || (roots.length == 0)) return null; - Item match = null; - if (debugRemote) { - System.out.println("Inside internalFindFirstRemoteItemReference for searchString: " + searchString + ", subsystem null? " + (subsystem == null) + ", nbr roots = " + roots.length); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - for (int idx = 0; (match == null) && (idx < roots.length); idx++) { - match = recursiveFindFirstRemoteItemReference(roots[idx], searchString, elementObject, subsystem); - if (debugRemote) System.out.println("...Inside internalFindFirstRemoteItemReference. Result of searching root " + idx + ": " + roots[idx].getText() + ": " + match); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - if (debugRemote) { - System.out.println("...Inside internalFindFirstRemoteItemReference. Returning " + match); //$NON-NLS-1$ - if (match != null) System.out.println("......set bp here"); //$NON-NLS-1$ - } - return match; - } - - /** - * Recursively tries to find all references to a remote object. - * @param parent the parent item at which to start the search. - * @param elementName the absolute name of the remote element to find - * @param elementObject the actual remote element to find, for binary matching - * @param subsystem optional subsystem to search within - * @param occurrences the vector to populate with hits - */ - protected Vector recursiveFindAllRemoteItemReferences(Item parent, String elementName, Object elementObject, ISubSystem subsystem, Vector occurrences) { - Object rawData = parent.getData(); - ISystemViewElementAdapter remoteAdapter = null; - // ---------------------------- - // what are we looking at here? - // ---------------------------- - if (rawData != null) remoteAdapter = getViewAdapter(rawData); - // ----------------------------------------------------------------------- - // if this is a remote object, test if it is the one we are looking for... - // ----------------------------------------------------------------------- - if (remoteAdapter != null) { - // first test for binary match - if (elementObject == rawData) { - occurrences.addElement(parent); // found a match! - if (debugRemote) System.out.println("Find All: Remote item binary match found"); //$NON-NLS-1$ - return occurrences; // no point in checking the kids - } - // now test for absolute name match - String fqn = remoteAdapter.getAbsoluteName(rawData); - if (debugRemote) System.out.println("TESTING FINDALL: '" + fqn + "' vs '" + elementName + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if ((fqn != null) && fqn.equals(elementName)) { - occurrences.addElement(parent); // found a match! - if (debugRemote) System.out.println("...and remote item name match found"); //$NON-NLS-1$ - return occurrences; // no point in checking the kids - } - } - // ------------------------------------------------------------------------- - // if we have been given a subsystem to restrict to, that is a hint to us... - // ------------------------------------------------------------------------- - else if ((rawData != null) && (subsystem != null)) // test for hints we are in the wrong place - { - // if we are currently visiting a subsystem, and that subsystem is not from the same - // factory, then we can assume the remote object occurrences we are looking for are - // not to be found within this branch... - if ((rawData instanceof ISubSystem) && (((ISubSystem) rawData).getSubSystemConfiguration() != subsystem.getSubSystemConfiguration())) { - return occurrences; // they don't match, so don't bother checking the kids - } - // if we are currently visiting a connection, and that connection's hostname is not the same - // as that of our given subsystem, then we can assume the remote object occurrences we are - // looking for are not to be found within this branch... - else if ((rawData instanceof IHost) && (!((IHost) rawData).getHostName().equals(subsystem.getHost().getHostName()))) { - return occurrences; // they don't match, so don't bother checking the kids - } - } - // recurse over children - Item[] items = getChildren(parent); - for (int i = 0; (i < items.length); i++) { - if (!items[i].isDisposed()) occurrences = recursiveFindAllRemoteItemReferences(items[i], elementName, elementObject, subsystem, occurrences); - } - return occurrences; - } - - /** - * Recursively tries to find the first references to a remote object. - * This search is restricted to the given subsystem, if given. - * @param parent the parent item at which to start the search. - * @param elementName the absolute name of the remote element to find - * @param elementObject the actual remote element to find, for binary matching - * @param subsystem optional subsystem to search within - * @return TreeItem match if found, null if not found. - */ - protected Item recursiveFindFirstRemoteItemReference(Item parent, String elementName, Object elementObject, ISubSystem subsystem) { - Object rawData = parent.getData(); - ISystemViewElementAdapter remoteAdapter = null; - // ---------------------------- - // what are we looking at here? - // ---------------------------- - if (rawData != null) remoteAdapter = getViewAdapter(rawData); - // ----------------------------------------------------------------------- - // if this is a remote object, test if it is the one we are looking for... - // ----------------------------------------------------------------------- - if (remoteAdapter != null) { - // first test for binary match - if (elementObject == rawData) { - if (debugRemote) System.out.println("Remote item binary match found"); //$NON-NLS-1$ - return parent; // return the match - } - // now test for absolute name match - String fqn = remoteAdapter.getAbsoluteName(rawData); - if (debugRemote) System.out.println("TESTING FINDFIRST: '" + fqn + "' vs '" + elementName + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if ((fqn != null) && fqn.equals(elementName)) { - if ((subsystem != null) && (subsystem == remoteAdapter.getSubSystem(rawData))) { - if (debugRemote) System.out.println("Remote item name match found and subsystems matched"); //$NON-NLS-1$ - return parent; // return the match - } else if (subsystem == null) { - if (debugRemote) System.out.println("Remote item name match found and subsystem null"); //$NON-NLS-1$ - return parent; - } else if (debugRemote) System.out.println("Remote item name match found but subsystem mismatch"); //$NON-NLS-1$ - } - } - // ------------------------------------------------------------------------- - // if we have been given a subsystem to restrict to, that is a hint to us... - // ------------------------------------------------------------------------- - else if ((rawData != null) && (subsystem != null)) // test for hints we are in the wrong place - { - // if we are currently visiting a subsystem, and that subsystem is not from the same - // factory, then we can assume the remote object occurrences we are looking for are - // not to be found within this branch... - if ((rawData instanceof ISubSystem) && (rawData != subsystem)) { - return null; // they don't match, so don't bother checking the kids - } - // if we are currently visiting a connection, and that connection's hostname is not the same - // as that of our given subsystem, then we can assume the remote object occurrences we are - // looking for are not to be found within this branch... - else if ((rawData instanceof IHost) && !((IHost) rawData).getHostName().equals(subsystem.getHost().getHostName())) { - return null; // they don't match, so don't bother checking the kids - } - } - // recurse over children - Item[] items = getChildren(parent); - Item match = null; - for (int i = 0; (match == null) && (i < items.length); i++) { - if (!items[i].isDisposed()) match = recursiveFindFirstRemoteItemReference(items[i], elementName, elementObject, subsystem); - } - return match; - } - - /** - * Recursively tries to find all filters affected by a given remote object. - * - * @param elementName the absolute name of the remote object to which we want to find a filters which result in it. - * @param subsystem The subsystem which owns the remote resource. Necessary to scope the search for impacted filters. - * @param matches the vector to populate with hits. Can be null, in which case a new vector is created. - * - * @return Vector of FilterMatch objects for each affected filter - */ - protected Vector findAllRemoteItemFilterReferences(String elementName, ISubSystem subsystem, Vector matches) { - Tree tree = getTree(); - Item[] roots = tree.getItems(); - if (roots == null) return matches; - if (matches == null) matches = new Vector(); - for (int idx = 0; idx < roots.length; idx++) - matches = recursiveFindAllRemoteItemFilterReferences(roots[idx], elementName, subsystem, matches); - return matches; - - } - - /** - * Recursively tries to find all filters which are affected by a given remote object, such that we can subsequently refresh that filter - * after a remote resource change. - * @param parent the parent item at which to start the search. - * @param elementName the absolute name of the remote element that has been created, changed, deleted or renamed. - * @param subsystem The subsystem which owns the remote resource. Necessary to scope the search for impacted filters. - * @param occurrences the vector to populate with hits - * - * @return Vector of FilterMatch objects for each affected filter - */ - protected Vector recursiveFindAllRemoteItemFilterReferences(Item parent, String elementName, ISubSystem subsystem, Vector occurrences) { - Object rawData = parent.getData(); - - // ---------------------------- - // what are we looking at here? - // ---------------------------- - - // --------------------------------------------------------------------- - // if this is a filter object, test for two things: - // #1. does this filter list this remote object if expanded/refreshed? - // #2. does this filter list the contents of this remote object? - // --------------------------------------------------------------------- - if (rawData instanceof ISystemFilterReference) { - ISystemFilterReference filterRef = (ISystemFilterReference) rawData; - if (filterRef.getReferencedFilter().isPromptable()) return occurrences; - if (debugRemote) System.out.println("Testing filter: " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$ - ISubSystem fss = (ISubSystem) filterRef.getProvider(); - if (fss != null) // should never happen!! - { - // #1 - if (fss.doesFilterMatch(filterRef.getReferencedFilter(), elementName)) { - occurrences.addElement(new FilterMatch((TreeItem) parent, true)); // found a match! - if (debugRemote) System.out.println("...Filter match found for " + elementName + ": " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$ //$NON-NLS-2$ - return occurrences; // no point in checking the kids - } - // #2 - else if (fss.doesFilterListContentsOf(filterRef.getReferencedFilter(), elementName)) { - occurrences.addElement(new FilterMatch((TreeItem) parent, false)); // found a match! - if (debugRemote) System.out.println("...Filter content match found for " + elementName + ": " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$ //$NON-NLS-2$ - return occurrences; // no point in checking the kids - } else if (debugRemote) System.out.println("... no match on the filter for element name " + elementName); //$NON-NLS-1$ - } - } - // ---------------------------------------------------------------------- - // if this is not a filter, then before recursing on its kids, check for - // hints that such recursion is a waste of time, for performance reasons - // ---------------------------------------------------------------------- - else if (rawData != null) { - // --------------------------------------------------------------------------------- - // if we are currently visiting a subsystem, and that subsystem is not from the same - // factory, then we can assume the remote object occurrences we are looking for are - // not to be found within this branch... - // --------------------------------------------------------------------------------- - if ((rawData instanceof ISubSystem) && (subsystem != null)) { - ISubSystem currSS = (ISubSystem) rawData; - if (currSS.getSubSystemConfiguration() != subsystem.getSubSystemConfiguration()) return occurrences; // they don't match, so don't bother checking the kids - } - // ----------------------------------------------------------------------------------------- - // if we are currently visiting a connection, and that connection's hostname is not the same - // as that of our given subsystem, then we can assume the remote object occurrences we are - // looking for are not to be found within this branch... - // ----------------------------------------------------------------------------------------- - else if (rawData instanceof IHost) { - IHost currConn = (IHost) rawData; - if (!currConn.getHostName().equals(subsystem.getHost().getHostName())) return occurrences; // they don't match, so don't bother checking the kids - } - // skip the new connection prompts... - else if (rawData instanceof ISystemPromptableObject) - return occurrences; - // ------------------------------------------------------------------------ - // if this is a remote object, we are too deep into this branch of the tree - // for filters, so stop here - // ------------------------------------------------------------------------ - else if (getRemoteAdapter(rawData) != null) return occurrences; - } - // recurse over children - Item[] items = getChildren(parent); - for (int i = 0; (i < items.length); i++) { - occurrences = recursiveFindAllRemoteItemFilterReferences(items[i], elementName, subsystem, occurrences); - } - return occurrences; - } - - /** - * Inner class to ensapsulate what is put in the vector for the recursiveFindAllRemoteItemFilterReferences() method. - */ - protected class FilterMatch { - protected boolean filterListsElement; - protected boolean filterListsElementContents; - protected TreeItem match; - - FilterMatch(TreeItem match, boolean filterListsElement) { - this.match = match; - this.filterListsElement = filterListsElement; - this.filterListsElementContents = !filterListsElement; - } - - boolean listsElement() { - return filterListsElement; - } - - boolean listsElementContents() { - return filterListsElementContents; - } - - TreeItem getTreeItem() { - return match; - } - } - - /** - * -------------------------------------------------------------------------------- - * For many actions we have to walk the selection list and examine each selected - * object to decide if a given common action is supported or not. - *

- * Walking this list multiple times while building the popup menu is a performance - * hit, so we have this common method that does it only once, setting instance - * variables for all of the decisions we are in interested in. - * -------------------------------------------------------------------------------- - */ - protected void scanSelections(String whereFrom) { - //System.out.println("inside scanSelections. Called from " + whereFrom); - // here are the instance variables we set... - // protected boolean selectionShowRefreshAction; - // protected boolean selectionShowOpenViewActions; - // protected boolean selectionShowDeleteAction; - // protected boolean selectionShowRenameAction; - // protected boolean selectionIsRemoteObject; - // protected boolean selectionEnableDeleteAction; - // protected boolean selectionEnableRenameAction; - - - // initial these variables to true. Then if set to false even once, leave as false always... - selectionShowRefreshAction = true; - selectionShowOpenViewActions = true; - selectionShowGenericShowInTableAction = true; - selectionShowDeleteAction = true; - selectionShowRenameAction = true; - selectionEnableDeleteAction = true; - selectionEnableRenameAction = true; - selectionIsRemoteObject = true; - - selectionHasAncestorRelation = hasAncestorRelationSelection(); - - - IStructuredSelection selection = (IStructuredSelection) getSelection(); - Iterator elements = selection.iterator(); - SystemRemoteElementResourceSet lastSet = null; - while (elements.hasNext()) { - - Object element = elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); - if (adapter == null) continue; - - if (selectionShowRefreshAction) selectionShowRefreshAction = adapter.showRefresh(element); - - if (selectionShowOpenViewActions) selectionShowOpenViewActions = adapter.showOpenViewActions(element); - - if (selectionShowGenericShowInTableAction) selectionShowGenericShowInTableAction = adapter.showGenericShowInTableAction(element); - - if (selectionShowDeleteAction) selectionShowDeleteAction = adapter.showDelete(element); - - if (selectionShowRenameAction) selectionShowRenameAction = adapter.showRename(element); - - if (selectionEnableDeleteAction) selectionEnableDeleteAction = selectionShowDeleteAction && adapter.canDelete(element) && !selectionHasAncestorRelation; - //System.out.println("ENABLE DELETE SET TO " + selectionEnableDeleteAction); - - if (selectionEnableRenameAction) selectionEnableRenameAction = selectionShowRenameAction && adapter.canRename(element); - - if (selectionIsRemoteObject) selectionIsRemoteObject = (getRemoteAdapter(element) != null); - - if (selectionIsRemoteObject && !selectionFlagsUpdated) { - ISubSystem srcSubSystem = adapter.getSubSystem(element); - if (srcSubSystem.isConnected() || element instanceof ISystemFilterReference || element instanceof ISubSystem) - { - SystemRemoteElementResourceSet set = null; - if (lastSet != null) - { - if (lastSet.getAdapter() == adapter && lastSet.getSubSystem() == srcSubSystem) - { - set = lastSet; - } - } - if (set == null) - { - set = getSetFor(srcSubSystem, adapter); - lastSet = set; - } - set.addResource(element); - } - } - - } - - - selectionFlagsUpdated = true; - //System.out.println("Inside scan selections: selectionShowOpenViewActions = " + selectionShowOpenViewActions); - - } - - /** - * Decides whether to even show the refresh menu item. - * Assumes scanSelections() has already been called - */ - protected boolean showRefresh() { - return selectionShowRefreshAction; - /* - boolean ok = true; - IStructuredSelection selection= (IStructuredSelection)getSelection(); - Iterator elements= selection.iterator(); - int count = 0; - while (ok && elements.hasNext()) - { - Object element= elements.next(); - ISystemViewElementAdapter adapter = getAdapter(element); - if (!adapter.showRefresh(element)) - ok = false; - } - return ok; - */ - } - - /** - * Decides whether to even show the "open in new perspective" menu item. - * Assumes scanSelections() has already been called - */ - protected boolean showOpenViewActions() { - return selectionShowOpenViewActions; - } - - /** - * Decides whether to even show the generic "show in table" menu item. - * Assumes scanSelections() has already been called - */ - protected boolean showGenericShowInTableAction() { - return selectionShowGenericShowInTableAction; - } - - /** - * Decides whether all the selected objects are remote objects or not - * Assumes scanSelections() has already been called - */ - protected boolean areSelectionsRemote() { - return selectionIsRemoteObject; - } - - // --------------------------- - // ISYSTEMDELETETARGET METHODS - // --------------------------- - - /** - * Required method from ISystemDeleteTarget. - * Decides whether to even show the delete menu item. - * Assumes scanSelections() has already been called - */ - public boolean showDelete() { - if (!selectionFlagsUpdated) { - //System.out.println("Inside showDelete. selectFlagsUpdated = false"); - scanSelections("showDelete"); //$NON-NLS-1$ - } - return selectionShowDeleteAction; - } - - /** - * Required method from ISystemDeleteTarget - * Decides whether to enable the delete menu item. - * Assumes scanSelections() has already been called - */ - public boolean canDelete() { - if (!selectionFlagsUpdated) { - //System.out.println("Inside canDelete. selectFlagsUpdated = false"); - scanSelections("canDelete"); //$NON-NLS-1$ - } - return selectionEnableDeleteAction; - } - - /** - * Required method from ISystemDeleteTarget - */ - public boolean doDelete(IProgressMonitor monitor) { - SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); - IStructuredSelection selection = (IStructuredSelection) getSelection(); - Iterator elements = selection.iterator(); - //int selectedCount = selection.size(); - //Object multiSource[] = new Object[selectedCount]; - //int idx = 0; - Object element = null; - //Object parentElement = getSelectedParent(); - ISystemViewElementAdapter adapter = null; - boolean ok = true; - boolean anyOk = false; - Vector deletedVector = new Vector(); - - // keep track of the current set - SystemRemoteElementResourceSet set = null; - - try { - while (ok && elements.hasNext()) { - element = elements.next(); - //multiSource[idx++] = element; - adapter = getAdapter(element); - if (getRemoteAdapter(element) != null) continue; - ok = adapter.doDelete(getShell(), element, monitor); - if (ok) { - anyOk = true; - deletedVector.addElement(element); - } - } - // now we have things divided into sets - // delete 1 set at a time - for (int s = 0; s < _setList.size() && ok; s++) { - set = (SystemRemoteElementResourceSet) _setList.get(s); - ISubSystem srcSubSystem = set.getSubSystem(); - ISystemViewElementAdapter srcAdapter = set.getAdapter(); - - if (srcSubSystem != null) { - - // this call can throw an exception - ok = srcAdapter.doDeleteBatch(getShell(), set.getResourceSet(), monitor); - - if (ok) { - anyOk = true; - deletedVector.addAll(set.getResourceSet()); - } - } - } - } catch (SystemMessageException exc) { - SystemMessageDialog.displayErrorMessage(getShell(), exc.getSystemMessage()); - ok = false; - } catch (Exception exc) { - String msg = exc.getMessage(); - if ((msg == null) || (exc instanceof ClassCastException)) msg = exc.getClass().getName(); - SystemMessageDialog.displayErrorMessage(getShell(), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_DELETING).makeSubstitution(element, msg)); - - // refresh all parents if selection is remote objects - if (selectionIsRemoteObject) { - - // we only need to iterate over the last set in the list of sets since presumably the sets before did not cause any exceptions - // if elements in the list before were deleted successfully, then the code after this catch block will handle them (by firing delete events) - // for the current set that caused the exception, we refresh the parents of the elements in the set (since we don't know which - // elements in the set may have been deleted successfully before the exception occurred). - if (set != null) { - List list = set.getResourceSet(); - - if (list != null && list.size() > 0) { - - Iterator iter = list.iterator(); - - Vector refreshedList = new Vector(); - - while (iter.hasNext()) { - Object obj = iter.next(); - ISystemViewElementAdapter adp = getAdapter(obj); - Object parent = adp.getParent(obj); - - if ((parent != null) && !(refreshedList.contains(parent))) { - SystemResourceChangeEvent event = new SystemResourceChangeEvent(parent, ISystemResourceChangeEvents.EVENT_REFRESH_REMOTE, null); - sr.fireEvent(event); - refreshedList.add(parent); - } - } - } - } - } - - ok = false; - } - //System.out.println("in doDelete. Any ok? " + anyOk + ", selectionIsRemoteObject? " + selectionIsRemoteObject); - if (anyOk) { - if (selectionIsRemoteObject) - sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); - else { - 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())); - } - } - return ok; - } - - // --------------------------- - // ISYSTEMRENAMETARGET METHODS - // --------------------------- - - /** - * Required method from ISystemRenameTarget. - * Decides whether to even show the rename menu item. - * Assumes scanSelections() has already been called - */ - public boolean showRename() { - return selectionShowRenameAction; - } - - /** - * Required method from ISystemRenameTarget - * Decides whether to enable the rename menu item. - * Assumes scanSelections() has already been called - */ - public boolean canRename() { - if (!selectionFlagsUpdated) scanSelections("canRename"); //$NON-NLS-1$ - return selectionEnableRenameAction; - } - - /** - * Required method from ISystemRenameTarget - */ - public boolean doRename(String[] newNames) { - SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); - IStructuredSelection selection = (IStructuredSelection) getSelection(); - Iterator elements = selection.iterator(); - Object element = null; - Object parentElement = getSelectedParent(); - ISystemViewElementAdapter adapter = null; - ISystemViewElementAdapter remoteAdapter = null; - String oldFullName = null; - boolean ok = true; - try { - int nameIdx = 0; - while (ok && elements.hasNext()) { - element = elements.next(); - adapter = getAdapter(element); - remoteAdapter = getViewAdapter(element); - if (remoteAdapter != null) oldFullName = remoteAdapter.getAbsoluteName(element); // pre-rename - ok = adapter.doRename(getShell(), element, newNames[nameIdx++]); - if (ok) { - if (remoteAdapter != null) - { - ISubSystem ss = adapter.getSubSystem(element); - sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, ss, oldFullName, this); - } - - else - sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(element, ISystemResourceChangeEvents.EVENT_RENAME, parentElement)); - } - } - } catch (SystemMessageException exc) { - SystemMessageDialog.displayErrorMessage(getShell(), exc.getSystemMessage()); - ok = false; - } catch (Exception exc) { - //String msg = exc.getMessage(); - //if ((msg == null) || (exc instanceof ClassCastException)) - // msg = exc.getClass().getName(); - SystemMessageDialog.displayErrorMessage(getShell(), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_RENAMING).makeSubstitution(element, exc), //msg), - exc); - ok = false; - } - return ok; - } - - protected void logDebugMsg(String msg) { - //RSEUIPlugin.logDebugMessage(this.getClass().getName(),msg); - msg = this.getClass().getName() + ": " + msg; //$NON-NLS-1$ - SystemBasePlugin.logInfo(msg); - System.out.println(msg); - } - - // ----------------------------------------------------------------- - // ISystemSelectAllTarget methods to facilitate the global action... - // ----------------------------------------------------------------- - /** - * Return true if select all should be enabled for the given object. - * For a tree view, you should return true if and only if the selected object has children. - * You can use the passed in selection or ignore it and query your own selection. - */ - public boolean enableSelectAll(IStructuredSelection selection) { - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items == null) || (items.length != 1)) // only allow for single selections - return false; - - TreeItem ti = items[0]; - int count = getItemCount(ti); - if (count == 1) // is it a dummy? - { - if ((getItems(ti)[0]).getData() == null) count = 0; // assume a dummy - } - return (count > 0); - } - - /** - * When this action is run via Edit->Select All or via Ctrl+A, perform the - * select all action. For a tree view, this should select all the children - * of the given selected object. You can use the passed in selected object - * or ignore it and query the selected object yourself. - */ - public void doSelectAll(IStructuredSelection selection) { - Tree tree = getTree(); - TreeItem[] currSel = tree.getSelection(); - TreeItem[] childItems = currSel[0].getItems(); - if (childItems.length == 0) return; - tree.setSelection(childItems); - Object[] childObjects = new Object[childItems.length]; - for (int idx = 0; idx < childObjects.length; idx++) - childObjects[idx] = childItems[idx].getData(); - fireSelectionChanged(new SelectionChangedEvent(this, new StructuredSelection(childObjects))); - } - - // -------------------------------------------- - // ISystemTree methods to facilitate our GUI... - // -------------------------------------------- - /** - * This is called to ensure all elements in a multiple-selection have the same parent in the - * tree viewer. If they don't we automatically disable all actions. - *

- * Designed to be as fast as possible by going directly to the SWT widgets - */ - public boolean sameParent() { - boolean same = true; - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items == null) || (items.length == 0)) return true; - TreeItem prevParent = null; - TreeItem currParent = null; - for (int idx = 0; same && (idx < items.length); idx++) { - currParent = items[idx].getParentItem(); - if ((idx > 0) && (currParent != prevParent)) - same = false; - else { - prevParent = currParent; - } - } - return same; - } - - protected boolean selectionHasAncestryRelationship() { - if (selectionFlagsUpdated) return selectionHasAncestorRelation; - - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - return hasSelectedAncestor(items); - /* - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - - for (int idx = 0; idx < items.length; idx++) { - TreeItem item = items[idx]; - // for (int c = 0; c < items.length; c++) { - // if (item != items[c]) { - if (isAncestorOf(item, items)) { - return true; - } -// } - // } - } - return false; - */ - } - - protected boolean isAncestorOf(TreeItem container, TreeItem[] items) { - TreeItem[] children = container.getItems(); - for (int i = 0; i < children.length; i++) { - TreeItem child = children[i]; - for (int j = 0; j < items.length; j++) - { - TreeItem item = items[j]; - if (child == item) { - return true; - } - else if (child.getItemCount() > 0) - { - if (isAncestorOf(child, items)) - { - return true; - } - } - } - } - return false; - } - - - protected boolean hasSelectedAncestor(TreeItem[] items) { - - List cleanParents = new ArrayList(); - - for (int j = 0; j < items.length; j++) - { - TreeItem item = items[j]; - TreeItem parent = item.getParentItem(); - while (parent != null && !cleanParents.contains(parent)) - { - if (isTreeItemSelected(parent)) - { - return true; - } - else - { - cleanParents.add(parent); - parent = parent.getParentItem(); - } - } - } - return false; - } - - - - - - -/* - protected boolean isAncestorOf(TreeItem container, TreeItem item) { - TreeItem[] children = container.getItems(); - for (int i = 0; i < children.length; i++) { - TreeItem child = children[i]; - if (child == item) { - return true; - } else if (child.getItemCount() > 0) { - if (isAncestorOf(child, item)) { - return true; - } - } - } - return false; - } -*/ - - /** - * This is called to accurately get the parent object for the current selection - * for this viewer. - *

- * The getParent() method in the adapter is very unreliable... adapters can't be sure - * of the context which can change via filtering and view options. - */ - public Object getSelectedParent() { - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items == null) || (items.length == 0)) { - return tree.getData(); - } else { - TreeItem parentItem = items[0].getParentItem(); - if (parentItem != null) - return parentItem.getData(); - else - return tree.getData(); - } - } - - /** - * Return the TreeItem of the parent of the selected node. Or null if a root is selected. - */ - public TreeItem getSelectedParentItem() { - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items == null) || (items.length == 0)) { - return null; - } else { - return items[0].getParentItem(); - } - } - - /** - * This returns the element immediately before the first selected element in this tree level. - * Often needed for enablement decisions for move up actions. - */ - public Object getPreviousElement() { - Object prevElement = null; - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items != null) && (items.length > 0)) { - TreeItem item1 = items[0]; - TreeItem[] parentItems = null; - TreeItem parentItem = item1.getParentItem(); - if (parentItem != null) - parentItems = parentItem.getItems(); - else - parentItems = item1.getParent().getItems(); - if (parentItems != null) { - TreeItem prevItem = null; - for (int idx = 0; (prevItem == null) && (idx < parentItems.length); idx++) - if ((parentItems[idx] == item1) && (idx > 0)) prevItem = parentItems[idx - 1]; - if (prevItem != null) prevElement = prevItem.getData(); - } - } - return prevElement; - } - - /** - * This returns the element immediately after the last selected element in this tree level - * Often needed for enablement decisions for move down actions. - */ - public Object getNextElement() { - Object nextElement = null; - Tree tree = getTree(); - TreeItem[] items = tree.getSelection(); - if ((items != null) && (items.length > 0)) { - TreeItem itemN = items[items.length - 1]; - TreeItem[] parentItems = null; - TreeItem parentItem = itemN.getParentItem(); - if (parentItem != null) - parentItems = parentItem.getItems(); - else - parentItems = itemN.getParent().getItems(); - if (parentItems != null) { - TreeItem nextItem = null; - for (int idx = 0; (nextItem == null) && (idx < parentItems.length); idx++) - if ((parentItems[idx] == itemN) && (idx < (parentItems.length - 1))) nextItem = parentItems[idx + 1]; - if (nextItem != null) nextElement = nextItem.getData(); - } - } - return nextElement; - } - - /** - * This is called to walk the tree back up to the roots and return the visible root - * node for the first selected object. - */ - public Object getRootParent() { - Tree tree = getTree(); - TreeItem[] selectedItems = tree.getSelection(); - Object rootElement = null; - if ((selectedItems != null) && (selectedItems.length > 0)) { - TreeItem item = selectedItems[0]; - TreeItem parentItem = item.getParentItem(); - if (parentItem == null) // item is a root element - rootElement = item.getData(); - else - while (rootElement == null) { - item = parentItem; - parentItem = item.getParentItem(); - if (parentItem == null) // item is a root element - rootElement = item.getData(); - } - } - //logDebugMsg("getRootParent returned: "+rootElement); - return rootElement; - } - - /** - * This returns an array containing each element in the tree, up to but not including the root. - * The array is in reverse order, starting at the leaf and going up. - */ - public Object[] getElementNodes(Object element) { - Widget w = findItem(element); - if ((w != null) && (w instanceof TreeItem)) return getElementNodes((TreeItem) w); - return null; - } - - /** - * This returns an array containing each element in the tree, up to but not including the root. - * The array is in reverse order, starting at the leaf and going up. - * This flavour is optimized for the case when you have the tree item directly. - */ - public Object[] getElementNodes(TreeItem item) { - Vector v = new Vector(); - v.addElement(item.getData()); - while (item != null) { - item = item.getParentItem(); - if (item != null) v.addElement(item.getData()); - } - Object[] nodes = new Object[v.size()]; - for (int idx = 0; idx < nodes.length; idx++) - nodes[idx] = v.elementAt(idx); - return nodes; - } - - /** - * This returns an array containing each element in the tree, up to but not including the root. - * The array is in reverse order, starting at the leaf and going up. - * This flavour returns a vector of TreeItem objects versus element objects. - */ - public TreeItem[] getItemNodes(TreeItem item) { - Vector v = new Vector(); - v.addElement(item); - while (item != null) { - item = item.getParentItem(); - if (item != null) v.addElement(item); - } - TreeItem[] nodes = new TreeItem[v.size()]; - for (int idx = 0; idx < nodes.length; idx++) - nodes[idx] = (TreeItem) v.elementAt(idx); - return nodes; - } - - /** - * Helper method to determine if a given object is currently selected. - * Does consider if a child node of the given object is currently selected. - */ - public boolean isSelectedOrChildSelected(Object parentElement) { - boolean isSelected = false; - Item[] selectedItems = ((Tree) getControl()).getSelection(); - if ((selectedItems != null) && (selectedItems.length > 0)) { - Widget w = findItem(parentElement); - if (!(w instanceof TreeItem)) return true; // assume we have been given the root, which means any selection is a child - TreeItem item = (TreeItem) w; - // for every selected tree item, scan upwards to the root to see if - // it or any of its parents are the given element. - for (int idx = 0; !isSelected && (idx < selectedItems.length); idx++) { - if (selectedItems[idx] instanceof TreeItem) { - if (selectedItems[idx] == item) - isSelected = true; - else - isSelected = searchToRoot((TreeItem) selectedItems[idx], item); - } - } - } - return isSelected; - //return isSelected(element, (IStructuredSelection)getSelection()); - } - - /** - * Override that takes a widget. - */ - public boolean isTreeItemSelectedOrChildSelected(Widget w) { - boolean isSelected = false; - Item[] selectedItems = ((Tree) getControl()).getSelection(); - if ((selectedItems != null) && (selectedItems.length > 0)) { - if (!(w instanceof TreeItem)) return true; // assume we have been given the root, which means any selection is a child - TreeItem item = (TreeItem) w; - // for every selected tree item, scan upwards to the root to see if - // it or any of its parents are the given element. - for (int idx = 0; !isSelected && (idx < selectedItems.length); idx++) { - if (selectedItems[idx] instanceof TreeItem) { - if (selectedItems[idx] == item) - isSelected = true; - else - isSelected = searchToRoot((TreeItem) selectedItems[idx], item); - } - } - } - return isSelected; - //return isSelected(element, (IStructuredSelection)getSelection()); - } - - /** - * Return the number of immediate children in the tree, for the given tree node - */ - public int getChildCount(Object element) { - if (getTree().isDisposed()) return 0; - Widget w = findItem(element); - if (w == null) - return 0; - - // modified patch initially provided by Tobias Schwarz - if (w instanceof TreeItem) { - TreeItem ti = (TreeItem) w; - int count = getItemCount((Item) w); - int ignoreItems = 0; - if (count > 0) { - Item[] items = getItems(ti); - for (int i=0; i reveal - if (expand) setExpandedState(element, true); - } - - /** - * Returns the tree item of the first selected object. Used for setViewerItem in a resource - * change event. - */ - public Item getViewerItem() { - TreeItem[] selectedItems = getTree().getSelection(); - if ((selectedItems != null) && (selectedItems.length > 0)) - return selectedItems[0]; - else - return null; - } - - /** - * Returns true if any of the selected items are currently expanded - */ - public boolean areAnySelectedItemsExpanded() { - boolean expanded = false; - Item[] selectedItems = ((Tree) getControl()).getSelection(); - if ((selectedItems != null) && (selectedItems.length > 0)) { - // for every selected tree item, see if it is currently expanded... - for (int idx = 0; !expanded && (idx < selectedItems.length); idx++) { - if (selectedItems[idx] instanceof TreeItem) { - if (((TreeItem) selectedItems[idx]).getExpanded()) expanded = true; - } - } - } - return expanded; - } - - /** - * Returns true if any of the selected items are expandable but not yet expanded - */ - public boolean areAnySelectedItemsExpandable() { - boolean expandable = false; - Item[] selectedItems = ((Tree) getControl()).getSelection(); - if ((selectedItems != null) && (selectedItems.length > 0)) { - // for every selected tree item, see if needs expanding... - for (int idx = 0; !expandable && (idx < selectedItems.length); idx++) { - if (selectedItems[idx] instanceof TreeItem) { - if ((((TreeItem) selectedItems[idx]).getItemCount() > 0) && !((TreeItem) selectedItems[idx]).getExpanded()) expandable = true; - } - } - } - return expandable; - } - - /** - * Initialize drag and drop support for this view. - * - */ - protected void initDragAndDrop() { - int ops = DND.DROP_COPY | DND.DROP_MOVE; - Transfer[] transfers = new Transfer[] { PluginTransfer.getInstance(), - /*ResourceTransfer.getInstance(),*/ - FileTransfer.getInstance(), EditorInputTransfer.getInstance() }; - addDragSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDragAdapter(this)); - addDropSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDropAdapter(this)); - } - - // ---------------------------------- - // Support for EXPAND TO-> ACTIONS... - // ---------------------------------- - /** - * Called when user selects an Expand To action to expand the selected remote object with a quick filter - */ - public void expandTo(String filterString) { - SystemViewPart svp = getSystemViewPart(); - if (svp == null) return; - // find the selected tree item... - TreeItem selectedItem = getFirstSelectedTreeItem(); - if (selectedItem == null) return; - Object element = selectedItem.getData(); - IRemoteObjectIdentifier remoteAdapter = getRemoteAdapter(element); - if (remoteAdapter == null) return; - // update our hashtables, keyed by object address and tree path... - if (expandToFiltersByObject == null) expandToFiltersByObject = new Hashtable(); - if (expandToFiltersByTreePath == null) expandToFiltersByTreePath = new Hashtable(); - if (filterString != null) - expandToFiltersByObject.put(selectedItem.getData(), filterString); - else - expandToFiltersByObject.remove(selectedItem.getData()); - if (filterString != null) - expandToFiltersByTreePath.put(getItemPath(selectedItem), filterString); - else - expandToFiltersByTreePath.remove(getItemPath(selectedItem)); - - // now refresh this tree item node... - refreshTreeItem(selectedItem); - } - - /** - * Return the fully-qualified path up to the given item, expressible as a string - */ - protected String getItemPath(TreeItem item) { - StringBuffer idBuffer = new StringBuffer(getItemNodeID(item)); - TreeItem[] elementNodes = getItemNodes(item); - if (elementNodes != null) { - for (int idx = elementNodes.length - 1; idx >= 0; idx--) { - item = elementNodes[idx]; - idBuffer.append(SystemViewPart.MEMENTO_DELIM + getItemNodeID(item)); - } - } - //System.out.println("MEMENTO HANDLE: " + idBuffer.toString()); - return idBuffer.toString(); - } - - /** - * Return the string identifying this node in the tree - */ - protected String getItemNodeID(TreeItem item) { - //ISystemViewElementAdapter adapter = getAdapter(item.getData()); - //return adapter.getMementoHandle(item.getData()); - return item.getText(); - } - - /** - * Callback from the input provider to test if the given node has expand-to filtering criteria - */ - public String getExpandToFilter(Object element) { - String filter = null; - // for performance reasons, we first test for a binary match... - if (expandToFiltersByObject != null) { - filter = (String) expandToFiltersByObject.get(element); - } - // if binary match fails, look for tree path match... - if ((filter == null) && (expandToFiltersByTreePath != null)) { - Widget item = findItem(element); - if ((item != null) && (item instanceof TreeItem)) { - filter = (String) expandToFiltersByTreePath.get(getItemPath((TreeItem) item)); - if (filter != null) { - if (expandToFiltersByObject == null) expandToFiltersByObject = new Hashtable(); - expandToFiltersByObject.put(element, filter); // so next time it will be faster - } - } - } - return filter; - } - - /** - * To support restoring state we need to write out to disk out current table that maps - * tree items to their current expand-to filter. That means we need access to the table. - */ - public Hashtable getExpandToFilterTable() { - return expandToFiltersByTreePath; - } - - /** - * To support restoring state we need to write out to disk out current table that maps - * tree items to their current expand-to filter. That means we need to be able to set the table. - */ - public void setExpandToFilterTable(Hashtable ht) { - expandToFiltersByTreePath = ht; - } - - protected SystemRemoteElementResourceSet getSetFor(ISubSystem subSystem, ISystemViewElementAdapter adapter) { - for (int i = 0; i < _setList.size(); i++) { - SystemRemoteElementResourceSet set = (SystemRemoteElementResourceSet) _setList.get(i); - if (set.getAdapter() == adapter && set.getSubSystem() == subSystem) { - return set; - } - } - - // no existing set - create one - SystemRemoteElementResourceSet newSet = new SystemRemoteElementResourceSet(subSystem, adapter); - _setList.add(newSet); - return newSet; - } -/* - protected boolean usingElementMap() { - return false; - } -*/ - - public void add(Object parentElementOrTreePath, Object[] childElements) { - assertElementsNotNull(childElements); - - ISystemFilterReference originalFilter = null; - if (parentElementOrTreePath instanceof IContextObject) - { - IContextObject context = (IContextObject)parentElementOrTreePath; - originalFilter = context.getFilterReference(); - parentElementOrTreePath = context.getModelObject(); - } - - Vector matches = new Vector(); - matches = findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches); - - // get rid of references to items for different connection - if (parentElementOrTreePath instanceof IAdaptable) - { - List invalidMatches = new ArrayList(); - ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)parentElementOrTreePath).getAdapter(ISystemViewElementAdapter.class); - if (adapter != null) - { - IHost parentHost = adapter.getSubSystem(parentElementOrTreePath).getHost(); - for (int i = 0; i < matches.size(); i++) - { - Widget match = (Widget) matches.get(i); - Object data = match.getData(); - if (data instanceof IAdaptable) - { - ISystemViewElementAdapter madapter = (ISystemViewElementAdapter)((IAdaptable)data).getAdapter(ISystemViewElementAdapter.class); - if (madapter != null) - { - IHost mHost = madapter.getSubSystem(data).getHost(); - if (mHost != parentHost) - { - invalidMatches.add(match); - } - } - } - } - } - - if (invalidMatches.size() > 0) - { - for (int m = invalidMatches.size() - 1; m >= 0 ; m--) - { - Object match = invalidMatches.get(m); - matches.remove(match); - } - } - } - - //Widget[] widgets = internalFindItems(parentElementOrTreePath); - // If parent hasn't been realized yet, just ignore the add. - if (matches.size() == 0) { - super.add(parentElementOrTreePath, childElements); - } - else - { - for (int i = 0; i < matches.size(); i++) { - Widget match = (Widget) matches.get(i); - ISystemFilterReference ref = getContainingFilterReference((TreeItem)match); - if (matches.size() > 1 && ref != null && ref != originalFilter) - { - // could have the same object under multiple filters - // need to apply filter - ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)parentElementOrTreePath).getAdapter(ISystemViewElementAdapter.class); - IContextObject contextObject = getContextObject((TreeItem)match); - Object[] newChildren = adapter.getChildren(new NullProgressMonitor(), contextObject); - internalAdd(match, parentElementOrTreePath, newChildren); - } - else - { - internalAdd(match, parentElementOrTreePath, childElements); - } - } - } - - TreeItem item = getFirstSelectedTreeItem(); - if (item != null) - { - if (item.getData() == parentElementOrTreePath) - { - updatePropertySheet(); - } - } - - - } - - - /** - * Get the containing filter reference for an item - * @param item the item to get the filter reference for - * @return the filter reference - */ - public ISystemFilterReference getContainingFilterReference(TreeItem item) - { - Object data = item.getData(); - if (data instanceof ISystemFilterReference) - { - return (ISystemFilterReference)data; - } - else - { - TreeItem parent = item.getParentItem(); - if (parent != null) - { - return getContainingFilterReference(parent); - } - else - { - Object input = getInput(); - if (input instanceof ISystemFilterReference) - { - return (ISystemFilterReference)input; - } - else - { - return null; - } - } - } - } - - /** - * Get the containing subsystem from an item - * @param item the item to get the subsystem for - * @return the subsystem - */ - public ISubSystem getContainingSubSystem(TreeItem item) - { - Object data = item.getData(); - if (data instanceof ISubSystem) - { - return (ISubSystem)data; - } - else - { - TreeItem parent = item.getParentItem(); - if (parent != null) - { - return getContainingSubSystem(parent); - } - else - { - Object input = getInput(); - if (input instanceof ISubSystem) - { - return (ISubSystem)input; - } - else - { - return null; - } - } - } - } - - - /** - * Get the context object from a tree item - * @param item the item to get the context for - * @return the context object - */ - public IContextObject getContextObject(TreeItem item) - { - Object data = item.getData(); - ISystemFilterReference filterReference = getContainingFilterReference(item); - if (filterReference != null) - { - return new ContextObject(data, filterReference.getSubSystem(), filterReference); - } - else - { - ISubSystem subSystem = getContainingSubSystem(item); - if (subSystem != null) - { - return new ContextObject(data, subSystem); - } - else - { - return new ContextObject(data); - } - } - } - - /** - * Overridden so that we can pass a wrapper IContextObject into the provider to get children instead - * of the model object, itself - */ - protected void createChildren(final Widget widget) - { - if (widget instanceof TreeItem) - { - final Item[] tis = getChildren(widget); - if (tis != null && tis.length > 0) { - Object data = tis[0].getData(); - if (data != null) { - return; // children already there! - } - } - - BusyIndicator.showWhile(widget.getDisplay(), new Runnable() { - public void run() { - // fix for PR 1FW89L7: - // don't complain and remove all "dummies" ... - if (tis != null) { - for (int i = 0; i < tis.length; i++) { - if (tis[i].getData() != null) { - disassociate(tis[i]); - Assert.isTrue(tis[i].getData() == null, - "Second or later child is non -null");//$NON-NLS-1$ - - } - tis[i].dispose(); - } - } - Object d = widget.getData(); - if (d != null) - { - Object parentElement = getContextObject((TreeItem)widget); - Object[] children = getSortedChildren(parentElement); - if (children != null) - { - for (int i = 0; i < children.length; i++) - { - createTreeItem(widget, children[i], -1); - } - } - } - } - - }); - } - else - { - super.createChildren(widget); - } - } - -} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java index b4292988f9b..54ec3ebde68 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java @@ -23,13 +23,13 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; +import org.eclipse.rse.internal.ui.view.SystemViewConnectionSelectionInputProvider; +import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.view.SystemPropertySheetForm; -import org.eclipse.rse.ui.view.SystemViewConnectionSelectionInputProvider; -import org.eclipse.rse.ui.view.SystemViewForm; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java index 611f7a9218e..41f1fac9e0b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java @@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.view.SystemPropertySheetForm; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.layout.FillLayout; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java index 7b5653f70d8..b19f5bb89bf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java @@ -19,7 +19,7 @@ package org.eclipse.rse.ui.widgets.services; import org.eclipse.rse.core.model.IProperty; import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.core.model.Property; -import org.eclipse.rse.ui.view.SystemComboBoxPropertyDescriptor; +import org.eclipse.rse.internal.ui.view.SystemComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java index a5b2e3218a7..7ae1bc8af45 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java @@ -28,10 +28,10 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.view.SystemPropertySheetForm; import org.eclipse.rse.ui.widgets.GridUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java index 1c427727258..f3dc600ef98 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java @@ -30,6 +30,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessage; @@ -38,7 +39,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemConnectionForm; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java index 6db8690c7be..bbb3c8932f4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java @@ -21,12 +21,12 @@ import java.util.List; import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.ui.view.monitor.TabFolderLayout; import org.eclipse.rse.ui.ISystemVerifyListener; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardErrorUpdater; import org.eclipse.rse.ui.propertypages.ISystemConnectionWizardPropertyPage; -import org.eclipse.rse.ui.view.monitor.TabFolderLayout; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemScratchpad.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemScratchpad.java index 678e8ba3200..815d1719d5a 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemScratchpad.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemScratchpad.java @@ -21,10 +21,10 @@ import java.util.List; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; +import org.eclipse.rse.internal.ui.view.SystemViewScratchpadAdapter; import org.eclipse.rse.ui.view.ISystemDragDropAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.SystemViewScratchpadAdapter; import org.eclipse.ui.views.properties.IPropertySource; 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/model/SystemRegistry.java index 863015ad590..a48a0cbba57 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/model/SystemRegistry.java @@ -73,6 +73,10 @@ import org.eclipse.rse.internal.model.SystemProfileManager; 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.ui.view.SystemDNDTransferRunnable; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.SystemView; +import org.eclipse.rse.internal.ui.view.SystemViewDataDropAdapter; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemMessages; @@ -81,10 +85,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; -import org.eclipse.rse.ui.view.SystemDNDTransferRunnable; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.ui.view.SystemView; -import org.eclipse.rse.ui.view.SystemViewDataDropAdapter; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml index 113909dbc2f..cc973a111f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml @@ -338,7 +338,7 @@ Contributors: class="org.eclipse.rse.ui.propertypages.SystemTeamViewCategoryPropertyPage" id="org.eclipse.rse.SystemTeamViewCategoryPropertyPage"> - + - + @@ -381,21 +381,21 @@ Contributors: name="%View.RemoteSystems" icon="icons/full/cview16/system_view.gif" category="org.eclipse.rse.ui.view" - class="org.eclipse.rse.ui.view.SystemViewPart" + class="org.eclipse.rse.internal.ui.view.SystemViewPart" id="org.eclipse.rse.ui.view.systemView"> @@ -403,7 +403,7 @@ Contributors: name="%View.Search" icon="icons/full/obj16/system_search.gif" category="org.eclipse.rse.ui.view" - class="org.eclipse.rse.ui.view.search.SystemSearchViewPart" + class="org.eclipse.rse.internal.ui.view.search.SystemSearchViewPart" id="org.eclipse.rse.ui.view.SystemSearchView"> @@ -411,7 +411,7 @@ Contributors: name="%View.Scratchpad" icon="icons/full/view16/scratchpad_view.gif" category="org.eclipse.rse.ui.view" - class="org.eclipse.rse.ui.view.scratchpad.SystemScratchpadViewPart" + class="org.eclipse.rse.internal.ui.view.scratchpad.SystemScratchpadViewPart" id="org.eclipse.rse.ui.view.scratchpad.SystemScratchpadViewPart"> @@ -419,18 +419,10 @@ Contributors: name="%View.Monitor" icon="icons/full/view16/system_view.gif" category="org.eclipse.rse.ui.view" - class="org.eclipse.rse.ui.view.monitor.SystemMonitorViewPart" + class="org.eclipse.rse.internal.ui.view.monitor.SystemMonitorViewPart" id="org.eclipse.rse.ui.view.monitorView"> - + @@ -454,7 +446,7 @@ Contributors: @@ -467,7 +459,7 @@ Contributors: @@ -502,7 +494,7 @@ Contributors: + class="org.eclipse.rse.internal.ui.view.SystemDropActionDelegate"> diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystem.java index b2c0b6fb401..56788c600f2 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystem.java @@ -80,7 +80,7 @@ public abstract class ServiceSubSystem extends SubSystem implements IServiceSubS * result by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. *

- * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

*
    *
  1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. @@ -123,7 +123,7 @@ public abstract class ServiceSubSystem extends SubSystem implements IServiceSubS * behaviour by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. This is only called if the parent object's adapter indicated it can have children. *

    - * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

    *
      *
    1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java index 87913634ef4..53863c45892 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java @@ -27,7 +27,7 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; @@ -170,12 +170,12 @@ public abstract class ServiceSubSystemConfiguration extends SubSystemConfigurati * * @param subsys - The subsystem that was created via createSubSystemInternal * @param yourNewConnectionWizardPages - The wizard pages you supplied to the New Connection wizard, via the - * {@link org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} + * {@link org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} * method or null if you didn't override this method. * Note there may be more pages than you originally supplied, as you are passed all pages contributed * by this factory object, including subclasses. Null on a clone operation. * - * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) + * @see org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) */ protected void initializeSubSystem(ISubSystem subsys,ISystemNewConnectionWizardPage[] yourNewConnectionWizardPages) { @@ -187,7 +187,7 @@ public abstract class ServiceSubSystemConfiguration extends SubSystemConfigurati // -------------------------------- /** * Overridable method for getting Remote System view popup menu actions.
      - * Called by {@link org.eclipse.rse.ui.view.SystemView SystemView} when constructing + * Called by {@link org.eclipse.rse.internal.ui.view.SystemView SystemView} when constructing * the popup menu for a selected subsystem. *

      * For contributing popup menu actions to subsystem objects, beyond the @@ -219,7 +219,7 @@ public abstract class ServiceSubSystemConfiguration extends SubSystemConfigurati return super.getTranslatedFilterTypeProperty(selectedFilter); } /** - * Overridable method for getting Remote System view popup menu actions. Called by {@link org.eclipse.rse.ui.view.SystemView SystemView} + * Overridable method for getting Remote System view popup menu actions. Called by {@link org.eclipse.rse.internal.ui.view.SystemView SystemView} * when constructing the popup menu for a selected filter.
      * This method is only called for filters within subsystems created by this subsystem factory.
      * By default, this returns null. Override if appropriate. diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 4f552fc2221..a0d4d975dc2 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -1958,7 +1958,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * result by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. *

      - * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

      *
        *
      1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. @@ -2207,7 +2207,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * behaviour by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. *

        - * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

        *
          *
        1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. @@ -2662,7 +2662,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * result by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. *

          - * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

          *
            *
          1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. @@ -2757,7 +2757,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * behaviour by overriding {@link #sortResolvedFilterStringObjects(Object[])} if you desire to * sort the result, say, or pick our redundancies. *

            - * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.ui.view.SystemView view}. + * The resulting objects are displayed in the tree in the Remote System {@link org.eclipse.rse.internal.ui.view.SystemView view}. * There are two requirements on the returned objects:

            *
              *
            1. They must implement {@link org.eclipse.core.runtime.IAdaptable}. diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 4dd5ef51f5e..e48a97b35d6 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -1399,7 +1399,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * * @param ss - The subsystem that was created via createSubSystemInternal * @param yourNewConnectionWizardPages - The wizard pages you supplied to the New Connection wizard, via the - * {@link org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} + * {@link org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} * method or null if you didn't override this method. * Note there may be more pages than you originally supplied, as you are passed all pages contributed * by this factory object, including subclasses. This is null when this method is called other than diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java index 672cde788a5..01bbadde44a 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemAdapterHelpers.java @@ -19,11 +19,11 @@ package org.eclipse.rse.core; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.internal.ui.view.SystemViewAdapterFactory; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewInputProvider; -import org.eclipse.rse.ui.view.SystemViewAdapterFactory; /** diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java index 06848d73676..eb43e1af827 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java @@ -26,12 +26,12 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.rse.core.model.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.model.SystemModelChangeEvent; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveLayout; +import org.eclipse.rse.internal.ui.view.SystemView; +import org.eclipse.rse.internal.ui.view.SystemViewPart; +import org.eclipse.rse.internal.ui.view.team.SystemTeamViewPart; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.ui.view.SystemPerspectiveLayout; -import org.eclipse.rse.ui.view.SystemView; -import org.eclipse.rse.ui.view.SystemViewPart; -import org.eclipse.rse.ui.view.team.SystemTeamViewPart; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemAdapter.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemAdapter.java index 5cd827fdca7..6975371461d 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemAdapter.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemAdapter.java @@ -12,15 +12,15 @@ package org.eclipse.rse.tests.internal.testsubsystem; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.SystemView; +import org.eclipse.rse.internal.ui.view.SystemViewSubSystemAdapter; import org.eclipse.rse.tests.testsubsystem.TestSubSystemAddAction; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystemAddTarget; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystemNode; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystemNodeContainer; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.ui.view.SystemView; -import org.eclipse.rse.ui.view.SystemViewSubSystemAdapter; import org.eclipse.swt.widgets.Shell; /** diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemConfigurationAdapter.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemConfigurationAdapter.java index 2a8daa516ed..10d98dca9f7 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemConfigurationAdapter.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemConfigurationAdapter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.rse.tests.internal.testsubsystem; -import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; +import org.eclipse.rse.internal.ui.view.SubSystemConfigurationAdapter; /** * Adapter for subsytsem configuration. diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java index dbc6ef45d7f..9b682283c48 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/testsubsystem/TestSubSystemNodeAdapter.java @@ -14,6 +14,8 @@ 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.ui.view.SystemPerspectiveHelpers; +import org.eclipse.rse.internal.ui.view.SystemView; import org.eclipse.rse.tests.RSETestsPlugin; import org.eclipse.rse.tests.testsubsystem.TestSubSystemAddAction; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystemAddTarget; @@ -22,8 +24,6 @@ import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystemNodeContaine import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; -import org.eclipse.rse.ui.view.SystemView; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java index a8a585295b8..e0f7596b77d 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.model.SystemResourceChangeEvent; @@ -28,7 +29,6 @@ import org.eclipse.rse.tests.testsubsystem.TestSubSystemContainerNode; import org.eclipse.rse.tests.testsubsystem.TestSubSystemNode; import org.eclipse.rse.tests.testsubsystem.interfaces.ITestSubSystem; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.SystemPerspectiveHelpers; public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { private ITestSubSystem testSubSystem;