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 cdc6c5841d5..f4ee25da48f 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 @@ -19,6 +19,7 @@ * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point * 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 ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -90,6 +91,7 @@ import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; import org.eclipse.rse.ui.actions.SystemRefreshAllAction; import org.eclipse.rse.ui.messages.ISystemMessageLine; +import org.eclipse.rse.ui.model.ISystemRegistryUI; import org.eclipse.rse.ui.view.IRSEViewPart; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; @@ -452,7 +454,7 @@ public class SystemViewPart // ---------------------- // Restore previous state // ---------------------- - if ((fMemento != null) && (input instanceof ISystemRegistry)) + if ((fMemento != null) && (input instanceof ISystemRegistryUI)) restoreState(fMemento); //fMemento = null; 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 1ef5e902865..3c80fe79ec0 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 @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [182454] improve getAbsoluteName() documentation * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API + * Martin Oberhuber (Wind River) - [190195] Cannot enable new connection prompt in system view ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -23,11 +24,11 @@ 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.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; @@ -114,7 +115,7 @@ public class SystemViewRootInputAdapter extends AbstractSystemViewAdapter { ISystemViewInputProvider provider = (ISystemViewInputProvider)element; - if ((provider instanceof ISystemRegistry) && showNewConnectionPrompt()) + if ((provider instanceof ISystemRegistryUI) && showNewConnectionPrompt()) { Object[] children = provider.getSystemViewRoots(); if ((children == null) || (children.length == 0)) @@ -139,7 +140,7 @@ public class SystemViewRootInputAdapter extends AbstractSystemViewAdapter public boolean hasChildren(IAdaptable element) { ISystemViewInputProvider provider = (ISystemViewInputProvider)element; - if ((provider instanceof ISystemRegistry) && showNewConnectionPrompt()) + if ((provider instanceof ISystemRegistryUI) && showNewConnectionPrompt()) { return true; }