diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/model/DummyHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java similarity index 95% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/model/DummyHost.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java index 5f112d7f48a..a2429bc5263 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/model/DummyHost.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java @@ -14,12 +14,8 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.model; +package org.eclipse.rse.core.model; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.IPropertySet; -import org.eclipse.rse.core.model.ISystemHostPool; -import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java index 41e1c8333dd..6f6c5283944 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java @@ -18,8 +18,8 @@ package org.eclipse.rse.core.subsystems; import java.util.Hashtable; import java.util.Set; +import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.internal.model.DummyHost; /** diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java index 1f74f36671a..d5b4333a0c1 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java @@ -19,11 +19,11 @@ package org.eclipse.rse.shells.ui.propertypages; import java.util.ArrayList; import java.util.List; +import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.model.DummyHost; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem; import org.eclipse.rse.ui.RSEUIPlugin; 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 4c3d8688d62..6a990ec185f 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 @@ -3897,17 +3897,22 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy * @return TreeItem hit if found */ public Item findFirstRemoteItemReference(Object remoteObject, Item parentItem) { + + Item match = mappedFindFirstRemoteItemReference(remoteObject); + if (match != null) + return match; + //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); + //recursiveFindAllRemoteItemReferences(parentItem, remoteObjectName, remoteObject, subsystem, matches); System.out.println("recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem)"); match = recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java index 0b185d06a12..31033f6e03b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java @@ -45,7 +45,7 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; -import org.eclipse.rse.filters.SystemFilterPoolWrapperInformation; +import org.eclipse.rse.internal.filters.SystemFilterPoolWrapperInformation; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/FactoryServiceElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/FactoryServiceElement.java index 135842feb8a..971522c8c86 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/FactoryServiceElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/FactoryServiceElement.java @@ -16,12 +16,12 @@ package org.eclipse.rse.ui.widgets.services; +import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IDelegatingConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; -import org.eclipse.rse.internal.model.DummyHost; import org.eclipse.rse.services.IService; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java index 3be99d270d6..6e63e00b621 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.model.DummyHost; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.IConnectorService; @@ -29,7 +30,6 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystem; import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.model.DummyHost; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.widgets.services.ConnectorServiceElement; import org.eclipse.rse.ui.widgets.services.FactoryServiceElement; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java rename to rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java index 49d364468da..bd5bc9e78fe 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.internal.filters; import java.util.ArrayList; import java.util.Iterator; import java.util.Vector; @@ -33,9 +33,6 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterSavePolicies; import org.eclipse.rse.core.filters.SystemFilterNamingPolicy; import org.eclipse.rse.core.model.RSEModelResources; -import org.eclipse.rse.internal.filters.SystemFilter; -import org.eclipse.rse.internal.filters.SystemFilterContainerCommonMethods; -import org.eclipse.rse.internal.filters.SystemFilterPoolReference; import org.eclipse.rse.internal.references.SystemPersistableReferencedObject; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolReferenceManager.java rename to rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java index 8336fe059f9..c9d8d8ccbbe 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolReferenceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.internal.filters; import java.util.Vector; @@ -35,8 +35,6 @@ import org.eclipse.rse.core.filters.ISystemFilterSavePolicies; import org.eclipse.rse.core.filters.SystemFilterNamingPolicy; import org.eclipse.rse.core.references.IRSEBasePersistableReferencingObject; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.internal.filters.SystemFilter; -import org.eclipse.rse.internal.filters.SystemFilterPoolReference; import org.eclipse.rse.internal.references.SystemPersistableReferenceManager; /** diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapper.java rename to rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java index f7333e0ad38..bef829aca0a 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapper.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.internal.filters; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java rename to rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java index fc8f45013b6..7860594e3e7 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.internal.filters; import java.util.Vector; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterStartHere.java rename to rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java index 496a1488766..7e952348cb6 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterStartHere.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.internal.filters; import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy; import org.eclipse.rse.core.filters.ISystemFilterConstants; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; 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 93bfe7f715c..b3a6c6e1231 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 @@ -63,9 +63,9 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; -import org.eclipse.rse.filters.SystemFilterPool; import org.eclipse.rse.filters.SystemFilterReference; -import org.eclipse.rse.filters.SystemFilterStartHere; +import org.eclipse.rse.internal.filters.SystemFilterPool; +import org.eclipse.rse.internal.filters.SystemFilterStartHere; import org.eclipse.rse.internal.model.SystemHostPool; import org.eclipse.rse.internal.model.SystemModelChangeEvent; import org.eclipse.rse.internal.model.SystemModelChangeEventManager; 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 27e00f5dafc..74f24609991 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 @@ -50,8 +50,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.references.IRSEBaseReferencingObject; -import org.eclipse.rse.filters.SystemFilterPoolWrapperInformation; -import org.eclipse.rse.filters.SystemFilterStartHere; +import org.eclipse.rse.internal.filters.SystemFilterPoolWrapperInformation; +import org.eclipse.rse.internal.filters.SystemFilterStartHere; import org.eclipse.rse.internal.model.SystemProfileManager; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemResourceChangeEvent;