diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java index 1159a2ba5e2..03f428d5e8a 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java @@ -18,6 +18,7 @@ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.core.model; @@ -57,7 +58,7 @@ import org.eclipse.rse.internal.core.RSECoreRegistry; * This interface is not intended to be implemented by clients. *

*/ -public interface ISystemRegistry extends ISchedulingRule, IAdaptable { +public interface ISystemRegistry extends ISchedulingRule, IAdaptable, ISystemViewInputProvider { /** * Get the SystemFilterStartHere singleton instance. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewInputProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java similarity index 74% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewInputProvider.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java index 3e4bd43e51d..fea9a90ad93 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewInputProvider.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java @@ -12,14 +12,12 @@ * * Contributors: * Martin Oberhuber (Wind River) - [186773] split SystemRegistryUI from SystemRegistry implementation + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core from org.eclipse.rse.ui.view ********************************************************************************/ -package org.eclipse.rse.ui.view; +package org.eclipse.rse.core.model; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.swt.widgets.Shell; /** * Abstraction for any object that wishes to be a roots-provider for the SystemView tree viewer. @@ -67,29 +65,32 @@ public interface ISystemViewInputProvider extends IAdaptable { /** * Set the shell in case it is needed for anything. * The label and content provider will call this. - * @param shell the shell being used by the viewer using this provider + * @param shell an {@link org.eclipse.swt.widgets.Shell shell} object, + * being used by the viewer using this provider */ - // TODO should possibly be deprecated or removed - public void setShell(Shell shell); + public void setShell(Object shell); /** - * @return the shell of the viewer we are currently associated with + * @return the {@link org.eclipse.swt.widgets.Shell shell} of the viewer + * we are currently associated with. + * @deprecated use other methods for getting the active workbench shell, + * e.g. {@link org.eclipse.rse.ui.RSEUIPlugin#getActiveWorkbenchShell()} */ - // TODO should possibly be deprecated or removed - public Shell getShell(); + public Object getShell(); /** * Set the viewer in case it is needed for anything. * The label and content provider will call this. - * @param viewer the viewer that uses this provider + * @param viewer the {@link org.eclipse.jface.viewers.Viewer viewer} + * that uses this provider */ - // TODO should possibly be deprecated or removed - public void setViewer(Viewer viewer); + public void setViewer(Object viewer); /** * Return the viewer we are currently associated with - * @return the viewer we are currently associated with + * @return the {@link org.eclipse.jface.viewers.Viewer viewer} + * we are currently associated with + * @deprecated use other methods for getting the active viewer. */ - // TODO should possibly be deprecated or removed - public Viewer getViewer(); + public Object getViewer(); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileAPIProvider.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileAPIProvider.java index 62a9d84f802..6640b83d3e1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileAPIProvider.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,12 +11,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.subsystems.files.core.model; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; +import org.eclipse.rse.core.model.ISystemViewInputProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java index 5ffac46393b..b336415feef 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -22,13 +23,13 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemPreferencesConstants; 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.SystemAdapterHelpers; import org.eclipse.swt.widgets.Shell; @@ -77,36 +78,38 @@ public abstract class SystemAbstractAPIProvider return Platform.getAdapterManager().getAdapter(this, adapterType); } - /** - * Set the shell in case it is needed for anything. - * The label and content provider will call this. + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setShell(java.lang.Object) */ - public void setShell(Shell shell) + public void setShell(Object shell) { - this.shell = shell; + this.shell = (Shell)shell; } - /** - * Return the shell of the current viewer + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getShell() */ - public Shell getShell() + public Object getShell() { return shell; } - /** - * Set the viewer in case it is needed for anything. - * The label and content provider will call this. + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object) */ - public void setViewer(Viewer viewer) + public void setViewer(Object viewer) { - this.viewer = viewer; + this.viewer = (Viewer)viewer; } - /** - * Return the viewer we are currently associated with + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() */ - public Viewer getViewer() + public Object getViewer() { return viewer; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java index b1dd6383aa6..87b2e879790 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java @@ -12,12 +12,12 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core *******************************************************************************/ package org.eclipse.rse.internal.ui.view; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; +import org.eclipse.rse.core.model.ISystemViewInputProvider; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index 9af78797788..0ec608ca6e8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -27,6 +28,7 @@ import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterStringReference; import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.ui.SystemBasePlugin; @@ -34,7 +36,6 @@ import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.rse.ui.view.SystemAdapterHelpers; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java index 559d84c1443..137aca73e0b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Kevin Doyle (IBM) - [189005] Changed setFocus() to setInput to SystemRegistryUI + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -1148,7 +1149,7 @@ public class SystemTableViewPart extends ViewPart } else { - setInput(RSEUIPlugin.getTheSystemRegistryUI()); + setInput(RSECorePlugin.getTheSystemRegistry()); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java index c948bda75be..4965ae7c4a1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java @@ -13,14 +13,15 @@ * Contributors: * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 3bddadefb8c..9268691f484 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -27,6 +27,7 @@ * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter() * Martin Oberhuber (Wind River) - [186964] Fix adapter actions for multiselect, and and NPE * Martin Oberhuber (Wind River) - [186991] Avoid remote refresh if no element is remote + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -96,6 +97,7 @@ 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.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.references.IRSEBaseReferencingObject; import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier; @@ -138,7 +140,6 @@ import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemSelectAllTarget; import org.eclipse.rse.ui.view.ISystemTree; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.rse.ui.view.SystemAdapterHelpers; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java index 5060afc477a..ab56f0bf7aa 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -30,6 +31,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; @@ -38,7 +40,7 @@ import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; +import org.eclipse.swt.widgets.Shell; @@ -140,7 +142,7 @@ public class SystemViewAPIProviderForFilters children = new SystemMessageObject[1]; try { ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class); - ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); + ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, (Shell)getShell()); if (newFilter == null) { children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), @@ -158,7 +160,7 @@ public class SystemViewAPIProviderForFilters if ((sfr != null) && (inputProvider.getViewer()!=null)) { SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); - Viewer v = inputProvider.getViewer(); + Viewer v = (Viewer)inputProvider.getViewer(); if (v instanceof ISystemResourceChangeListener) { //sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java index 5ab57756abc..38d4765a0e2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAdapterFactory.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -26,6 +27,7 @@ import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.internal.ui.view.team.SystemTeamViewCategoryAdapter; @@ -37,7 +39,6 @@ import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; import org.eclipse.rse.ui.model.ISystemPromptableObject; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.ui.IActionFilter; 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/internal/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java index 75aca722c36..584c7fcdab5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java @@ -25,6 +25,7 @@ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter() * Kevin Doyle (IBM) - [189005] Fixed getParent() to return SystemRegistryUI instead of SystemRegistry + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -42,6 +43,7 @@ import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSEPreferencesManager; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemClearAllPasswordsAction; @@ -68,7 +70,6 @@ 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.ISystemPropertyConstants; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.PropertyDialogAction; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java index 4d740f19eef..c6d91b870b0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionSelectionInputProvider.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -78,7 +79,7 @@ public class SystemViewConnectionSelectionInputProvider extends SystemAbstractAP // REQUIRED METHODS... /** - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getSystemViewRoots() + * @see org.eclipse.rse.core.model.ISystemViewInputProvider#getSystemViewRoots() */ public Object[] getSystemViewRoots() { @@ -124,28 +125,28 @@ public class SystemViewConnectionSelectionInputProvider extends SystemAbstractAP } /** - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasSystemViewRoots() + * @see org.eclipse.rse.core.model.ISystemViewInputProvider#hasSystemViewRoots() */ public boolean hasSystemViewRoots() { return true; } /** - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#showingConnections() + * @see org.eclipse.rse.core.model.ISystemViewInputProvider#showingConnections() */ public boolean showingConnections() { return true; } /** - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.core.model.IHost) + * @see org.eclipse.rse.core.model.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.core.model.IHost) */ public Object[] getConnectionChildren(IHost selectedConnection) { return null; } /** - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.core.model.IHost) + * @see org.eclipse.rse.core.model.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.core.model.IHost) */ public boolean hasConnectionChildren(IHost selectedConnection) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java index 9f99ac6f9f9..aaab7653ba6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -37,6 +38,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.ISystemMessageObject; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemChildrenContentsType; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -53,7 +55,6 @@ 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.ISystemViewInputProvider; import org.eclipse.rse.ui.view.SystemAdapterHelpers; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionFilter; @@ -326,8 +327,8 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter ISystemMessageObject.MSGTYPE_OBJECTCREATED,filter); // select the new filter and expand it - Viewer v = inputProvider.getViewer(); - if ((v!=null) && (v instanceof ISystemResourceChangeListener)) + Viewer v = (Viewer)inputProvider.getViewer(); + if (v instanceof ISystemResourceChangeListener) { SystemResourceChangeEvent event = new SystemResourceChangeEvent(newFilter, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); RSEUIPlugin.getTheSystemRegistryUI().postEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index 1db4c4433f6..66478f04b19 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -19,6 +19,7 @@ * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -47,6 +48,7 @@ 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.ISystemResourceSet; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemChildrenContentsType; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.model.SystemRemoteResourceSet; @@ -67,7 +69,6 @@ import org.eclipse.rse.ui.view.IContextObject; 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.rse.ui.view.SystemAdapterHelpers; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -305,7 +306,7 @@ public class SystemViewFilterReferenceAdapter if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer() != null)) { SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); - Viewer v = inputProvider.getViewer(); + Viewer v = (Viewer)inputProvider.getViewer(); if (v instanceof ISystemResourceChangeListener) { //sr.fireEvent((ISystemResourceChangeListener)v, event); // only expand in the current viewer, not all viewers! diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java index c25ed28570e..a65622e35a5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java @@ -13,6 +13,7 @@ * * Contributors: * Kevin Doyle (IBM) - [187553] - Removed code and related methods for toolbar/button bar. + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -23,22 +24,16 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.internal.ui.actions.SystemCascadingPulldownMenuAction; -import org.eclipse.rse.ui.SystemWidgetHelpers; -import org.eclipse.rse.ui.actions.SystemNewConnectionAction; +import org.eclipse.rse.core.model.ISystemViewInputProvider; 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.rse.ui.view.SystemLongRunningRequestEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java index 08fe90497f7..ef9e93ec166 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -35,6 +36,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.SystemBasePlugin; @@ -43,7 +45,6 @@ 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/internal/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index f4ee25da48f..3de21e08270 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -20,6 +20,7 @@ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter() * Martin Oberhuber (Wind River) - [190195] Cannot enable new connection prompt in system view + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -68,6 +69,7 @@ import org.eclipse.rse.core.filters.ISystemFilterStringReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.actions.SystemCascadingPreferencesAction; @@ -91,11 +93,9 @@ import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; -import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -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; @@ -454,7 +454,7 @@ public class SystemViewPart // ---------------------- // Restore previous state // ---------------------- - if ((fMemento != null) && (input instanceof ISystemRegistryUI)) + if ((fMemento != null) && (input instanceof ISystemRegistry)) restoreState(fMemento); //fMemento = null; @@ -763,7 +763,7 @@ public class SystemViewPart { IAdaptable inputObj = getSite().getPage().getInput(); inputIsRoot = false; - ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistryUI(); + ISystemViewInputProvider inputProvider = RSECorePlugin.getTheSystemRegistry(); if (inputObj != null) { platformManager = Platform.getAdapterManager(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java index 3c80fe79ec0..31fec01214b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewRootInputAdapter.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [190195] Cannot enable new connection prompt in system view + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -24,14 +25,14 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.core.model.ISystemRegistry; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemPreferencesManager; import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject; -import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; @@ -115,7 +116,7 @@ public class SystemViewRootInputAdapter extends AbstractSystemViewAdapter { ISystemViewInputProvider provider = (ISystemViewInputProvider)element; - if ((provider instanceof ISystemRegistryUI) && showNewConnectionPrompt()) + if ((provider instanceof ISystemRegistry) && showNewConnectionPrompt()) { Object[] children = provider.getSystemViewRoots(); if ((children == null) || (children.length == 0)) @@ -140,7 +141,7 @@ public class SystemViewRootInputAdapter extends AbstractSystemViewAdapter public boolean hasChildren(IAdaptable element) { ISystemViewInputProvider provider = (ISystemViewInputProvider)element; - if ((provider instanceof ISystemRegistryUI) && showNewConnectionPrompt()) + if ((provider instanceof ISystemRegistry) && showNewConnectionPrompt()) { return true; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java index 3fb26329956..b220e3d4ae4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods * David Dykstal (IBM) - [189858] Removed the remote systems project in the team view + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -28,13 +29,12 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.model.WorkbenchContentProvider; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java index 12a0966b61a..5776b15fa1d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * David Dykstal (IBM) - [189858] Removed the remote systems project in the team view + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -22,8 +23,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.internal.core.model.SystemProfileManager; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.widgets.Shell; @@ -113,15 +114,15 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput /* (non-Javadoc) * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setShell(org.eclipse.swt.widgets.Shell) */ - public void setShell(Shell shell) + public void setShell(Object shell) { - this.shell = shell; + this.shell = (Shell)shell; } /* (non-Javadoc) * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getShell() */ - public Shell getShell() + public Object getShell() { return shell; } @@ -129,15 +130,15 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput /* (non-Javadoc) * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(org.eclipse.jface.viewers.Viewer) */ - public void setViewer(Viewer viewer) + public void setViewer(Object viewer) { - this.viewer = viewer; + this.viewer = (Viewer)viewer; } /* (non-Javadoc) * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() */ - public Viewer getViewer() + public Object getViewer() { return viewer; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java index dd57975325d..1659eecccd4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewLabelProvider.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.internal.ui.view.team; @@ -30,12 +31,12 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.model.ISystemShellProvider; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.model.WorkbenchLabelProvider; 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 2ef2009432a..7005e69e3e1 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.dialogs; @@ -19,9 +20,9 @@ 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.core.RSECorePlugin; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.internal.ui.view.SystemViewForm; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -62,7 +63,7 @@ public class SystemSelectAnythingDialog extends SystemPromptDialog */ protected ISystemViewInputProvider getInputProvider() { - ISystemViewInputProvider inputProvider = RSEUIPlugin.getTheSystemRegistryUI(); + ISystemViewInputProvider inputProvider = RSECorePlugin.getTheSystemRegistry(); return inputProvider; } 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 5126948be24..c418e98c995 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 @@ -20,6 +20,7 @@ * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util * Martin Oberhuber (Wind River) - [189163] Update IActionFilter constants from subsystemFactory to subsystemConfiguration * Tobias Schwarz (Wind River) - [173267] "empty list" should not be displayed + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -48,6 +49,7 @@ import org.eclipse.rse.core.filters.ISystemFilterStringReference; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemMessageObject; import org.eclipse.rse.core.model.ISystemResourceSet; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.model.SystemRemoteResourceSet; import org.eclipse.rse.core.model.SystemWorkspaceResourceSet; @@ -271,7 +273,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda ISystemViewInputProvider ip = getInput(); if (ip != null) { - return ip.getViewer(); + return (Viewer)ip.getViewer(); } else { 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 2c0b69b6acc..8b16197b276 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 @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -24,6 +25,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter; import org.eclipse.rse.ui.ISystemContextMenuConstants; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAdapterHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAdapterHelpers.java index fb59332a328..f7d21fb8c70 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAdapterHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAdapterHelpers.java @@ -13,6 +13,7 @@ * Contributors: * Uwe Stieber (Wind River) - [174418] SystemAdapterHelpers.getViewAdapter(Object) try to find adapter twice * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -20,6 +21,7 @@ package org.eclipse.rse.ui.view; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.rse.core.model.ISystemViewInputProvider; import org.eclipse.rse.internal.ui.view.SystemViewAdapterFactory; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java index 17893c2b355..a7c1db5b8ab 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java @@ -30,6 +30,7 @@ * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI * Martin Oberhuber (Wind River) - [189123] Move renameSubSystemProfile() from UI to Core * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.internal.model; @@ -88,6 +89,7 @@ import org.eclipse.rse.internal.core.model.SystemRemoteChangeEventManager; 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.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.SystemPreferencesManager; @@ -116,6 +118,10 @@ public class SystemRegistry implements ISystemRegistry private ISubSystemConfigurationProxy[] subsystemConfigurationProxies = null; private boolean errorLoadingFactory = false; + + //For ISystemViewInputProvider + private Object shell = null; + private Object viewer = null; /** * Constructor. @@ -2964,5 +2970,104 @@ public class SystemRegistry implements ISystemRegistry public ISystemFilterStartHere getSystemFilterStartHere() { return SystemFilterStartHere.getInstance(); } + + // ---------------------------------- + // SYSTEMVIEWINPUTPROVIDER METHODS... + // ---------------------------------- + /** + * Return the children objects to constitute the root elements in the system view tree. + * We return all connections for all active profiles. + */ + public Object[] getSystemViewRoots() + { + //DKM - only return enabled connections now + IHost[] connections = getHosts(); + List result = new ArrayList(); + for (int i = 0; i < connections.length; i++) { + IHost con = connections[i]; + IRSESystemType sysType = con.getSystemType(); + if (sysType != null) { // sysType can be null if workspace contains a host that is no longer defined by the workbench + RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(sysType.getAdapter(RSESystemTypeAdapter.class)); + // Note: System types without registered subsystems get disabled by the adapter itself! + // There is no need to re-check this here again. + if (adapter.isEnabled(sysType)) result.add(con); + } + } + return result.toArray(); + } + + /** + * Return true if {@link #getSystemViewRoots()} will return a non-empty list + * We return true if there are any connections for any active profile. + */ + public boolean hasSystemViewRoots() + { + return (getHostCount() > 0); + } + + /** + * Return true if we are listing connections or not, so we know whether + * we are interested in connection-add events + */ + public boolean showingConnections() + { + return true; + } + + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setShell(java.lang.Object) + */ + public void setShell(Object shell) + { + this.shell = shell; + } + + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.model.ISystemShellProvider#getShell() + */ + public Object getShell() + { +// // thread safe shell +// IWorkbench workbench = RSEUIPlugin.getDefault().getWorkbench(); +// if (workbench != null) +// { +// // first try to get the active workbench window +// IWorkbenchWindow ww = workbench.getActiveWorkbenchWindow(); +// if (ww == null) // no active window so just get the first one +// ww = workbench.getWorkbenchWindows()[0]; +// if (ww != null) +// { +// Shell shell = ww.getShell(); +// if (!shell.isDisposed()) +// { +// return shell; +// } +// } +// } +// return null; + return this.shell; + } + + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(java.lang.Object) + */ + public void setViewer(Object viewer) + { + this.viewer = viewer; + } + + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() + */ + public Object getViewer() + { + return viewer; + } + + }//SystemRegistryImpl \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java index b8d94f4c8a8..c6fa4a9ba6e 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI * David Dykstal (IBM) - [191038] remove getInstance(logFilePath) log file was not used * initialize correctly in getInstance() + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.internal.model; @@ -23,11 +24,8 @@ import java.util.List; import java.util.Vector; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeListener; @@ -42,10 +40,8 @@ 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; -import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.model.ISystemRegistryUI; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; @@ -62,13 +58,11 @@ import org.eclipse.ui.part.ResourceTransfer; * * This class is not intended to be subclassed by clients. */ -public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProvider { +public class SystemRegistryUI implements ISystemRegistryUI { private static SystemRegistryUI _instance = null; private SystemRegistry registry = null; - private Viewer viewer = null; - // progress monitor support private IRunnableContext currentRunnableContext; private Shell currentRunnableContextShell; @@ -156,76 +150,6 @@ public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProv } } - // ---------------------------------- - // SYSTEMVIEWINPUTPROVIDER METHODS... - // ---------------------------------- - - /** - * Return the children objects to constitute the root elements in the system view tree. - * We return all connections for all active profiles. - */ - public Object[] getSystemViewRoots() - { - //DKM - only return enabled connections now - IHost[] connections = registry.getHosts(); - List result = new ArrayList(); - for (int i = 0; i < connections.length; i++) { - IHost con = connections[i]; - IRSESystemType sysType = con.getSystemType(); - if (sysType != null) { // sysType can be null if workspace contains a host that is no longer defined by the workbench - RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(sysType.getAdapter(RSESystemTypeAdapter.class)); - // Note: System types without registered subsystems get disabled by the adapter itself! - // There is no need to re-check this here again. - if (adapter.isEnabled(sysType)) result.add(con); - } - } - return result.toArray(); - } - - /** - * Return true if {@link #getSystemViewRoots()} will return a non-empty list - * We return true if there are any connections for any active profile. - */ - public boolean hasSystemViewRoots() - { - return (registry.getHostCount() > 0); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.core.model.IHost) - */ - public Object[] getConnectionChildren(IHost selectedConnection) - { - return registry.getConnectionChildren(selectedConnection); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.core.model.IHost) - */ - public boolean hasConnectionChildren(IHost selectedConnection) - { - return registry.hasConnectionChildren(selectedConnection); - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapterType) - { - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setShell(org.eclipse.swt.widgets.Shell) - */ - public void setShell(Shell shell) - { - } - /* * (non-Javadoc) * @see org.eclipse.rse.ui.model.ISystemShellProvider#getShell() @@ -252,33 +176,6 @@ public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProv return null; } - /* - * (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(org.eclipse.jface.viewers.Viewer) - */ - public void setViewer(Viewer viewer) - { - this.viewer = viewer; - } - - /* - * (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getViewer() - */ - public Viewer getViewer() - { - return viewer; - } - - /** - * Return true if we are listing connections or not, so we know whether - * we are interested in connection-add events - */ - public boolean showingConnections() - { - return true; - } - // ---------------------------------- // ACTIVE PROGRESS MONITOR METHODS... // ---------------------------------- diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java index a0c9f2df3bb..6e34ae97d50 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/model/ISystemRegistryUI.java @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI + * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core ********************************************************************************/ package org.eclipse.rse.ui.model; @@ -24,7 +25,6 @@ import org.eclipse.rse.core.events.ISystemResourceChangeEvent; import org.eclipse.rse.core.events.ISystemResourceChangeListener; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.ui.view.ISystemViewInputProvider; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; @@ -34,8 +34,7 @@ import org.eclipse.swt.widgets.Shell; * This interface is not intended to be implemented by clients. *

*/ -public interface ISystemRegistryUI - extends ISystemShellProvider, ISystemViewInputProvider { +public interface ISystemRegistryUI extends ISystemShellProvider { // ---------------------------------- // UI METHODS...