mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 15:15:25 +02:00
Code Issues Wiki Activity

[cleanup] Classes for filter referencing and referenced filters have moved from org.eclipse.rse.ui plugin to org.eclipse.rse.core plugin

Browse source
This commit is contained in:
Kushal Munir 2006-08-11 14:58:48 +00:00
parent 79ce5a3037
commit df5ce0c379
43 changed files with 183 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
View file

@ -7,5 +7,7 @@ Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.core
Export-Package: org.eclipse.rse.core,
org.eclipse.rse.core.filters,
org.eclipse.rse.core.references
Bundle-Vendor: Eclipse.org

4
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterNamingPolicy.java → rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/IRSEFilterNamingPolicy.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.filters;
package org.eclipse.rse.core.filters;
/**
* Allows tool writers to specify the naming standards for the
* persistence files and folders involved with filters.
@ -23,7 +23,7 @@ package org.eclipse.rse.filters;
* <p>
* @see org.eclipse.rse.internal.filters.SystemFilterNamingPolicy#getNamingPolicy()
*/
public interface ISystemFilterNamingPolicy
public interface IRSEFilterNamingPolicy
{
/**
* Get the unqualified save file name for the given SystemFilterPoolManager object name.

8
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferencedObject.java → rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.references;
package org.eclipse.rse.core.references;
/**
* Referenced objects are objects that have shadow objects of them.
@ -22,7 +22,7 @@ package org.eclipse.rse.references;
* real object to appear multiple times. In these cases, a unique shadow object
* is created for each unique instance of the real object.
* <p>
* The parent interface ISystemReferencedObject captures the simple set of methods
* The parent interface IRSEReferencedObject captures the simple set of methods
* an object that supports such a shadow must implement.
* <p>
* This interface specializes that for the case of objects which support references
@ -38,8 +38,8 @@ package org.eclipse.rse.references;
* This interface captures the method to allow a shadow or referencing object to
* query that unique name or key from this referencable master object.
*/
public interface ISystemBasePersistableReferencedObject
extends ISystemBaseReferencedObject
public interface IRSEBasePersistableReferencedObject
extends IRSEBaseReferencedObject
{
/**

10
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBaseReferencedObject.java → rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
View file

@ -14,22 +14,22 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.references;
package org.eclipse.rse.core.references;
/**
* Interface that any master object that is referenced must implement.
*/
public interface ISystemBaseReferencedObject
public interface IRSEBaseReferencedObject
{
/**
* Add a reference, increment reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int addReference(ISystemBaseReferencingObject ref);
public int addReference(IRSEBaseReferencingObject ref);
/**
* Remove a reference, decrement reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int removeReference(ISystemBaseReferencingObject ref);
public int removeReference(IRSEBaseReferencingObject ref);
/**
* Return a count of how many referencing objects reference this object.
*/
@ -41,5 +41,5 @@ public interface ISystemBaseReferencedObject
/**
* Return a list of all referencing objects of this object
*/
public ISystemBaseReferencingObject[] getReferencingObjects();
public IRSEBaseReferencingObject[] getReferencingObjects();
}

8
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBaseReferencingObject.java → rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.references;
package org.eclipse.rse.core.references;
/**
* Referencing objects are shadows of real objects. Typically, shadows are created
* to enable a GUI which does not allow the same real object to appear multiple times.
@ -23,16 +23,16 @@ package org.eclipse.rse.references;
* <p>
* This interface captures the simple set of methods such a shadow must implement.
*/
public interface ISystemBaseReferencingObject
public interface IRSEBaseReferencingObject
{
/**
* Set the object to which we reference
*/
public void setReferencedObject(ISystemBaseReferencedObject obj);
public void setReferencedObject(IRSEBaseReferencedObject obj);
/**
* Get the object which we reference
*/
public ISystemBaseReferencedObject getReferencedObject();
public IRSEBaseReferencedObject getReferencedObject();
/**
* Fastpath to getReferencedObject().removeReference(this).
* @return new reference count of master object

4
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemReferencedObject.java → rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.references;
package org.eclipse.rse.core.references;
/**
* A class to encapsulate the operations required of an object which
* supports references to it by other objects (SystemReferencingObject).
@ -29,6 +29,6 @@ package org.eclipse.rse.references;
* @lastgen interface SystemReferencedObject {}
*/
public interface ISystemReferencedObject extends ISystemBaseReferencedObject{
public interface IRSEReferencedObject extends IRSEBaseReferencedObject{
}

1
rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
View file

@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui,
org.eclipse.ui.views,
org.eclipse.core.runtime,
org.eclipse.rse.core,
org.eclipse.rse.ui
Export-Package: org.eclipse.rse.processes.ui,
org.eclipse.rse.processes.ui.actions,

1
rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
View file

@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.files.ui,
org.eclipse.rse.subsystems.shells.core,
org.eclipse.rse.subsystems.files.core,
org.eclipse.rse.core,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.shells.ui,

1
rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
View file

@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.rse.services,
org.eclipse.core.resources,
org.eclipse.rse.core,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.internal.subsystems.files.core,

1
rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
View file

@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.dstore.extra,
org.eclipse.rse.files.ui,
org.eclipse.rse.subsystems.files.core,
org.eclipse.rse.core,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.subsystems.files.dstore,

1
rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
View file

@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.connectorservice.local,
org.eclipse.rse.files.ui,
org.eclipse.rse.subsystems.files.core,
org.eclipse.rse.core,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Bundle-Vendor: Eclipse.org

1
rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
View file

@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.rse.services,
org.eclipse.core.runtime,
org.eclipse.swt,
org.eclipse.ui,
org.eclipse.rse.core,
org.eclipse.rse.ui
Bundle-Activator: org.eclipse.rse.subsystems.processes.core.Activator
Eclipse-LazyStart: true

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -54,6 +54,7 @@ import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemElapsedTimer;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainer;
@ -77,7 +78,6 @@ import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.model.SystemRemoteElementResourceSet;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemDeleteTarget;
@ -2354,14 +2354,14 @@ public class SystemView extends TreeViewer implements ISystemTree,
//clearSelection();
if (toSelect != null)
{
if (parent instanceof ISystemBaseReferencingObject)
if (parent instanceof IRSEBaseReferencingObject)
{
TreeItem child = (TreeItem)internalFindReferencedItem((Item)parentItem, toSelect, 1);
if (child != null)
toSelect = child.getData();
}
else if ( (parent instanceof ISystemFilterPoolReferenceManagerProvider) &&
!(src instanceof ISystemBaseReferencingObject) )
!(src instanceof IRSEBaseReferencingObject) )
{
// we are in "don't show filter pools" mode and a new filter was created
// (we get the actual filter, vs on pool ref creation when we get the pool ref)
@ -4334,9 +4334,9 @@ public class SystemView extends TreeViewer implements ISystemTree,
{
// compare with node
Object data= parent.getData();
if ((data != null) && (data instanceof ISystemBaseReferencingObject))
if ((data != null) && (data instanceof IRSEBaseReferencingObject))
{
ISystemBaseReferencingObject refingData = (ISystemBaseReferencingObject)data;
IRSEBaseReferencingObject refingData = (IRSEBaseReferencingObject)data;
Object refedData = refingData.getReferencedObject();
//logDebugMsg("data is a refing obj to " + refingData);
if (refedData == element)

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
View file

@ -54,6 +54,7 @@ import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemElapsedTimer;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainer;
@ -77,7 +78,6 @@ import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.model.SystemRemoteElementResourceSet;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemDeleteTarget;
@ -2354,14 +2354,14 @@ public class SystemView extends TreeViewer implements ISystemTree,
//clearSelection();
if (toSelect != null)
{
if (parent instanceof ISystemBaseReferencingObject)
if (parent instanceof IRSEBaseReferencingObject)
{
TreeItem child = (TreeItem)internalFindReferencedItem((Item)parentItem, toSelect, 1);
if (child != null)
toSelect = child.getData();
}
else if ( (parent instanceof ISystemFilterPoolReferenceManagerProvider) &&
!(src instanceof ISystemBaseReferencingObject) )
!(src instanceof IRSEBaseReferencingObject) )
{
// we are in "don't show filter pools" mode and a new filter was created
// (we get the actual filter, vs on pool ref creation when we get the pool ref)
@ -4334,9 +4334,9 @@ public class SystemView extends TreeViewer implements ISystemTree,
{
// compare with node
Object data= parent.getData();
if ((data != null) && (data instanceof ISystemBaseReferencingObject))
if ((data != null) && (data instanceof IRSEBaseReferencingObject))
{
ISystemBaseReferencingObject refingData = (ISystemBaseReferencingObject)data;
IRSEBaseReferencingObject refingData = (IRSEBaseReferencingObject)data;
Object refedData = refingData.getReferencedObject();
//logDebugMsg("data is a refing obj to " + refingData);
if (refedData == element)

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java
View file

@ -44,6 +44,7 @@ import org.eclipse.jface.window.SameShellProvider;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.IHost;
@ -54,7 +55,6 @@ import org.eclipse.rse.model.ISystemRemoteChangeListener;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemDeleteTarget;
@ -310,10 +310,10 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
{
if (child instanceof ISystemFilter)
{
ISystemBaseReferencingObject[] references = ((ISystemFilter)child).getReferencingObjects();
IRSEBaseReferencingObject[] references = ((ISystemFilter)child).getReferencingObjects();
for (int i = 0; i < references.length; i++)
{
ISystemBaseReferencingObject ref = references[i];
IRSEBaseReferencingObject ref = references[i];
Widget w = findItem(ref);
if (w != null)
{

4
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilter.java
View file

@ -17,8 +17,8 @@
package org.eclipse.rse.filters;
import java.util.Vector;
import org.eclipse.rse.core.references.IRSEReferencedObject;
import org.eclipse.rse.model.IRSEModelObject;
import org.eclipse.rse.references.ISystemReferencedObject;
/**
@ -53,7 +53,7 @@ import org.eclipse.rse.references.ISystemReferencedObject;
/**
* @lastgen interface SystemFilterPool extends SystemReferencedObject, SystemFilterContainer {}
*/
public interface ISystemFilter extends ISystemReferencedObject, ISystemFilterContainer, IRSEModelObject
public interface ISystemFilter extends IRSEReferencedObject, ISystemFilterContainer, IRSEModelObject
{
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.

9
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterPool.java
View file

@ -15,6 +15,7 @@
********************************************************************************/
package org.eclipse.rse.filters;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.model.IRSEModelObject;
import org.eclipse.rse.references.ISystemPersistableReferencedObject;
@ -37,14 +38,14 @@ public interface ISystemFilterPool extends ISystemPersistableReferencedObject, I
public ISystemFilterPoolManagerProvider getProvider();
/**
* Set the naming policy used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public void setNamingPolicy(ISystemFilterNamingPolicy namingPolicy);
public void setNamingPolicy(IRSEFilterNamingPolicy namingPolicy);
/**
* Get the naming policy currently used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public ISystemFilterNamingPolicy getNamingPolicy();
public IRSEFilterNamingPolicy getNamingPolicy();
/**
* Does this filter support nested filters?
*/

4
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterString.java
View file

@ -17,8 +17,8 @@
package org.eclipse.rse.filters;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
import org.eclipse.rse.model.IRSEModelObject;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
/**
@ -33,7 +33,7 @@ import org.eclipse.rse.references.ISystemBaseReferencedObject;
* @see org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard and
* @see org.eclipse.rse.ui.filters.actions.SystemNewFilterAction
*/
public interface ISystemFilterString extends ISystemBaseReferencedObject, IAdaptable, IRSEModelObject
public interface ISystemFilterString extends IRSEBaseReferencedObject, IAdaptable, IRSEModelObject
{
/**
* Return the caller which instantiated the filter pool manager overseeing this filter framework instance

4
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterStringReference.java
View file

@ -15,7 +15,7 @@
********************************************************************************/
package org.eclipse.rse.filters;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
/**
* Represents a reference to a master filter string.
@ -23,7 +23,7 @@ import org.eclipse.rse.references.ISystemBaseReferencingObject;
* This is not modelled in MOF.
*/
public interface ISystemFilterStringReference
extends ISystemBaseReferencingObject
extends IRSEBaseReferencingObject
{
/**
* Return the reference manager which is managing this filter reference

6
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java
View file

@ -20,13 +20,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.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.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemReferencingObject;
@ -390,14 +390,14 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
/**
* Set the object to which we reference. Override of inherited
*/
public void setReferencedObject(ISystemBaseReferencedObject obj)
public void setReferencedObject(IRSEBaseReferencedObject obj)
{
setReferencedFilter((ISystemFilter)obj);
}
/**
* Get the object which we reference. Override of inherited
*/
public ISystemBaseReferencedObject getReferencedObject()
public IRSEBaseReferencedObject getReferencedObject()
{
return getReferencedFilter();
}

5
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterStartHere.java
View file

@ -15,6 +15,7 @@
********************************************************************************/
package org.eclipse.rse.filters;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.internal.filters.SystemFilterNamingPolicy;
import org.eclipse.rse.internal.filters.SystemFilterPoolManager;
import org.eclipse.rse.internal.filters.SystemFilterPoolReferenceManager;
@ -48,7 +49,7 @@ public class SystemFilterStartHere
* Factory method to return an instance populated with defaults.
* You can then simply override whatever is desired via setXXX methods.
*/
public static ISystemFilterNamingPolicy createSystemFilterNamingPolicy()
public static IRSEFilterNamingPolicy createSystemFilterNamingPolicy()
{
return SystemFilterNamingPolicy.getNamingPolicy();
}
@ -99,7 +100,7 @@ public class SystemFilterStartHere
public static ISystemFilterPoolReferenceManager createSystemFilterPoolReferenceManager(
ISystemFilterPoolReferenceManagerProvider caller,
ISystemFilterPoolManagerProvider relatedPoolMgrProvider,
String name, ISystemFilterNamingPolicy namingPolicy)
String name, IRSEFilterNamingPolicy namingPolicy)
{
return SystemFilterPoolReferenceManager.createSystemFilterPoolReferenceManager(
caller, relatedPoolMgrProvider, null, name, SAVE_POLICY_NONE, namingPolicy);

12
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java
View file

@ -23,17 +23,17 @@ import java.util.Vector;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.core.references.IRSEReferencedObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterContainer;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.filters.SystemFilterSimple;
import org.eclipse.rse.internal.references.SystemReferencedObject;
import org.eclipse.rse.references.ISystemReferencedObject;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
@ -46,7 +46,7 @@ import org.eclipse.rse.ui.SystemResources;
/**
* @lastgen class SystemFilterImpl extends SystemReferencedObjectImpl implements SystemFilter, SystemReferencedObject, SystemFilterContainer, IAdaptable {}
*/
public class SystemFilter extends SystemReferencedObject implements ISystemFilter, ISystemReferencedObject, ISystemFilterContainer, IAdaptable
public class SystemFilter extends SystemReferencedObject implements ISystemFilter, IRSEReferencedObject, ISystemFilterContainer, IAdaptable
{
/**
@ -946,7 +946,7 @@ public class SystemFilter extends SystemReferencedObject implements ISystemFilte
* @return SystemFilter object if restored ok, null if error encountered. If null, call getLastException().
*/
public static ISystemFilter restore(IFolder folder, String name, ISystemFilterPool parentPool,
ISystemFilterNamingPolicy namingPolicy)
IRSEFilterNamingPolicy namingPolicy)
throws Exception
{
/* FIXME
@ -976,7 +976,7 @@ public class SystemFilter extends SystemReferencedObject implements ISystemFilte
/**
* Return the root save file name without the extension .xmi
*/
protected static String getRootSaveFileName(ISystemFilterNamingPolicy namingPolicy, String name)
protected static String getRootSaveFileName(IRSEFilterNamingPolicy namingPolicy, String name)
{
return namingPolicy.getFilterSaveFileName(name);
}
@ -985,7 +985,7 @@ public class SystemFilter extends SystemReferencedObject implements ISystemFilte
/**
* Return naming policy
*/
protected static ISystemFilterNamingPolicy getNamingPolicy(ISystemFilter filter)
protected static IRSEFilterNamingPolicy getNamingPolicy(ISystemFilter filter)
{
return filter.getParentFilterPool().getNamingPolicy();
}

6
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterNamingPolicy.java
View file

@ -15,15 +15,15 @@
********************************************************************************/
package org.eclipse.rse.internal.filters;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
/**
* A naming policy so tool writers can override defaults used when
* saving filter data to disk.
* <p>
* Subclass this and override what you wish to change.
*/
public class SystemFilterNamingPolicy implements ISystemFilterNamingPolicy, ISystemFilterConstants
public class SystemFilterNamingPolicy implements IRSEFilterNamingPolicy, ISystemFilterConstants
{
protected String managerFileNamePrefix, poolFolderNamePrefix, poolFolderNameSuffix,
@ -55,7 +55,7 @@ public class SystemFilterNamingPolicy implements ISystemFilterNamingPolicy, ISys
* Factory method to return an instance populated with defaults.
* Can then simply override whatever is desired.
*/
public static ISystemFilterNamingPolicy getNamingPolicy()
public static IRSEFilterNamingPolicy getNamingPolicy()
{
return new SystemFilterNamingPolicy();
}

22
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java
View file

@ -23,10 +23,10 @@ import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.rse.core.SystemResourceHelpers;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterContainer;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
@ -75,7 +75,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
protected static final String TYPE_EDEFAULT = null;
private int savePolicy;
private ISystemFilterNamingPolicy namingPolicy = null;
private IRSEFilterNamingPolicy namingPolicy = null;
private ISystemFilterPoolManager mgr;
//private Vector filters = new Vector();
private SystemFilterContainerCommonMethods helpers = null;
@ -361,7 +361,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
* Private helper method to core initialization, from either createXXX or restore.
*/
protected void initialize(String name,
int savePolicy, ISystemFilterNamingPolicy namingPolicy)
int savePolicy, IRSEFilterNamingPolicy namingPolicy)
{
setName(name); // mof attribute
setSavePolicy(savePolicy);
@ -411,9 +411,9 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
/**
* Set the naming policy used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public void setNamingPolicy(ISystemFilterNamingPolicy namingPolicy)
public void setNamingPolicy(IRSEFilterNamingPolicy namingPolicy)
{
if (this.namingPolicy != namingPolicy)
{
@ -424,9 +424,9 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
/**
* Get the naming policy currently used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public ISystemFilterNamingPolicy getNamingPolicy()
public IRSEFilterNamingPolicy getNamingPolicy()
{
return namingPolicy;
}
@ -879,7 +879,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
* Will populate and return a list.
* Only makes sense to use if the save policy is one file per filter.
*/
protected static Vector deduceFilterNames(IFolder folder, ISystemFilterNamingPolicy namingPolicy)
protected static Vector deduceFilterNames(IFolder folder, IRSEFilterNamingPolicy namingPolicy)
{
Vector filterNames = SystemResourceHelpers.getResourceHelpers().convertToVectorAndStrip(
SystemResourceHelpers.getResourceHelpers().listFiles(folder,
@ -938,7 +938,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
* @see org.eclipse.rse.filters.ISystemFilterConstants
*/
protected static ISystemFilterPool restore(String name, int savePolicy,
ISystemFilterNamingPolicy namingPolicy)
IRSEFilterNamingPolicy namingPolicy)
throws Exception
{
if (namingPolicy == null)
@ -1109,7 +1109,7 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
/**
* Return the root save file name without the extension .xmi
*/
protected static String getRootSaveFileName(ISystemFilterNamingPolicy namingPolicy, String poolName)
protected static String getRootSaveFileName(IRSEFilterNamingPolicy namingPolicy, String poolName)
{
return namingPolicy.getFilterPoolSaveFileName(poolName);
}
@ -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.references.ISystemBasePersistableReferencedObject ISystemPersistableReferencedObject}
* As required by the {@link org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject ISystemPersistableReferencedObject}
* interface.
*/
public String getReferenceName()

16
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolManager.java
View file

@ -21,10 +21,11 @@ import java.util.Vector;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterContainer;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
@ -34,7 +35,6 @@ import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.logging.Logger;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.persistence.IRSEPersistenceManager;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.ui.RSEUIPlugin;
//
@ -257,7 +257,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
ISystemFilterPoolManagerProvider caller,
String name,
boolean allowNestedFilters,
int savePolicy, ISystemFilterNamingPolicy namingPolicy)
int savePolicy, IRSEFilterNamingPolicy namingPolicy)
{
SystemFilterPoolManager mgr = null;
@ -648,7 +648,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
// remove all references
ISystemBaseReferencingObject[] refs = pool.getReferencingObjects();
IRSEBaseReferencingObject[] refs = pool.getReferencingObjects();
//boolean needsSave = false;
if (refs != null)
{
@ -899,12 +899,12 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
invalidatePoolCache();
// inform all referencees
ISystemBaseReferencingObject[] refs = pool.getReferencingObjects();
IRSEBaseReferencingObject[] refs = pool.getReferencingObjects();
if (refs != null)
{
for (int idx=0; idx < refs.length; idx++)
{
ISystemBaseReferencingObject ref = refs[idx];
IRSEBaseReferencingObject ref = refs[idx];
if (ref instanceof ISystemFilterPoolReference)
{
ISystemFilterPoolReference fpRef = (ISystemFilterPoolReference)ref;
@ -967,7 +967,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
{
ISystemFilterPool newPool = copySystemFilterPool(targetMgr, oldPool, newName);
// find all references to original, and reset them to reference the new...
ISystemBaseReferencingObject[] refs = oldPool.getReferencingObjects();
IRSEBaseReferencingObject[] refs = oldPool.getReferencingObjects();
if (refs != null)
{
for (int idx=0; idx < refs.length; idx++)
@ -1709,7 +1709,7 @@ public class SystemFilterPoolManager implements ISystemFilterPoolManager
* @param name The name of the manager, from which the file name is derived.
* @param namingPolicy Naming prefix information for persisted data file names.
*/
protected static ISystemFilterPoolManager restoreFromOneFile(Logger logger, IFolder mgrFolder, String name, ISystemFilterNamingPolicy namingPolicy)
protected static ISystemFilterPoolManager restoreFromOneFile(Logger logger, IFolder mgrFolder, String name, IRSEFilterNamingPolicy namingPolicy)
throws Exception
{
/* FIXME

24
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
View file

@ -20,10 +20,10 @@ import java.util.Vector;
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.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
@ -51,7 +51,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
private ISystemFilterPoolManagerProvider poolMgrProvider = null;
private ISystemFilterPoolManager defaultPoolMgr = null;
private ISystemFilterPoolReferenceManagerProvider caller = null;
private ISystemFilterNamingPolicy namingPolicy = null;
private IRSEFilterNamingPolicy namingPolicy = null;
private int savePolicy = ISystemFilterSavePolicies.SAVE_POLICY_NONE;
private Object mgrData = null;
private IFolder mgrFolder = null;
@ -98,7 +98,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
IFolder mgrFolder,
String name,
int savePolicy,
ISystemFilterNamingPolicy namingPolicy)
IRSEFilterNamingPolicy namingPolicy)
{
SystemFilterPoolReferenceManager mgr = null;
@ -147,7 +147,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
IFolder folder,
String name,
int savePolicy,
ISystemFilterNamingPolicy namingPolicy,
IRSEFilterNamingPolicy namingPolicy,
ISystemFilterPoolManagerProvider relatedPoolManagerProvider)
{
if (!initialized)
@ -164,7 +164,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
IFolder folder,
String name,
int savePolicy,
ISystemFilterNamingPolicy namingPolicy)
IRSEFilterNamingPolicy namingPolicy)
{
this.mgrFolder = folder;
setProvider(caller);
@ -308,18 +308,18 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
}
/**
* Set the naming policy used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public void setNamingPolicy(ISystemFilterNamingPolicy namingPolicy)
public void setNamingPolicy(IRSEFilterNamingPolicy namingPolicy)
{
this.namingPolicy = namingPolicy;
}
/**
* Get the naming policy currently used when saving data to disk.
* @see org.eclipse.rse.filters.ISystemFilterNamingPolicy
* @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
*/
public ISystemFilterNamingPolicy getNamingPolicy()
public IRSEFilterNamingPolicy getNamingPolicy()
{
return namingPolicy;
}
@ -860,7 +860,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
*/
public static ISystemFilterPoolReferenceManager restore(ISystemFilterPoolReferenceManagerProvider caller,
IFolder mgrFolder, String name,
ISystemFilterNamingPolicy namingPolicy)
IRSEFilterNamingPolicy namingPolicy)
throws Exception
{
if (namingPolicy == null)
@ -888,7 +888,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
* @param name The name of the manager, from which the file name is derived.
* @param namingPolicy Naming prefix information for persisted data file names.
*/
protected static ISystemFilterPoolReferenceManager restoreFromOneFile(IFolder mgrFolder, String name, ISystemFilterNamingPolicy namingPolicy)
protected static ISystemFilterPoolReferenceManager restoreFromOneFile(IFolder mgrFolder, String name, IRSEFilterNamingPolicy namingPolicy)
throws Exception
{
ISystemFilterPoolReferenceManager mgr = null;
@ -1044,7 +1044,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
* If saving all info in one file, this returns the fully qualified name of that file,
* given the unadorned manager name and the prefix (if any) to adorn with.
*/
protected static String getSaveFilePathAndName(IFolder mgrFolder, String name, ISystemFilterNamingPolicy namingPolicy)
protected static String getSaveFilePathAndName(IFolder mgrFolder, String name, IRSEFilterNamingPolicy namingPolicy)
{
return SystemFilter.addPathTerminator(getFolderPath(mgrFolder))
+ getSaveFileName(namingPolicy.getReferenceManagerSaveFileName(name));

10
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterString.java
View file

@ -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.IRSEBaseReferencingObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterConstants;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -25,7 +26,6 @@ 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.references.ISystemBaseReferencingObject;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
@ -172,13 +172,13 @@ public class SystemFilterString extends RSEModelObject implements ISystemFilterS
}
// ----------------------------------
// ISystemReferencedObject methods...
// IRSEReferencedObject methods...
// ----------------------------------
/**
* Add a reference, increment reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int addReference(ISystemBaseReferencingObject ref)
public int addReference(IRSEBaseReferencingObject ref)
{
return helper.addReference(ref);
}
@ -186,7 +186,7 @@ public class SystemFilterString extends RSEModelObject implements ISystemFilterS
* Remove a reference, decrement reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int removeReference(ISystemBaseReferencingObject ref)
public int removeReference(IRSEBaseReferencingObject ref)
{
return helper.removeReference(ref);
}
@ -207,7 +207,7 @@ public class SystemFilterString extends RSEModelObject implements ISystemFilterS
/**
* Return a list of all referencing objects of this object
*/
public ISystemBaseReferencingObject[] getReferencingObjects()
public IRSEBaseReferencingObject[] getReferencingObjects()
{
return helper.getReferencingObjects();
}

12
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStringReference.java
View file

@ -17,6 +17,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.IRSEBaseReferencedObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
@ -24,7 +25,6 @@ import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.filters.ISystemFilterStringReference;
import org.eclipse.rse.internal.references.SystemReferencingObjectHelper;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
/**
* A reference to a system filter string.
@ -145,23 +145,23 @@ public class SystemFilterStringReference
// ----------------------------------------------
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#setReferencedObject(ISystemBaseReferencedObject)
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#setReferencedObject(IRSEBaseReferencedObject)
*/
public void setReferencedObject(ISystemBaseReferencedObject obj)
public void setReferencedObject(IRSEBaseReferencedObject obj)
{
helper.setReferencedObject(obj);
}
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#getReferencedObject()
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#getReferencedObject()
*/
public ISystemBaseReferencedObject getReferencedObject()
public IRSEBaseReferencedObject getReferencedObject()
{
return helper.getReferencedObject();
}
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#removeReference()
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#removeReference()
*/
public int removeReference()
{

6
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
View file

@ -34,6 +34,7 @@ import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPerspectiveHelpers;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
import org.eclipse.rse.core.subsystems.IConnectorService;
@ -65,7 +66,6 @@ import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.model.SystemChildrenContentsType;
import org.eclipse.rse.model.SystemRemoteChangeEvent;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.ISystemMessages;
@ -2782,10 +2782,10 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
Object src = event.getSource();
if (src instanceof ISystemFilter)
{
ISystemBaseReferencingObject[] references = ((ISystemFilter)src).getReferencingObjects();
IRSEBaseReferencingObject[] references = ((ISystemFilter)src).getReferencingObjects();
for (int i = 0; i < references.length; i++)
{
ISystemBaseReferencingObject ref = references[i];
IRSEBaseReferencingObject ref = references[i];
if (ref instanceof ISystemContainer)
{
((ISystemContainer)ref).markStale(true);

6
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferenceManager.java
View file

@ -22,8 +22,8 @@ import java.util.Iterator;
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.ISystemBasePersistableReferencedObject;
import org.eclipse.rse.references.ISystemBasePersistableReferencingObject;
@ -245,7 +245,7 @@ public class SystemPersistableReferenceManager implements ISystemBasePersistable
* @param object The referencable object to which to search for a referencing object within this list
* @return true if found in list, false otherwise.
*/
public boolean isReferenced(ISystemBasePersistableReferencedObject object)
public boolean isReferenced(IRSEBasePersistableReferencedObject object)
{
return (getReferencedObject(object) != null);
}
@ -257,7 +257,7 @@ 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(ISystemBasePersistableReferencedObject object)
public ISystemBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object)
{
List list = internalGetList();
ISystemBasePersistableReferencingObject match = null;

4
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencedObjectHelper.java
View file

@ -15,7 +15,7 @@
********************************************************************************/
package org.eclipse.rse.internal.references;
import org.eclipse.rse.references.ISystemBasePersistableReferencedObject;
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
/**
* This class extends the support for a class that supports being managing by a transient
@ -26,7 +26,7 @@ import org.eclipse.rse.references.ISystemBasePersistableReferencedObject;
*/
public class SystemPersistableReferencedObjectHelper
extends SystemReferencedObjectHelper
implements ISystemBasePersistableReferencedObject
implements IRSEBasePersistableReferencedObject
{
private String referenceName;

10
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObject.java
View file

@ -16,9 +16,9 @@
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.ISystemBasePersistableReferencedObject;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemPersistableReferencingObject;
/**
@ -51,10 +51,10 @@ 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(ISystemBasePersistableReferencedObject)
* @see org.eclipse.rse.references.ISystemBasePersistableReferencingObject#setReferencedObject(IRSEBasePersistableReferencedObject)
*/
public void setReferencedObject(ISystemBasePersistableReferencedObject obj) {
getHelper().setReferencedObject((ISystemBaseReferencedObject) obj);
public void setReferencedObject(IRSEBasePersistableReferencedObject obj) {
getHelper().setReferencedObject((IRSEBaseReferencedObject) obj);
setReferencedObjectName(obj.getReferenceName());
}

14
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java
View file

@ -15,9 +15,9 @@
********************************************************************************/
package org.eclipse.rse.internal.references;
import org.eclipse.rse.references.ISystemBasePersistableReferencedObject;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
/**
* This class extends the support for managing a transient in-memory reference
@ -32,7 +32,7 @@ public class SystemPersistableReferencingObjectHelper
/**
* Default constructor.
*/
protected SystemPersistableReferencingObjectHelper(ISystemBaseReferencingObject caller)
protected SystemPersistableReferencingObjectHelper(IRSEBaseReferencingObject caller)
{
super(caller);
}
@ -40,7 +40,7 @@ public class SystemPersistableReferencingObjectHelper
/**
* Constructor that saves effort of calling setReferencedObject.
*/
public SystemPersistableReferencingObjectHelper(ISystemBaseReferencingObject caller, ISystemBasePersistableReferencedObject obj)
public SystemPersistableReferencingObjectHelper(IRSEBaseReferencingObject caller, IRSEBasePersistableReferencedObject obj)
{
this(caller);
setReferencedObject(obj);
@ -51,9 +51,9 @@ public class SystemPersistableReferencingObjectHelper
* ISystemPersistableReferencedObject so we can query its name for
* storage purposes.
*/
public void setReferencedObject(ISystemBasePersistableReferencedObject obj)
public void setReferencedObject(IRSEBasePersistableReferencedObject obj)
{
super.setReferencedObject((ISystemBaseReferencedObject)obj);
super.setReferencedObject((IRSEBaseReferencedObject)obj);
this.masterObjectName = obj.getReferenceName();
}

14
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObject.java
View file

@ -15,9 +15,9 @@
********************************************************************************/
package org.eclipse.rse.internal.references;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.references.IRSEReferencedObject;
import org.eclipse.rse.internal.model.RSEModelObject;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.references.ISystemReferencedObject;
/**
@ -33,7 +33,7 @@ import org.eclipse.rse.references.ISystemReferencedObject;
/**
* @lastgen class SystemReferencedObjectImpl Impl implements SystemReferencedObject, EObject {}
*/
public abstract class SystemReferencedObject extends RSEModelObject implements ISystemReferencedObject
public abstract class SystemReferencedObject extends RSEModelObject implements IRSEReferencedObject
{
protected SystemReferencedObjectHelper helper = null;
@ -46,13 +46,13 @@ public abstract class SystemReferencedObject extends RSEModelObject implements I
helper = new SystemReferencedObjectHelper();
}
// ----------------------------------
// ISystemReferencedObject methods...
// IRSEReferencedObject methods...
// ----------------------------------
/**
* Add a reference, increment reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int addReference(ISystemBaseReferencingObject ref)
public int addReference(IRSEBaseReferencingObject ref)
{
return helper.addReference(ref);
}
@ -60,7 +60,7 @@ public abstract class SystemReferencedObject extends RSEModelObject implements I
* Remove a reference, decrement reference count, return new count
* @return new count of how many referencing objects reference this object.
*/
public int removeReference(ISystemBaseReferencingObject ref)
public int removeReference(IRSEBaseReferencingObject ref)
{
return helper.removeReference(ref);
}
@ -81,7 +81,7 @@ public abstract class SystemReferencedObject extends RSEModelObject implements I
/**
* Return a list of all referencing objects of this object
*/
public ISystemBaseReferencingObject[] getReferencingObjects()
public IRSEBaseReferencingObject[] getReferencingObjects()
{
return helper.getReferencingObjects();
}

26
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencedObjectHelper.java
View file

@ -17,17 +17,17 @@
package org.eclipse.rse.internal.references;
import java.util.Vector;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
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 ISystemReferencedObject.
* This is a class that implements all the methods in the IRSEReferencedObject.
* 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.
*/
public class SystemReferencedObjectHelper implements ISystemBaseReferencedObject
public class SystemReferencedObjectHelper implements IRSEBaseReferencedObject
{
private Vector referencingObjects = new Vector();
/**
@ -39,18 +39,18 @@ public class SystemReferencedObjectHelper implements ISystemBaseReferencedObject
}
/**
* @see ISystemBaseReferencedObject#addReference(ISystemBaseReferencingObject)
* @see IRSEBaseReferencedObject#addReference(IRSEBaseReferencingObject)
*/
public int addReference(ISystemBaseReferencingObject ref)
public int addReference(IRSEBaseReferencingObject ref)
{
referencingObjects.addElement(ref);
return referencingObjects.size();
}
/**
* @see ISystemBaseReferencedObject#removeReference(ISystemBaseReferencingObject)
* @see IRSEBaseReferencedObject#removeReference(IRSEBaseReferencingObject)
*/
public int removeReference(ISystemBaseReferencingObject ref)
public int removeReference(IRSEBaseReferencingObject ref)
{
int before = referencingObjects.size();
referencingObjects.removeElement(ref);
@ -60,7 +60,7 @@ public class SystemReferencedObjectHelper implements ISystemBaseReferencedObject
}
/**
* @see ISystemBaseReferencedObject#getReferenceCount()
* @see IRSEBaseReferencedObject#getReferenceCount()
*/
public int getReferenceCount()
{
@ -76,13 +76,13 @@ public class SystemReferencedObjectHelper implements ISystemBaseReferencedObject
}
/**
* @see ISystemBaseReferencedObject#getReferencingObjects()
* @see IRSEBaseReferencedObject#getReferencingObjects()
*/
public ISystemBaseReferencingObject[] getReferencingObjects()
public IRSEBaseReferencingObject[] getReferencingObjects()
{
ISystemBaseReferencingObject[] references = new ISystemBaseReferencingObject[referencingObjects.size()];
IRSEBaseReferencingObject[] references = new IRSEBaseReferencingObject[referencingObjects.size()];
for (int idx=0; idx<referencingObjects.size(); idx++)
references[idx] = (ISystemBaseReferencingObject)referencingObjects.elementAt(idx);
references[idx] = (IRSEBaseReferencingObject)referencingObjects.elementAt(idx);
return references;
}

12
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObject.java
View file

@ -15,8 +15,8 @@
********************************************************************************/
package org.eclipse.rse.internal.references;
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
import org.eclipse.rse.internal.model.RSEModelObject;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemReferencingObject;
import org.eclipse.rse.ui.SystemResources;
@ -49,23 +49,23 @@ public abstract class SystemReferencingObject extends RSEModelObject implements
helper = new SystemReferencingObjectHelper(this);
}
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#setReferencedObject(ISystemBaseReferencedObject)
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#setReferencedObject(IRSEBaseReferencedObject)
*/
public void setReferencedObject(ISystemBaseReferencedObject obj)
public void setReferencedObject(IRSEBaseReferencedObject obj)
{
helper.setReferencedObject(obj);
}
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#getReferencedObject()
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#getReferencedObject()
*/
public ISystemBaseReferencedObject getReferencedObject()
public IRSEBaseReferencedObject getReferencedObject()
{
return helper.getReferencedObject();
}
/**
* @see org.eclipse.rse.references.ISystemBaseReferencingObject#removeReference()
* @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#removeReference()
*/
public int removeReference()
{

18
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemReferencingObjectHelper.java
View file

@ -15,8 +15,8 @@
********************************************************************************/
package org.eclipse.rse.internal.references;
import org.eclipse.rse.references.ISystemBaseReferencedObject;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
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.
@ -26,13 +26,13 @@ import org.eclipse.rse.references.ISystemBaseReferencingObject;
*/
public class SystemReferencingObjectHelper
{
private ISystemBaseReferencedObject masterObject = null;
private ISystemBaseReferencingObject caller = null;
private IRSEBaseReferencedObject masterObject = null;
private IRSEBaseReferencingObject caller = null;
/**
* Default constructor.
*/
public SystemReferencingObjectHelper(ISystemBaseReferencingObject caller)
public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller)
{
super();
this.caller = caller;
@ -41,7 +41,7 @@ public class SystemReferencingObjectHelper
/**
* Constructor that saves effort of calling setReferencedObject.
*/
public SystemReferencingObjectHelper(ISystemBaseReferencingObject caller, ISystemBaseReferencedObject obj)
public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller, IRSEBaseReferencedObject obj)
{
this(caller);
setReferencedObject(obj);
@ -52,7 +52,7 @@ public class SystemReferencingObjectHelper
* Stores the reference in memory, replacing whatever was there.
* Also, calls obj.addReference(caller);
*/
public void setReferencedObject(ISystemBaseReferencedObject obj)
public void setReferencedObject(IRSEBaseReferencedObject obj)
{
this.masterObject = obj;
if (obj != null)
@ -62,7 +62,7 @@ public class SystemReferencingObjectHelper
/**
* Get the object which we reference
*/
public ISystemBaseReferencedObject getReferencedObject()
public IRSEBaseReferencedObject getReferencedObject()
{
return masterObject;
}
@ -75,7 +75,7 @@ public class SystemReferencingObjectHelper
public int removeReference()
{
int newCount = 0;
ISystemBaseReferencedObject masterObject = getReferencedObject();
IRSEBaseReferencedObject masterObject = getReferencedObject();
if (masterObject != null)
newCount = masterObject.removeReference(caller);
masterObject = null;

5
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferenceManager.java
View file

@ -16,6 +16,7 @@
package org.eclipse.rse.references;
import org.eclipse.core.resources.IFolder;
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
/**
@ -119,7 +120,7 @@ public interface ISystemBasePersistableReferenceManager
* @param object The referencable object to which to search for a referencing object within this list
* @return true if found in list, false otherwise.
*/
public boolean isReferenced(ISystemBasePersistableReferencedObject object);
public boolean isReferenced(IRSEBasePersistableReferencedObject object);
/**
* Search list of referencing objects to see if one of them references the given referencable object.
* This is done by comparing the reference names of each, not the in-memory pointers.
@ -127,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(ISystemBasePersistableReferencedObject object);
public ISystemBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object);
/**
* Attempt to save contents of manager to disk. Only call if not doing your own save from

8
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemBasePersistableReferencingObject.java
View file

@ -15,6 +15,10 @@
********************************************************************************/
package org.eclipse.rse.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
* to enable a GUI which does not allow the same real object to appear multiple times.
@ -36,14 +40,14 @@ package org.eclipse.rse.references;
* This interface captures the methods to set and query that name or key.
*/
public interface ISystemBasePersistableReferencingObject
extends ISystemBaseReferencingObject
extends IRSEBaseReferencingObject
{
/**
* Set the object to which we reference. This is an overload of the parent
* interface method of the same name. This one takes an object of which we
* can query its unique name for the purpose of saving that to disk.
*/
public void setReferencedObject(ISystemBasePersistableReferencedObject obj);
public void setReferencedObject(IRSEBasePersistableReferencedObject obj);
/**
* Query the unique name or key of the object we are referencing.
*/

5
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemPersistableReferencedObject.java
View file

@ -16,6 +16,9 @@
package org.eclipse.rse.references;
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
import org.eclipse.rse.core.references.IRSEReferencedObject;
/**
* A simple class that implements ISystemPersistableReferencedObject.
* This is an object that can have shadow (reference) objects, which simply
@ -30,7 +33,7 @@ package org.eclipse.rse.references;
* @lastgen interface SystemPersistableReferencedObject extends SystemReferencedObject {}
*/
public interface ISystemPersistableReferencedObject extends ISystemReferencedObject, ISystemBasePersistableReferencedObject
public interface ISystemPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject
{
}

5
rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/references/ISystemReferencingObject.java
View file

@ -15,6 +15,9 @@
********************************************************************************/
package org.eclipse.rse.references;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
/**
* A class to encapsulate the operations required of an object which
* is merely a reference to another object, something we call a shadow.
@ -30,6 +33,6 @@ package org.eclipse.rse.references;
* @lastgen interface SystemReferencingObject {}
*/
public interface ISystemReferencingObject extends ISystemBaseReferencingObject{
public interface ISystemReferencingObject extends IRSEBaseReferencingObject{
}

4
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemFilterNamingPolicy.java
View file

@ -16,7 +16,7 @@
package org.eclipse.rse.core.internal.subsystems;
import org.eclipse.rse.filters.ISystemFilterNamingPolicy;
import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy;
import org.eclipse.rse.internal.filters.SystemFilterNamingPolicy;
/**
@ -27,7 +27,7 @@ import org.eclipse.rse.internal.filters.SystemFilterNamingPolicy;
*/
public class SubSystemFilterNamingPolicy
extends SystemFilterNamingPolicy
implements ISystemFilterNamingPolicy
implements IRSEFilterNamingPolicy
{
/**

4
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
View file

@ -35,6 +35,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants;
import org.eclipse.rse.core.internal.subsystems.SubSystemFilterNamingPolicy;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainer;
import org.eclipse.rse.filters.ISystemFilterContainerReference;
@ -56,7 +57,6 @@ import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.model.SystemStartHere;
import org.eclipse.rse.references.ISystemBaseReferencingObject;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -2544,7 +2544,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
{
for (int idx = 0; idx < pools.length; idx++)
{
ISystemBaseReferencingObject[] refs = pools[idx].getReferencingObjects();
IRSEBaseReferencingObject[] refs = pools[idx].getReferencingObjects();
if ((refs != null) && (refs.length > 0))
{
for (int jdx = 0; jdx < refs.length; jdx++)