mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
[178599] more refactorings
This commit is contained in:
parent
0fb1c30dab
commit
ae2920b442
14 changed files with 22 additions and 26 deletions
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
|
@ -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;
|
||||
|
||||
/**
|
|
@ -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;
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.filters;
|
||||
package org.eclipse.rse.internal.filters;
|
||||
|
||||
import java.util.Vector;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue