From 52f45406a8560ef05c73bd7cf211c660b484e164 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Thu, 29 Mar 2007 20:05:48 +0000 Subject: [PATCH] [168973] Stage 2 - remove UI dependencies --- .../rse/filters/SystemFilterReference.java | 4 ++-- .../SystemFilterContainerCommonMethods.java | 15 +++++++-------- .../rse/internal/filters/SystemFilterPool.java | 4 ++-- .../filters/SystemFilterPoolReference.java | 6 ++++-- .../internal/filters/SystemFilterStartHere.java | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) 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 611cd65dffc..2fd082bb9a2 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 @@ -246,7 +246,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA * Create a single filter refererence to a given filter. * If there already is a reference to this filter, it is returned. * If not, a new reference is created and appended to the end of the existing filter reference array. - * @see #getExistingSystemFilterReference(ISystemFilter) + * @see #getExistingSystemFilterReference(ISubSystem, ISystemFilter) */ public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) { @@ -256,7 +256,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA /** * Return an existing reference to a given system filter. * If no reference currently exists to this filter, returns null. - * @see #getSystemFilterReference(ISystemFilter) + * @see #getSystemFilterReference(ISubSystem, ISystemFilter) */ public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) { diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java index 75b45a3b44e..4a1c5943fcf 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java @@ -19,9 +19,9 @@ import java.util.Iterator; import java.util.Vector; import org.eclipse.rse.core.RSECorePlugin; -import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; +import org.eclipse.rse.logging.Logger; /** @@ -111,7 +111,7 @@ public class SystemFilterContainerCommonMethods if (exists) { String msg = "Error creating filter: aliasName " + aliasName + " is not unique"; // no need to xlate, internal only //$NON-NLS-1$ //$NON-NLS-2$ - SystemBasePlugin.logError(msg); + RSECorePlugin.getDefault().getLogger().logError(msg, null); return null; } newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings); @@ -148,10 +148,9 @@ public class SystemFilterContainerCommonMethods //} } catch (Exception e) { - SystemBasePlugin.logError("Error creating filter: " + e.getClass().getName() + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ - SystemBasePlugin.logError("...Alias name.: " + aliasName); //$NON-NLS-1$ - - //e.printStackTrace(); + Logger logger = RSECorePlugin.getDefault().getLogger(); + logger.logError("Error creating filter: " + e.getClass().getName() + ": " + e.getMessage(), null); //$NON-NLS-1$ //$NON-NLS-2$ + logger.logError("...Alias name.: " + aliasName, null); //$NON-NLS-1$ } return newFilter; } @@ -437,7 +436,7 @@ public class SystemFilterContainerCommonMethods * @param filters Vector list * @param filter SystemFilter object to update * @param newName new name to give filter - * @param newString new strings to give filter + * @param newStrings new strings to give filter */ public void updateSystemFilter(Vector filters, ISystemFilter filter, String newName, String[] newStrings) { @@ -450,7 +449,7 @@ public class SystemFilterContainerCommonMethods * @param filters java.util.List list * @param filter SystemFilter object to update * @param newName new name to give filter - * @param newString new strings to give filter + * @param newStrings new strings to give filter */ public void updateSystemFilter(java.util.List filters, ISystemFilter filter, String newName, String[] newStrings) { 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 f3f3314a362..fee50b82b93 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 @@ -953,8 +953,8 @@ public class SystemFilterPool extends SystemPersistableReferencedObject // FIXME SystemFilterImpl.initMOF(); // to be safe ISystemFilterPool pool = null; - SystemFilterPool poolImpl = null; /* FIXME + SystemFilterPool poolImpl = null; switch(savePolicy) { case SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL: @@ -996,11 +996,11 @@ public class SystemFilterPool extends SystemPersistableReferencedObject } break; } - */ if (poolImpl != null) { poolImpl.initialize(name,savePolicy,namingPolicy); } + */ return pool; } 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 bacb428f505..5a691d1eb4d 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 @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterContainer; import org.eclipse.rse.core.filters.ISystemFilterContainerReference; @@ -31,9 +32,9 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.model.ISystemProfile; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.internal.references.SystemPersistableReferencingObject; -import org.eclipse.rse.model.SystemRegistry; /** * A reference to a filter pool. A reference may be "resolved" or "unresolved". @@ -154,7 +155,8 @@ public class SystemFilterPoolReference extends SystemPersistableReferencingObjec Matcher m = p.matcher(filterPoolName); if (m.find()) { String profileName = m.group(1); - ISystemProfile profile = SystemRegistry.getSystemRegistry().getSystemProfile(profileName); + ISystemRegistry registry = RSECorePlugin.getDefault().getSystemRegistry(); + ISystemProfile profile = registry.getSystemProfile(profileName); if (profile != null) { ISystemFilterPool[] pools = profile.getFilterPools(); for (int i = 0; i < pools.length && filterPool == null; i++) { diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java index 7e952348cb6..6a5cdc7246d 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java @@ -110,7 +110,7 @@ public class SystemFilterStartHere * SystemFilterPoolReferenceManagerProvider interface, and pass "this" for this parameter. * Given any filter framework object, it is possible to retrieve the caller's * object via the getProvider method call. - * @param relatedPoolManagers The managers that own the master list of filter pools that + * @param relatedPoolMgrProvider The manager provider that own the master list of filter pools that * this manager will contain references to. * @param name the name of the filter pool reference manager. This is not currently * used, but you may find a use for it.