diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index 4bdd77db8e4..96b2c8bd68d 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -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, diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java index d44c2c05365..bcbd743224f 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Property.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java @@ -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 { diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java index 8bbd42b95b3..fe7fae90088 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySet.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java @@ -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 diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java similarity index 93% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java index 573c702d3d5..fee34d3c5fa 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/PropertySetContainer.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java index 0388d71183a..e56ce3ec275 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/PropertyType.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java @@ -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 diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java similarity index 87% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java index ba3ce419eb3..a9b14ff2276 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/RSEModelObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java @@ -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; } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java new file mode 100644 index 00000000000..5b998b6560b --- /dev/null +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java @@ -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); + } +} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties new file mode 100644 index 00000000000..ce42b423b11 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties @@ -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. \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java similarity index 89% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferenceManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java index 0213a18631d..62b103f20ee 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferenceManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java @@ -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; *
    *
  1. Include the references package from the SystemReferences .cat file *
  2. Ensure the class for the master objects subclass SystemPersistableReferencedObject, - * or implement ISystemPersistableReferencedObject. + * or implement IRSEPersistableReferencedObject. * YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT! *
  3. 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. *

    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. *

    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. *

    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 diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java similarity index 91% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferencingObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java index d0509ef38b2..56d61a9bdd3 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java @@ -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; *

    * This interface captures the methods to set and query that name or key. */ -public interface ISystemBasePersistableReferencingObject +public interface IRSEBasePersistableReferencingObject extends IRSEBaseReferencingObject { /** diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java similarity index 78% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencedObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java index 51254c763c1..df247dcd012 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencedObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java @@ -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 { } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java similarity index 84% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencingObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java index 1b6cfde5f68..03eee5c8ca5 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java @@ -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). *

    * 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); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java similarity index 89% rename from rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemReferencingObject.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java index c0ca1ddfa13..92cb0a90c36 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java @@ -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{ } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF index 107d98ad102..99d9da07fa2 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java index 4f36a9539a5..50fba9a815b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties index cafecd6ecea..34f7f6cf9fb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties @@ -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. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java index 84a430d8e07..7b5653f70d8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertyElement.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java index 3d0bd8539f2..4d39f30943e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/PropertySetServiceElement.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java index 497194f150b..423220c5289 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java @@ -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 /** diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java index a037ad33360..420c41922ce 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReference.java @@ -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 diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReferenceManager.java index 21d8714e75b..44439a66f62 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReferenceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPoolReferenceManager.java @@ -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. diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java index 8dec7a2c19e..f31e25f05a4 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java @@ -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 diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java index fd40b1f0117..d738d66a4d3 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java @@ -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... // ----------------------------------- /** diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java index 3087d94709d..f12df732594 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java @@ -1118,7 +1118,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject /** * Return the unique reference name of this object. *

    - * 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() diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java index 119d12c82be..b5c7f7d3c1f 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java @@ -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); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java index 39eda8fa86a..d6378ae4d45 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java @@ -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 * YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT! *

    - * @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() Name}' 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 *

    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 *

    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 - * As required by the {@link org.eclipse.rse.references.ISystemPersistableReferencedObject} + * As required by the {@link org.eclipse.rse.core.references.IRSEPersistableReferencedObject} * interface. *

    * YOUR SUBCLASS MUST OVERRIDE THIS! diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java index 75305038f73..03def8b4f96 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java @@ -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. *

    - * @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; } diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java index 8a404dd8fbf..998f68328fb 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java @@ -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) diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java index 15422e6c7f7..320b0e9bb86 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java @@ -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; /** diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java index 64f0ea38987..6ce5380116e 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java index 339277717ac..d65a20848a2 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java @@ -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. diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java index 976b37d1d93..7264e10c0ab 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/ServerLauncher.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index cf514305240..f73d9c8d2e8 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java index e4ae8456d1e..61330006c63 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 10fcb059f04..72203f39f63 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -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;