From eaa855d23dc6c0ea1c5b23162e7c1ff7af88bf94 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Fri, 30 Mar 2007 18:59:32 +0000 Subject: [PATCH] [180274] Moving types from org.eclipse.rse.filters to org.eclipse.rse.core.filters --- .../org.eclipse.rse.core/META-INF/MANIFEST.MF | 3 +-- .../persistence/RSEPersistenceManager.java | 16 ++++++++++++++-- .../filters/SystemFilterReference.java | 15 +++------------ .../{ => core}/filters/SystemFilterSimple.java | 9 ++------- .../{ => core}/filters/SystemFilter.java | 4 ++-- .../SystemFilterContainerCommonMethods.java | 2 +- ...temFilterContainerReferenceCommonMethods.java | 4 ++-- .../{ => core}/filters/SystemFilterPool.java | 2 +- .../filters/SystemFilterPoolReference.java | 2 +- .../SystemFilterPoolReferenceManager.java | 2 +- .../filters/SystemFilterPoolWrapper.java | 2 +- .../SystemFilterPoolWrapperInformation.java | 2 +- .../filters/SystemFilterStartHere.java | 2 +- .../{ => core}/filters/SystemFilterString.java | 2 +- .../filters/SystemFilterStringReference.java | 2 +- 15 files changed, 33 insertions(+), 36 deletions(-) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/{ => core}/filters/SystemFilterReference.java (95%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/{ => core}/filters/SystemFilterSimple.java (97%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilter.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterContainerCommonMethods.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterContainerReferenceCommonMethods.java (98%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterPool.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterPoolReference.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterPoolReferenceManager.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterPoolWrapper.java (97%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterPoolWrapperInformation.java (98%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterStartHere.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterString.java (99%) rename rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/{ => core}/filters/SystemFilterStringReference.java (99%) 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 7ca756a5a1b..a84f01e6838 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -15,10 +15,9 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.core.model, org.eclipse.rse.core.references, org.eclipse.rse.core.subsystems, - org.eclipse.rse.filters, org.eclipse.rse.internal.core;x-internal:=true, + org.eclipse.rse.internal.core.filters;x-internal:=true, org.eclipse.rse.internal.core.subsystems;x-internal:=true, - org.eclipse.rse.internal.filters;x-internal:=true, org.eclipse.rse.internal.persistence;x-internal:=true, org.eclipse.rse.internal.persistence.dom;x-internal:=true, org.eclipse.rse.internal.references;x-internal:=true, diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java index ed8f5e33f69..30a68edc25e 100644 --- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java +++ b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.filters.ISystemFilter; @@ -137,11 +138,22 @@ public class RSEPersistenceManager implements IRSEPersistenceManager { } /** + * Retrieves the persistence provider for this workbench configuration. + * Several persistence providers may be registered, but only one persistence provider can be used. + * This persistence provider's identifier is specified in the org.eclipse.rse.persistenceProvider + * preference and can be specified a product's config.ini file. + * It is retrieved using the platform's preference service. + * If no such preference exists the default "org.eclipse.rse.persistence.PropertyFileProvider" + * is used. * @return the default IRSEPersistenceProvider for this installation. - * TODO: need to determine what this is. Having more than one is problematic. */ public IRSEPersistenceProvider getRSEPersistenceProvider() { - IRSEPersistenceProvider provider = getRSEPersistenceProvider("org.eclipse.rse.persistence.PropertyFileProvider"); //$NON-NLS-1$ + IPreferencesService service = Platform.getPreferencesService(); + String qualifier = "org.eclipse.rse"; //$NON-NLS-1$ + String preferenceName = "persistenceProvider"; //$NON-NLS-1$ + String defaultProviderName = "org.eclipse.rse.persistence.PropertyFileProvider"; //$NON-NLS-1$ + String providerName = service.getString(qualifier, preferenceName, defaultProviderName, null); + IRSEPersistenceProvider provider = getRSEPersistenceProvider(providerName); return provider; } diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java similarity index 95% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterReference.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java index 2fd082bb9a2..af3bc8c3146 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterReference.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java @@ -14,28 +14,19 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.core.filters; import java.util.HashMap; import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.filters.ISystemFilter; -import org.eclipse.rse.core.filters.ISystemFilterContainer; -import org.eclipse.rse.core.filters.ISystemFilterContainerReference; -import org.eclipse.rse.core.filters.ISystemFilterPoolReference; -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.filters.ISystemFilterString; -import org.eclipse.rse.core.filters.ISystemFilterStringReference; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContentsType; 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.core.filters.SystemFilterContainerReferenceCommonMethods; +import org.eclipse.rse.internal.core.filters.SystemFilterStringReference; import org.eclipse.rse.internal.references.SystemReferencingObject; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterSimple.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterSimple.java similarity index 97% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterSimple.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterSimple.java index 0c4b1203465..4c8f7079dba 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterSimple.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterSimple.java @@ -14,19 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.filters; +package org.eclipse.rse.core.filters; import java.util.HashMap; import java.util.Vector; import org.eclipse.core.resources.IFile; -import org.eclipse.rse.core.filters.ISystemFilter; -import org.eclipse.rse.core.filters.ISystemFilterConstants; -import org.eclipse.rse.core.filters.ISystemFilterPoolManager; -import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; -import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContentsType; -import org.eclipse.rse.internal.filters.SystemFilter; +import org.eclipse.rse.internal.core.filters.SystemFilter; /** diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilter.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java index 3c6870f5a44..a7bf3834ee6 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilter.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.io.File; import java.util.ArrayList; import java.util.Iterator; @@ -32,9 +32,9 @@ import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterString; +import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.references.IRSEReferencedObject; -import org.eclipse.rse.filters.SystemFilterSimple; import org.eclipse.rse.internal.references.SystemReferencedObject; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerCommonMethods.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerCommonMethods.java index 4a1c5943fcf..8b6172445d0 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerCommonMethods.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.Iterator; import java.util.Vector; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerReferenceCommonMethods.java similarity index 98% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerReferenceCommonMethods.java index 1df9c4a6a66..9bf3357af99 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerReferenceCommonMethods.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.Iterator; import java.util.List; @@ -23,8 +23,8 @@ import org.eclipse.rse.core.filters.ISystemFilterContainer; import org.eclipse.rse.core.filters.ISystemFilterContainerReference; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterReference; +import org.eclipse.rse.core.filters.SystemFilterReference; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.rse.filters.SystemFilterReference; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPool.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java index fee50b82b93..2b86f8dd960 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.ArrayList; import java.util.Iterator; import java.util.Vector; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java index 5a691d1eb4d..91b0fcf8feb 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReferenceManager.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReferenceManager.java index c9d8d8ccbbe..8caf416bf0c 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReferenceManager.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.Vector; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapper.java similarity index 97% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapper.java index bef829aca0a..7e2d31eb02e 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapper.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapperInformation.java similarity index 98% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapperInformation.java index 7860594e3e7..03afd77609c 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolWrapperInformation.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import java.util.Vector; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStartHere.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStartHere.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStartHere.java index 6a5cdc7246d..eab135f1a80 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStartHere.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStartHere.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import org.eclipse.rse.core.filters.IRSEFilterNamingPolicy; import org.eclipse.rse.core.filters.ISystemFilterConstants; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterString.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java index 3bc128b3ddf..bcd1f1a24ef 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterString.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStringReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStringReference.java similarity index 99% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStringReference.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStringReference.java index 2fb852a24b6..d3ef05ed541 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStringReference.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterStringReference.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.filters; +package org.eclipse.rse.internal.core.filters; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.rse.core.filters.ISystemFilter;