mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-09 09:15:38 +02:00
[cleanup] Refactoring RSE model objects
This commit is contained in:
Kushal Munir
parent
f13adf6055
commit
6787dbd195
43 changed files with 161 additions and 123 deletions
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
|
|||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.eclipse.core.runtime
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.core.resources
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.rse.core,
|
||||
org.eclipse.rse.core.filters,
|
||||
|
|
|
|||
|
|
@ -14,10 +14,8 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.model;
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import org.eclipse.rse.core.model.IProperty;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
|
||||
public class Property implements IProperty
|
||||
{
|
||||
|
|
@ -14,16 +14,12 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.model;
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.rse.core.model.IProperty;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
import org.eclipse.rse.model.PropertyType;
|
||||
|
||||
|
||||
public class PropertySet implements IPropertySet
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.model;
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -22,8 +22,6 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IPropertySetContainer;
|
||||
|
||||
|
||||
|
||||
|
|
@ -14,9 +14,8 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.model;
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
|
||||
|
||||
public class PropertyType implements IPropertyType
|
||||
|
|
@ -14,11 +14,7 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.model;
|
||||
|
||||
import org.eclipse.rse.core.model.IRSEModelObject;
|
||||
import org.eclipse.rse.ui.SystemResources;
|
||||
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -56,6 +52,6 @@ public abstract class RSEModelObject extends PropertySetContainer implements IRS
|
|||
|
||||
public String getDescription()
|
||||
{
|
||||
return SystemResources.RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
|
||||
return RSEModelResources.RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
/********************************************************************************
|
||||
* Copyright (c) 2006 IBM Corporation. All rights reserved.
|
||||
* This program and the accompanying materials are made available under the terms
|
||||
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||
* available at http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Initial Contributors:
|
||||
* The following IBM employees contributed to the Remote System Explorer
|
||||
* component that contains this file: David McKnight, Kushal Munir,
|
||||
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
|
||||
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||
*
|
||||
* Contributors:
|
||||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.core.model;
|
||||
|
||||
import org.eclipse.osgi.util.NLS;
|
||||
|
||||
/**
|
||||
* This class contains bundle resources for model objects.
|
||||
*/
|
||||
public class RSEModelResources extends NLS {
|
||||
|
||||
private static String BUNDLE_NAME = "org.eclipse.rse.core.model.RSEModelResources"; //$NON-NLS-1$
|
||||
|
||||
public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
|
||||
|
||||
static {
|
||||
// load message values from bundle file
|
||||
NLS.initializeMessages(BUNDLE_NAME, RSEModelResources.class);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
################################################################################
|
||||
# Copyright (c) 2000, 2006 IBM Corporation. All rights reserved.
|
||||
# This program and the accompanying materials are made available under the terms
|
||||
# of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||
# available at http://www.eclipse.org/legal/epl-v10.html
|
||||
#
|
||||
# Initial Contributors:
|
||||
# The following IBM employees contributed to the Remote System Explorer
|
||||
# component that contains this file: David McKnight, Kushal Munir,
|
||||
# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
|
||||
# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||
#
|
||||
# Contributors:
|
||||
# {Name} (company) - description of contribution.
|
||||
################################################################################
|
||||
|
||||
# NLS_MESSAGEFORMAT_NONE
|
||||
|
||||
RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION=An RSE Model Object represents any object in the Remote Systems Explorer.
|
||||
|
|
@ -14,9 +14,9 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.references;
|
||||
package org.eclipse.rse.core.references;
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencingObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -28,7 +28,7 @@ import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
|||
* <ol>
|
||||
* <li>Include the references package from the SystemReferences .cat file
|
||||
* <li>Ensure the class for the master objects subclass SystemPersistableReferencedObject,
|
||||
* or implement ISystemPersistableReferencedObject.
|
||||
* or implement IRSEPersistableReferencedObject.
|
||||
* <b>YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT!</b>
|
||||
* <li>Create a class subclassing SystemPersistableReferencingObject to hold a reference
|
||||
* to the master object. This will hold a transient pointer, and a persistable
|
||||
|
|
@ -54,37 +54,37 @@ import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
|||
* @lastgen interface SystemPersistableReferenceManager {}
|
||||
*/
|
||||
|
||||
public interface ISystemBasePersistableReferenceManager
|
||||
public interface IRSEBasePersistableReferenceManager
|
||||
{
|
||||
|
||||
/**
|
||||
* Return an array of the referencing objects currently being managed.
|
||||
* @param array of the referencing objects currently in this list.
|
||||
*/
|
||||
public ISystemBasePersistableReferencingObject[] getReferencingObjects();
|
||||
public IRSEBasePersistableReferencingObject[] getReferencingObjects();
|
||||
/**
|
||||
* Set in one shot the list of referencing objects. Replaces current list.
|
||||
* @param objects An array of referencing objects which is to become the new list.
|
||||
* @param deReference true to first de-reference all objects in the existing list.
|
||||
*/
|
||||
public void setReferencingObjects(ISystemBasePersistableReferencingObject[] objects, boolean deReference);
|
||||
public void setReferencingObjects(IRSEBasePersistableReferencingObject[] objects, boolean deReference);
|
||||
/**
|
||||
* Add a referencing object to the managed list.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int addReferencingObject(ISystemBasePersistableReferencingObject object);
|
||||
public int addReferencingObject(IRSEBasePersistableReferencingObject object);
|
||||
/**
|
||||
* Remove a referencing object from the managed list.
|
||||
* <p>Does NOT call removeReference on the master referenced object.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int removeReferencingObject(ISystemBasePersistableReferencingObject object);
|
||||
public int removeReferencingObject(IRSEBasePersistableReferencingObject object);
|
||||
/**
|
||||
* Remove and dereferences a referencing object from the managed list.
|
||||
* <p>DOES call removeReference on the master referenced object.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int removeAndDeReferenceReferencingObject(ISystemBasePersistableReferencingObject object);
|
||||
public int removeAndDeReferenceReferencingObject(IRSEBasePersistableReferencingObject object);
|
||||
/**
|
||||
* Remove all objects from the list.
|
||||
* <p>Does NOT call removeReference on the master referenced objects.
|
||||
|
|
@ -106,13 +106,13 @@ public interface ISystemBasePersistableReferenceManager
|
|||
* @param object The referencing object to find position of.
|
||||
* @return zero-based position within the list. If not found, returns -1
|
||||
*/
|
||||
public int getReferencingObjectPosition(ISystemBasePersistableReferencingObject object);
|
||||
public int getReferencingObjectPosition(IRSEBasePersistableReferencingObject object);
|
||||
/**
|
||||
* Move the given referencing object to a new zero-based position in the list.
|
||||
* @param newPosition New zero-based position
|
||||
* @param object The referencing object to move
|
||||
*/
|
||||
public void moveReferencingObjectPosition(int newPosition, ISystemBasePersistableReferencingObject object);
|
||||
public void moveReferencingObjectPosition(int newPosition, IRSEBasePersistableReferencingObject object);
|
||||
/**
|
||||
* Return true if the given referencable object is indeed referenced by a referencing object
|
||||
* in the current list. This is done by comparing the reference names of each, not the
|
||||
|
|
@ -128,7 +128,7 @@ public interface ISystemBasePersistableReferenceManager
|
|||
* @return the referencing object within this list which references the given referencable object, or
|
||||
* null if no reference found.
|
||||
*/
|
||||
public ISystemBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object);
|
||||
public IRSEBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object);
|
||||
|
||||
/**
|
||||
* Attempt to save contents of manager to disk. Only call if not doing your own save from
|
||||
|
|
@ -14,10 +14,8 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.references;
|
||||
package org.eclipse.rse.core.references;
|
||||
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
|
||||
/**
|
||||
* Referencing objects are shadows of real objects. Typically, shadows are created
|
||||
|
|
@ -39,7 +37,7 @@ import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
|||
* <p>
|
||||
* This interface captures the methods to set and query that name or key.
|
||||
*/
|
||||
public interface ISystemBasePersistableReferencingObject
|
||||
public interface IRSEBasePersistableReferencingObject
|
||||
extends IRSEBaseReferencingObject
|
||||
{
|
||||
/**
|
||||
|
|
@ -14,13 +14,11 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.references;
|
||||
package org.eclipse.rse.core.references;
|
||||
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEReferencedObject;
|
||||
|
||||
/**
|
||||
* A simple class that implements ISystemPersistableReferencedObject.
|
||||
* A simple class that implements IRSEPersistableReferencedObject.
|
||||
* This is an object that can have shadow (reference) objects, which simply
|
||||
* contain a pointer (in memory) to this object, and a copy of this object's
|
||||
* unique name or key (for storing on disk).
|
||||
|
|
@ -33,7 +31,7 @@ import org.eclipse.rse.core.references.IRSEReferencedObject;
|
|||
* @lastgen interface SystemPersistableReferencedObject extends SystemReferencedObject {}
|
||||
*/
|
||||
|
||||
public interface ISystemPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject
|
||||
public interface IRSEPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -14,11 +14,13 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.references;
|
||||
package org.eclipse.rse.core.references;
|
||||
|
||||
|
||||
/**
|
||||
* A simple class that implements ISystemPersistableReferencingObject.
|
||||
* A simple class that implements IRSEPersistableReferencingObject.
|
||||
* This is an object that is a shadow (reference) of a real master object
|
||||
* (ISystemPersistableReferencedObject).
|
||||
* (IRSEPersistableReferencedObject).
|
||||
* <p>
|
||||
* Objects of this class contain a pointer (in memory) to the master object,
|
||||
* and a copy of this object's unique name or key (for storing on disk).
|
||||
|
|
@ -37,7 +39,7 @@ package org.eclipse.rse.references;
|
|||
* @lastgen interface SystemPersistableReferencingObject extends SystemReferencingObject {}
|
||||
*/
|
||||
|
||||
public interface ISystemPersistableReferencingObject extends ISystemReferencingObject, ISystemBasePersistableReferencingObject{
|
||||
public interface IRSEPersistableReferencingObject extends IRSEReferencingObject, IRSEBasePersistableReferencingObject{
|
||||
|
||||
/**
|
||||
* @generated This field/method will be replaced during code generation
|
||||
|
|
@ -55,12 +57,12 @@ public interface ISystemPersistableReferencingObject extends ISystemReferencingO
|
|||
* @generated This field/method will be replaced during code generation
|
||||
* @return The ParentReferenceManager reference
|
||||
*/
|
||||
ISystemBasePersistableReferenceManager getParentReferenceManager();
|
||||
IRSEBasePersistableReferenceManager getParentReferenceManager();
|
||||
|
||||
/**
|
||||
* @generated This field/method will be replaced during code generation
|
||||
* @param l The new value of the ParentReferenceManager reference
|
||||
*/
|
||||
void setParentReferenceManager(ISystemBasePersistableReferenceManager value);
|
||||
void setParentReferenceManager(IRSEBasePersistableReferenceManager value);
|
||||
|
||||
}
|
||||
|
|
@ -14,9 +14,8 @@
|
|||
* {Name} (company) - description of contribution.
|
||||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.references;
|
||||
package org.eclipse.rse.core.references;
|
||||
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
|
||||
/**
|
||||
* A class to encapsulate the operations required of an object which
|
||||
|
|
@ -33,6 +32,6 @@ import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
|||
* @lastgen interface SystemReferencingObject {}
|
||||
*/
|
||||
|
||||
public interface ISystemReferencingObject extends IRSEBaseReferencingObject{
|
||||
public interface IRSEReferencingObject extends IRSEBaseReferencingObject{
|
||||
|
||||
}
|
||||
|
|
@ -33,7 +33,6 @@ Export-Package: org.eclipse.rse.core,
|
|||
org.eclipse.rse.model,
|
||||
org.eclipse.rse.persistence,
|
||||
org.eclipse.rse.persistence.dom,
|
||||
org.eclipse.rse.references,
|
||||
org.eclipse.rse.ui,
|
||||
org.eclipse.rse.ui.actions,
|
||||
org.eclipse.rse.ui.dialogs,
|
||||
|
|
|
|||
|
|
@ -1227,7 +1227,6 @@ public class SystemResources extends NLS
|
|||
public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION;
|
||||
public static String RESID_MODELOBJECTS_FILTER_DESCRIPTION;
|
||||
public static String RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION;
|
||||
public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
|
||||
|
||||
// Services form
|
||||
public static String RESID_SERVICESFORM_CONFIGURATION_TOOLTIP;
|
||||
|
|
|
|||
|
|
@ -1417,7 +1417,6 @@ RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION=The Server Launcher is an object f
|
|||
RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION=A Referencing Object encapsulates the operations required of an object which is merely a reference to another object.
|
||||
RESID_MODELOBJECTS_FILTER_DESCRIPTION=A filter is a collection of filter strings that determines which files will pass through it.
|
||||
RESID_MODELOBJECTS_FILTERPOOL_DESCRIPTION=A filter pool is a group of filters. There is one filter pool associated with each profile.
|
||||
RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION=An RSE Model Object represents any object in the Remote Systems Explorer.
|
||||
|
||||
RESID_SERVICESFORM_CONFIGURATION_TOOLTIP=Select the configuration you wish to use to enable this subsystem. A configuration comprises a connector service and a subsystem service.
|
||||
RESID_SERVICESFORM_SERVICES_TOOLTIP=Select the elements of your chosen configuration and you can view and edit their properties in the Properties section.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ package org.eclipse.rse.ui.widgets.services;
|
|||
|
||||
import org.eclipse.rse.core.model.IProperty;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
import org.eclipse.rse.internal.model.Property;
|
||||
import org.eclipse.rse.core.model.Property;
|
||||
import org.eclipse.rse.ui.view.SystemComboBoxPropertyDescriptor;
|
||||
import org.eclipse.ui.views.properties.IPropertyDescriptor;
|
||||
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import java.util.List;
|
|||
import org.eclipse.rse.core.model.IProperty;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
import org.eclipse.rse.internal.model.PropertySet;
|
||||
import org.eclipse.rse.core.model.PropertySet;
|
||||
import org.eclipse.rse.model.IHost;
|
||||
import org.eclipse.rse.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
package org.eclipse.rse.filters;
|
||||
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
|
||||
import org.eclipse.rse.core.model.IRSEModelObject;
|
||||
import org.eclipse.rse.references.ISystemPersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -29,7 +29,7 @@ import org.eclipse.rse.references.ISystemPersistableReferencedObject;
|
|||
/**
|
||||
* @lastgen interface SystemFilterPool extends SystemPersistableReferencedObject, SystemFilterContainer {}
|
||||
*/
|
||||
public interface ISystemFilterPool extends ISystemPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject
|
||||
public interface ISystemFilterPool extends IRSEPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject
|
||||
{
|
||||
// external methods
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
package org.eclipse.rse.filters;
|
||||
import org.eclipse.rse.core.model.IRSEModelObject;
|
||||
import org.eclipse.rse.references.ISystemPersistableReferencingObject;
|
||||
import org.eclipse.rse.core.references.IRSEPersistableReferencingObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -26,9 +26,9 @@ import org.eclipse.rse.references.ISystemPersistableReferencingObject;
|
|||
* of their reference count.
|
||||
*/
|
||||
/**
|
||||
* @lastgen interface SystemFilterPoolReference extends SystemPersistableReferencingObject, ISystemPersistableReferencingObject, SystemFilterContainerReference {}
|
||||
* @lastgen interface SystemFilterPoolReference extends SystemPersistableReferencingObject, IRSEPersistableReferencingObject, SystemFilterContainerReference {}
|
||||
*/
|
||||
public interface ISystemFilterPoolReference extends ISystemPersistableReferencingObject, ISystemFilterContainerReference, IRSEModelObject
|
||||
public interface ISystemFilterPoolReference extends IRSEPersistableReferencingObject, ISystemFilterContainerReference, IRSEModelObject
|
||||
{
|
||||
/**
|
||||
* Return the reference manager which is managing this filter reference
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ package org.eclipse.rse.filters;
|
|||
import java.util.Vector;
|
||||
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.references.ISystemBasePersistableReferenceManager;
|
||||
|
||||
/**
|
||||
* This class manages a persistable list of objects each of which reference
|
||||
|
|
@ -31,7 +31,7 @@ import org.eclipse.rse.references.ISystemBasePersistableReferenceManager;
|
|||
/**
|
||||
* @lastgen interface SystemFilterPoolReferenceManager extends SystemPersistableReferenceManager {}
|
||||
*/
|
||||
public interface ISystemFilterPoolReferenceManager extends ISystemBasePersistableReferenceManager {
|
||||
public interface ISystemFilterPoolReferenceManager extends IRSEBasePersistableReferenceManager {
|
||||
/**
|
||||
* Get the object which instantiated this instance of the filter pool reference manager.
|
||||
* This is also available from any filter reference framework object.
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.filters;
|
||||
import org.eclipse.rse.core.references.IRSEReferencingObject;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.model.ISystemContainer;
|
||||
import org.eclipse.rse.model.ISystemContentsType;
|
||||
import org.eclipse.rse.references.ISystemReferencingObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -28,7 +28,7 @@ import org.eclipse.rse.references.ISystemReferencingObject;
|
|||
/**
|
||||
* @lastgen interface SystemFilterReference extends SystemReferencingObject, SystemFilterContainerReference {}
|
||||
*/
|
||||
public interface ISystemFilterReference extends ISystemReferencingObject, ISystemFilterContainerReference, ISystemContainer
|
||||
public interface ISystemFilterReference extends IRSEReferencingObject, ISystemFilterContainerReference, ISystemContainer
|
||||
{
|
||||
/**
|
||||
* Return the reference manager which is managing this filter reference
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ import java.util.Iterator;
|
|||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEReferencingObject;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.internal.filters.SystemFilterContainerReferenceCommonMethods;
|
||||
import org.eclipse.rse.internal.filters.SystemFilterStringReference;
|
||||
import org.eclipse.rse.internal.references.SystemReferencingObject;
|
||||
import org.eclipse.rse.model.ISystemContainer;
|
||||
import org.eclipse.rse.model.ISystemContentsType;
|
||||
import org.eclipse.rse.references.ISystemReferencingObject;
|
||||
|
||||
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ import org.eclipse.rse.references.ISystemReferencingObject;
|
|||
/**
|
||||
* @lastgen class SystemFilterReferenceImpl extends SystemReferencingObjectImpl implements IAdaptable, SystemFilterReference, SystemReferencingObject {}
|
||||
*/
|
||||
public class SystemFilterReference extends SystemReferencingObject implements IAdaptable, ISystemFilterReference, ISystemReferencingObject
|
||||
public class SystemFilterReference extends SystemReferencingObject implements IAdaptable, ISystemFilterReference, IRSEReferencingObject
|
||||
{
|
||||
private SystemFilterContainerReferenceCommonMethods containerHelper = null;
|
||||
private ISystemFilterContainerReference parent = null;
|
||||
|
|
@ -384,7 +384,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
|
||||
|
||||
// -----------------------------------
|
||||
// ISystemReferencingObject methods...
|
||||
// IRSEReferencingObject methods...
|
||||
// -----------------------------------
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1118,7 +1118,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
|
|||
/**
|
||||
* Return the unique reference name of this object.
|
||||
* <p>
|
||||
* As required by the {@link org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject ISystemPersistableReferencedObject}
|
||||
* As required by the {@link org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject IRSEPersistableReferencedObject}
|
||||
* interface.
|
||||
*/
|
||||
public String getReferenceName()
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ package org.eclipse.rse.internal.filters;
|
|||
|
||||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.filters.ISystemFilter;
|
||||
import org.eclipse.rse.filters.ISystemFilterContainer;
|
||||
|
|
@ -29,7 +30,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
|
|||
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
|
||||
import org.eclipse.rse.filters.ISystemFilterReference;
|
||||
import org.eclipse.rse.internal.references.SystemPersistableReferencingObject;
|
||||
import org.eclipse.rse.references.ISystemPersistableReferencedObject;
|
||||
|
||||
/**
|
||||
* A reference to a filter pool. A reference may be "resolved" or "unresolved".
|
||||
|
|
@ -145,7 +145,7 @@ public class SystemFilterPoolReference extends SystemPersistableReferencingObjec
|
|||
* This also calls addReference(this) on that pool!
|
||||
*/
|
||||
public void setReferenceToFilterPool(ISystemFilterPool pool) {
|
||||
super.setReferencedObject((ISystemPersistableReferencedObject) pool);
|
||||
super.setReferencedObject((IRSEPersistableReferencedObject) pool);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import org.eclipse.core.resources.IFile;
|
|||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.rse.core.SystemResourceHelpers;
|
||||
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencingObject;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.filters.ISystemFilter;
|
||||
import org.eclipse.rse.filters.ISystemFilterConstants;
|
||||
|
|
@ -33,7 +34,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
|
|||
import org.eclipse.rse.filters.ISystemFilterReference;
|
||||
import org.eclipse.rse.filters.ISystemFilterSavePolicies;
|
||||
import org.eclipse.rse.internal.references.SystemPersistableReferenceManager;
|
||||
import org.eclipse.rse.references.ISystemBasePersistableReferencingObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -391,7 +391,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
|
|||
*/
|
||||
public ISystemFilterPoolReference[] getSystemFilterPoolReferences()
|
||||
{
|
||||
ISystemBasePersistableReferencingObject[] refObjs = super.getReferencingObjects();
|
||||
IRSEBasePersistableReferencingObject[] refObjs = super.getReferencingObjects();
|
||||
if (refObjs.length == 0)
|
||||
return emptyFilterPoolRefArray;
|
||||
else if ((fpRefsArray == null) || (fpRefsArray.length!=refObjs.length))
|
||||
|
|
@ -646,7 +646,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
|
|||
public void renameReferenceToSystemFilterPool(ISystemFilterPool pool)
|
||||
{
|
||||
ISystemFilterPoolReference poolRef = null;
|
||||
ISystemBasePersistableReferencingObject[] refs = getReferencingObjects();
|
||||
IRSEBasePersistableReferencingObject[] refs = getReferencingObjects();
|
||||
for (int idx=0; (poolRef==null) && (idx<refs.length); idx++)
|
||||
if (refs[idx].getReferencedObject()==pool)
|
||||
poolRef = (ISystemFilterPoolReference)refs[idx];
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ package org.eclipse.rse.internal.filters;
|
|||
|
||||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
import org.eclipse.rse.filters.ISystemFilter;
|
||||
import org.eclipse.rse.filters.ISystemFilterConstants;
|
||||
import org.eclipse.rse.filters.ISystemFilterPoolManager;
|
||||
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
|
||||
import org.eclipse.rse.filters.ISystemFilterString;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
import org.eclipse.rse.internal.references.SystemReferencedObjectHelper;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
import org.eclipse.rse.ui.SystemResources;
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ public class SystemFilterStringReference
|
|||
return Platform.getAdapterManager().getAdapter(this, adapterType);
|
||||
}
|
||||
// ----------------------------------------------
|
||||
// ISystemReferencingObject methods...
|
||||
// IRSEReferencingObject methods...
|
||||
// ----------------------------------------------
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IAdaptable;
|
|||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.rse.core.IRSESystemType;
|
||||
import org.eclipse.rse.core.SystemPreferencesManager;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.model.IHost;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import java.util.List;
|
|||
|
||||
import org.eclipse.rse.core.ISystemUserIdConstants;
|
||||
import org.eclipse.rse.core.SystemPreferencesManager;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.model.IHost;
|
||||
import org.eclipse.rse.model.ISystemHostPool;
|
||||
import org.eclipse.rse.model.ISystemProfile;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import java.util.Vector;
|
|||
|
||||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
|
||||
import org.eclipse.rse.filters.ISystemFilterPool;
|
||||
import org.eclipse.rse.filters.ISystemFilterPoolManager;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import org.eclipse.rse.core.internal.subsystems.SubSystemFilterNamingPolicy;
|
|||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
import org.eclipse.rse.core.model.IRSEModelObject;
|
||||
import org.eclipse.rse.core.model.PropertyType;
|
||||
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem;
|
||||
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
|
|
@ -40,7 +41,6 @@ import org.eclipse.rse.internal.filters.SystemFilterPool;
|
|||
import org.eclipse.rse.model.IHost;
|
||||
import org.eclipse.rse.model.ISystemProfile;
|
||||
import org.eclipse.rse.model.ISystemProfileManager;
|
||||
import org.eclipse.rse.model.PropertyType;
|
||||
import org.eclipse.rse.persistence.dom.IRSEDOMConstants;
|
||||
import org.eclipse.rse.persistence.dom.IRSEDOMImporter;
|
||||
import org.eclipse.rse.persistence.dom.RSEDOM;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ import java.util.List;
|
|||
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||
import org.eclipse.rse.references.ISystemBasePersistableReferenceManager;
|
||||
import org.eclipse.rse.references.ISystemBasePersistableReferencingObject;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencingObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -32,11 +32,11 @@ import org.eclipse.rse.references.ISystemBasePersistableReferencingObject;
|
|||
* <p>
|
||||
* <b>YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT!</b>
|
||||
* <p>
|
||||
* @see org.eclipse.rse.references.ISystemBasePersistableReferenceManager
|
||||
* @see org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager
|
||||
*
|
||||
* @lastgen class SystemPersistableReferenceManagerImpl Impl implements SystemPersistableReferenceManager, EObject {}
|
||||
*/
|
||||
public class SystemPersistableReferenceManager implements ISystemBasePersistableReferenceManager
|
||||
public class SystemPersistableReferenceManager implements IRSEBasePersistableReferenceManager
|
||||
{
|
||||
/**
|
||||
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
|
||||
|
|
@ -48,7 +48,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
*/
|
||||
protected static final String NAME_EDEFAULT = null;
|
||||
|
||||
private ISystemBasePersistableReferencingObject[] listAsArray = null;
|
||||
private IRSEBasePersistableReferencingObject[] listAsArray = null;
|
||||
public static boolean debug = true;
|
||||
public static HashMap EMPTY_MAP = new HashMap();
|
||||
|
||||
|
|
@ -88,17 +88,17 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* Return an array of the referencing objects currently being managed.
|
||||
* @param array of the referencing objects currently in this list.
|
||||
*/
|
||||
public ISystemBasePersistableReferencingObject[] getReferencingObjects()
|
||||
public IRSEBasePersistableReferencingObject[] getReferencingObjects()
|
||||
{
|
||||
if ((listAsArray == null) || (listAsArray.length!=internalGetList().size()))
|
||||
{
|
||||
List list = internalGetList();
|
||||
listAsArray = new ISystemBasePersistableReferencingObject[list.size()];
|
||||
listAsArray = new IRSEBasePersistableReferencingObject[list.size()];
|
||||
Iterator i = list.iterator();
|
||||
int idx=0;
|
||||
while (i.hasNext())
|
||||
{
|
||||
listAsArray[idx++] = (ISystemBasePersistableReferencingObject)i.next();
|
||||
listAsArray[idx++] = (IRSEBasePersistableReferencingObject)i.next();
|
||||
}
|
||||
}
|
||||
return listAsArray;
|
||||
|
|
@ -109,7 +109,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* @param objects An array of referencing objects which is to become the new list.
|
||||
* @param deReference true to first de-reference all objects in the existing list.
|
||||
*/
|
||||
public void setReferencingObjects(ISystemBasePersistableReferencingObject[] objects,
|
||||
public void setReferencingObjects(IRSEBasePersistableReferencingObject[] objects,
|
||||
boolean deReference)
|
||||
{
|
||||
listAsArray = objects;
|
||||
|
|
@ -123,18 +123,18 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
}
|
||||
|
||||
/*
|
||||
* DWD this should probably operate on ISystemPersistableReferencingObject
|
||||
* DWD this should probably operate on IRSEPersistableReferencingObject
|
||||
* instead and call setParentManager. This involves recasting this class to
|
||||
* implement a new type or changing ISystemBasePersistableReferenceManager to
|
||||
* implement a new type or changing IRSEBasePersistableReferenceManager to
|
||||
* deal with parent references - probably changing its name in the process.
|
||||
* We could collapse ISystemBasePersistableReferencingObject and its subinterface
|
||||
* We could collapse IRSEBasePersistableReferencingObject and its subinterface
|
||||
* into one interface.
|
||||
*/
|
||||
/**
|
||||
* Add a referencing object to the managed list.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int addReferencingObject(ISystemBasePersistableReferencingObject object)
|
||||
public int addReferencingObject(IRSEBasePersistableReferencingObject object)
|
||||
{
|
||||
List list = internalGetList();
|
||||
list.add(object);
|
||||
|
|
@ -147,7 +147,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* <p>Does NOT call removeReference on the master referenced object.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int removeReferencingObject(ISystemBasePersistableReferencingObject object)
|
||||
public int removeReferencingObject(IRSEBasePersistableReferencingObject object)
|
||||
{
|
||||
List list = internalGetList();
|
||||
list.remove(object);
|
||||
|
|
@ -160,7 +160,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* <p>DOES call removeReference on the master referenced object.
|
||||
* @return new count of referenced objects being managed.
|
||||
*/
|
||||
public int removeAndDeReferenceReferencingObject(ISystemBasePersistableReferencingObject object)
|
||||
public int removeAndDeReferenceReferencingObject(IRSEBasePersistableReferencingObject object)
|
||||
{
|
||||
object.removeReference();
|
||||
return removeReferencingObject(object);
|
||||
|
|
@ -181,7 +181,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
*/
|
||||
public void removeAndDeReferenceAllReferencingObjects()
|
||||
{
|
||||
ISystemBasePersistableReferencingObject[] objs = getReferencingObjects();
|
||||
IRSEBasePersistableReferencingObject[] objs = getReferencingObjects();
|
||||
for (int idx=0; idx<objs.length; idx++)
|
||||
{
|
||||
objs[idx].removeReference();
|
||||
|
|
@ -204,7 +204,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* @param object The referencing object to find position of.
|
||||
* @return zero-based position within the list. If not found, returns -1
|
||||
*/
|
||||
public int getReferencingObjectPosition(ISystemBasePersistableReferencingObject object)
|
||||
public int getReferencingObjectPosition(IRSEBasePersistableReferencingObject object)
|
||||
{
|
||||
List list = internalGetList();
|
||||
int position = -1;
|
||||
|
|
@ -215,7 +215,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
|
||||
while (!match && i.hasNext())
|
||||
{
|
||||
ISystemBasePersistableReferencingObject curr = (ISystemBasePersistableReferencingObject)i.next();
|
||||
IRSEBasePersistableReferencingObject curr = (IRSEBasePersistableReferencingObject)i.next();
|
||||
if (curr == object)
|
||||
{
|
||||
match = true;
|
||||
|
|
@ -232,7 +232,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* @param newPosition New zero-based position
|
||||
* @param object The referencing object to move
|
||||
*/
|
||||
public void moveReferencingObjectPosition(int newPosition, ISystemBasePersistableReferencingObject object)
|
||||
public void moveReferencingObjectPosition(int newPosition, IRSEBasePersistableReferencingObject object)
|
||||
{
|
||||
// List list = internalGetList();
|
||||
//FIXME list.move(newPosition, object);
|
||||
|
|
@ -257,16 +257,16 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* @return the referencing object within this list which references the given referencable object, or
|
||||
* null if no reference found.
|
||||
*/
|
||||
public ISystemBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object)
|
||||
public IRSEBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object)
|
||||
{
|
||||
List list = internalGetList();
|
||||
ISystemBasePersistableReferencingObject match = null;
|
||||
IRSEBasePersistableReferencingObject match = null;
|
||||
Iterator i = list.iterator();
|
||||
int idx = 0;
|
||||
|
||||
while ((match==null) && i.hasNext())
|
||||
{
|
||||
ISystemBasePersistableReferencingObject curr = (ISystemBasePersistableReferencingObject)i.next();
|
||||
IRSEBasePersistableReferencingObject curr = (IRSEBasePersistableReferencingObject)i.next();
|
||||
if (curr.getReferencedObjectName().equals(object.getReferenceName()))
|
||||
{
|
||||
match = curr;
|
||||
|
|
@ -383,10 +383,10 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
|
|||
* @param fileName The unqualified save file name including extension such as .xmi
|
||||
* @return The restored object, or null if given file not found. Any other error gives an exception.
|
||||
*/
|
||||
public static ISystemBasePersistableReferenceManager restore(IFolder folder, String fileName)
|
||||
public static IRSEBasePersistableReferenceManager restore(IFolder folder, String fileName)
|
||||
throws Exception
|
||||
{
|
||||
ISystemBasePersistableReferenceManager mgr = new SystemPersistableReferenceManager();
|
||||
IRSEBasePersistableReferenceManager mgr = new SystemPersistableReferenceManager();
|
||||
/*FIXME
|
||||
initMOF();
|
||||
Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
********************************************************************************/
|
||||
package org.eclipse.rse.internal.references;
|
||||
|
||||
import org.eclipse.rse.references.ISystemPersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
|
||||
|
||||
/**
|
||||
* @see org.eclipse.rse.references.ISystemBasePersistableReferenceManager
|
||||
* @see org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager
|
||||
*/
|
||||
public abstract class SystemPersistableReferencedObject extends SystemReferencedObject implements ISystemPersistableReferencedObject {
|
||||
public abstract class SystemPersistableReferencedObject extends SystemReferencedObject implements IRSEPersistableReferencedObject {
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
|
|
@ -31,7 +31,7 @@ public abstract class SystemPersistableReferencedObject extends SystemReferenced
|
|||
/**
|
||||
* Return the unique reference name of this object.
|
||||
* <p>
|
||||
* As required by the {@link org.eclipse.rse.references.ISystemPersistableReferencedObject}
|
||||
* As required by the {@link org.eclipse.rse.core.references.IRSEPersistableReferencedObject}
|
||||
* interface.
|
||||
* <p>
|
||||
* YOUR SUBCLASS MUST OVERRIDE THIS!
|
||||
|
|
|
|||
|
|
@ -18,20 +18,20 @@ package org.eclipse.rse.internal.references;
|
|||
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
||||
import org.eclipse.rse.references.ISystemBasePersistableReferenceManager;
|
||||
import org.eclipse.rse.references.ISystemPersistableReferencingObject;
|
||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager;
|
||||
import org.eclipse.rse.core.references.IRSEPersistableReferencingObject;
|
||||
|
||||
/**
|
||||
* This class represents an object that references another object in the model.
|
||||
* The reference is persistable.
|
||||
* <p>
|
||||
* @see org.eclipse.rse.references.ISystemPersistableReferencingObject
|
||||
* @see org.eclipse.rse.core.references.IRSEPersistableReferencingObject
|
||||
*/
|
||||
// DWD Change this name to SystemPersistableReference? Ditto for the interface.
|
||||
public abstract class SystemPersistableReferencingObject extends SystemReferencingObject implements ISystemPersistableReferencingObject {
|
||||
public abstract class SystemPersistableReferencingObject extends SystemReferencingObject implements IRSEPersistableReferencingObject {
|
||||
|
||||
protected String referencedObjectName = null;
|
||||
protected ISystemBasePersistableReferenceManager _referenceManager;
|
||||
protected IRSEBasePersistableReferenceManager _referenceManager;
|
||||
|
||||
/**
|
||||
* Create a new referencing object.
|
||||
|
|
@ -51,7 +51,7 @@ public abstract class SystemPersistableReferencingObject extends SystemReferenci
|
|||
* Set the in-memory reference to the master object.
|
||||
* This implementation also extracts that master object's name and calls
|
||||
* setReferencedObjectName as part of this method call.
|
||||
* @see org.eclipse.rse.references.ISystemBasePersistableReferencingObject#setReferencedObject(IRSEBasePersistableReferencedObject)
|
||||
* @see org.eclipse.rse.core.references.IRSEBasePersistableReferencingObject#setReferencedObject(IRSEBasePersistableReferencedObject)
|
||||
*/
|
||||
public void setReferencedObject(IRSEBasePersistableReferencedObject obj) {
|
||||
getHelper().setReferencedObject((IRSEBaseReferencedObject) obj);
|
||||
|
|
@ -68,14 +68,14 @@ public abstract class SystemPersistableReferencingObject extends SystemReferenci
|
|||
/**
|
||||
* @return The reference manager for this reference.
|
||||
*/
|
||||
public ISystemBasePersistableReferenceManager getParentReferenceManager() {
|
||||
public IRSEBasePersistableReferenceManager getParentReferenceManager() {
|
||||
return _referenceManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the reference manager for this reference. Must be done when this reference is created.
|
||||
*/
|
||||
public void setParentReferenceManager(ISystemBasePersistableReferenceManager newParentReferenceManager) {
|
||||
public void setParentReferenceManager(IRSEBasePersistableReferenceManager newParentReferenceManager) {
|
||||
_referenceManager = newParentReferenceManager;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
|||
*/
|
||||
public class SystemPersistableReferencingObjectHelper
|
||||
extends SystemReferencingObjectHelper
|
||||
//implements ISystemPersistableReferencingObject
|
||||
//implements IRSEPersistableReferencingObject
|
||||
{
|
||||
private String masterObjectName = null;
|
||||
/**
|
||||
|
|
@ -48,7 +48,7 @@ public class SystemPersistableReferencingObjectHelper
|
|||
|
||||
/**
|
||||
* Set the object to which we reference. This overload takes an
|
||||
* ISystemPersistableReferencedObject so we can query its name for
|
||||
* IRSEPersistableReferencedObject so we can query its name for
|
||||
* storage purposes.
|
||||
*/
|
||||
public void setReferencedObject(IRSEBasePersistableReferencedObject obj)
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.references;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
import org.eclipse.rse.core.references.IRSEReferencedObject;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.internal.references;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
import org.eclipse.rse.references.ISystemReferencingObject;
|
||||
import org.eclipse.rse.core.references.IRSEReferencingObject;
|
||||
import org.eclipse.rse.ui.SystemResources;
|
||||
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ import org.eclipse.rse.ui.SystemResources;
|
|||
/**
|
||||
* @lastgen class SystemReferencingObjectImpl Impl implements SystemReferencingObject, EObject {}
|
||||
*/
|
||||
public abstract class SystemReferencingObject extends RSEModelObject implements ISystemReferencingObject
|
||||
public abstract class SystemReferencingObject extends RSEModelObject implements IRSEReferencingObject
|
||||
{
|
||||
private SystemReferencingObjectHelper helper = null;
|
||||
protected boolean referenceBroken = false;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
|||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||
|
||||
/**
|
||||
* This is a class that implements all the methods in the ISystemReferencingObject.
|
||||
* This is a class that implements all the methods in the IRSEReferencingObject.
|
||||
* It makes implementing this interface trivial.
|
||||
* The easiest use of this class is to subclass it, but since that is not
|
||||
* always possible, it is not abstract and hence can be leveraged via containment.
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@
|
|||
|
||||
package org.eclipse.rse.core.internal.subsystems;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
||||
import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
import org.eclipse.rse.ui.SystemResources;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import java.util.Vector;
|
|||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.rse.core.ISystemUserIdConstants;
|
||||
import org.eclipse.rse.core.PasswordPersistenceManager;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.logging.Logger;
|
||||
import org.eclipse.rse.logging.LoggerFactory;
|
||||
import org.eclipse.rse.model.IHost;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.eclipse.rse.core.internal.subsystems.ServerLauncher;
|
|||
import org.eclipse.rse.core.model.IProperty;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.IPropertyType;
|
||||
import org.eclipse.rse.model.PropertyType;
|
||||
import org.eclipse.rse.core.model.PropertyType;
|
||||
import org.eclipse.rse.ui.SystemResources;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
|
|||
import org.eclipse.rse.core.SystemBasePlugin;
|
||||
import org.eclipse.rse.core.SystemPreferencesManager;
|
||||
import org.eclipse.rse.core.model.IPropertySet;
|
||||
import org.eclipse.rse.core.model.RSEModelObject;
|
||||
import org.eclipse.rse.filters.ISystemFilter;
|
||||
import org.eclipse.rse.filters.ISystemFilterPool;
|
||||
import org.eclipse.rse.filters.ISystemFilterPoolManager;
|
||||
|
|
@ -41,7 +42,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
|
|||
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
|
||||
import org.eclipse.rse.filters.ISystemFilterReference;
|
||||
import org.eclipse.rse.filters.ISystemFilterString;
|
||||
import org.eclipse.rse.internal.model.RSEModelObject;
|
||||
import org.eclipse.rse.model.IHost;
|
||||
import org.eclipse.rse.model.ISystemModelChangeEvents;
|
||||
import org.eclipse.rse.model.ISystemProfile;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue