diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java index 12677e18d9c..4d34098196d 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java @@ -491,7 +491,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java index 948807b5771..7ba21e65bde 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java @@ -237,7 +237,7 @@ public class DummyHost extends PlatformObject implements IHost } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } public boolean isTainted() { diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java index 60656b89347..449351f9ffe 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java @@ -20,12 +20,14 @@ package org.eclipse.rse.core.model; /** * This is the interface for all objects that contain persistent data. * The objects themselves may not have a persistent form, but can lie in the - * persistence heirarchy and be reconstructed when the persistent form is restored. + * persistence hierarchy and be reconstructed when the persistent form is restored. * An example of this is the SytemFilterPoolManager, which is itself not persisted, but * has this interface since it can be reconstructed from its ordering and exists * in the parent chain from SystemFilterPool to SystemProfile. */ public interface IRSEPersistableContainer { + + static final IRSEPersistableContainer[] NO_CHILDREN = new IRSEPersistableContainer[0]; /** * Request a persistence manager to persist this object. @@ -101,15 +103,16 @@ public interface IRSEPersistableContainer { /** * Retrieve the parent of this object in the persistence containment hierarchy. * This is related to, but not necessarily the same as, the model hierarchy. - * @return the parent persistable object. This is null if there is no parent. + * @return the parent persistent object. This is null if there is no parent. */ public IRSEPersistableContainer getPersistableParent(); /** * Retrieves the children of this object in the persistence containment hierarchy. * This is related to, but not necessarily the same as, the model hierarchy. - * @return the array of persistable children in the order they are to be stored in the + * @return the array of persistent children in the order they are to be stored in the * persistent form. This is an empty array if there are no children. + * See {@link #NO_CHILDREN}. */ public IRSEPersistableContainer[] getPersistableChildren(); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java index 19fa9a47221..6387aa5a05f 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java @@ -179,7 +179,7 @@ public class PropertySet extends RSEPersistableObject implements IPropertySet, I } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } public IRSEPersistableContainer getPersistableParent() { diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java index 1132ceb92e3..21b0cae434f 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java @@ -779,7 +779,7 @@ public abstract class AbstractDelegatingConnectorService implements IDelegatingC { return conServ.getPersistableChildren(); } - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java index b080240f0b3..2f8f9243e8d 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java @@ -1651,7 +1651,7 @@ public class SystemFilterPoolManager extends RSEPersistableObject implements ISy } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java index f1a3cb4093e..2fd0fa4b6c2 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java @@ -269,6 +269,6 @@ public class SystemFilterPoolReference extends SystemPersistableReferencingObjec * @see org.eclipse.rse.core.model.IRSEPersistableContainer#getPersistableChildren() */ public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java index 7c49640cd32..2337a9a10ba 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java @@ -299,7 +299,7 @@ public class SystemFilterString extends RSEModelObject implements ISystemFilterS } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java index 2cadb9ea54f..b1225e0625a 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java @@ -595,7 +595,7 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } // ------------------------- diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 2285de89859..39e99099989 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -3115,7 +3115,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionContext.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionContext.java index fe7381181ee..54b9700353a 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionContext.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionContext.java @@ -160,7 +160,7 @@ public class UserActionContext extends RSEModelObject implements IUserActionCont * @see org.eclipse.rse.core.model.IRSEPersistableContainer#getPersistableChildren() */ public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } /* (non-Javadoc) diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionModel.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionModel.java index b37438ff6f3..4811a94db50 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionModel.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionModel.java @@ -219,7 +219,7 @@ public class UserActionModel extends RSEModelObject implements IUserActionModel * @see org.eclipse.rse.core.model.IRSEPersistableContainer#getPersistableChildren() */ public IRSEPersistableContainer[] getPersistableChildren() { - return new IRSEPersistableContainer[0]; + return IRSEPersistableContainer.NO_CHILDREN; } /* (non-Javadoc)