mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-09 18:15:23 +02:00
[180274] Moving types from org.eclipse.rse.filters to org.eclipse.rse.core.filters
This commit is contained in:
parent
fa9cfcc53c
commit
eaa855d23d
15 changed files with 33 additions and 36 deletions
|
@ -15,10 +15,9 @@ Export-Package: org.eclipse.rse.core,
|
||||||
org.eclipse.rse.core.model,
|
org.eclipse.rse.core.model,
|
||||||
org.eclipse.rse.core.references,
|
org.eclipse.rse.core.references,
|
||||||
org.eclipse.rse.core.subsystems,
|
org.eclipse.rse.core.subsystems,
|
||||||
org.eclipse.rse.filters,
|
|
||||||
org.eclipse.rse.internal.core;x-internal:=true,
|
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.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;x-internal:=true,
|
||||||
org.eclipse.rse.internal.persistence.dom;x-internal:=true,
|
org.eclipse.rse.internal.persistence.dom;x-internal:=true,
|
||||||
org.eclipse.rse.internal.references;x-internal:=true,
|
org.eclipse.rse.internal.references;x-internal:=true,
|
||||||
|
|
|
@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
||||||
import org.eclipse.core.runtime.IStatus;
|
import org.eclipse.core.runtime.IStatus;
|
||||||
import org.eclipse.core.runtime.Platform;
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.core.runtime.jobs.Job;
|
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.RSECorePlugin;
|
||||||
import org.eclipse.rse.core.SystemResourceManager;
|
import org.eclipse.rse.core.SystemResourceManager;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilter;
|
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.
|
* @return the default IRSEPersistenceProvider for this installation.
|
||||||
* TODO: need to determine what this is. Having more than one is problematic.
|
|
||||||
*/
|
*/
|
||||||
public IRSEPersistenceProvider getRSEPersistenceProvider() {
|
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;
|
return provider;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,28 +14,19 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.filters;
|
package org.eclipse.rse.core.filters;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.IAdaptable;
|
import org.eclipse.core.runtime.IAdaptable;
|
||||||
import org.eclipse.core.runtime.Platform;
|
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.ISystemContainer;
|
||||||
import org.eclipse.rse.core.model.ISystemContentsType;
|
import org.eclipse.rse.core.model.ISystemContentsType;
|
||||||
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
||||||
import org.eclipse.rse.core.references.IRSEReferencingObject;
|
import org.eclipse.rse.core.references.IRSEReferencingObject;
|
||||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||||
import org.eclipse.rse.internal.filters.SystemFilterContainerReferenceCommonMethods;
|
import org.eclipse.rse.internal.core.filters.SystemFilterContainerReferenceCommonMethods;
|
||||||
import org.eclipse.rse.internal.filters.SystemFilterStringReference;
|
import org.eclipse.rse.internal.core.filters.SystemFilterStringReference;
|
||||||
import org.eclipse.rse.internal.references.SystemReferencingObject;
|
import org.eclipse.rse.internal.references.SystemReferencingObject;
|
||||||
|
|
||||||
|
|
|
@ -14,19 +14,14 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.filters;
|
package org.eclipse.rse.core.filters;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.eclipse.core.resources.IFile;
|
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.ISystemContainer;
|
||||||
import org.eclipse.rse.core.model.ISystemContentsType;
|
import org.eclipse.rse.core.model.ISystemContentsType;
|
||||||
import org.eclipse.rse.internal.filters.SystemFilter;
|
import org.eclipse.rse.internal.core.filters.SystemFilter;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.filters;
|
package org.eclipse.rse.internal.core.filters;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
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.ISystemFilterPoolManager;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
|
import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterString;
|
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.model.RSEModelResources;
|
||||||
import org.eclipse.rse.core.references.IRSEReferencedObject;
|
import org.eclipse.rse.core.references.IRSEReferencedObject;
|
||||||
import org.eclipse.rse.filters.SystemFilterSimple;
|
|
||||||
import org.eclipse.rse.internal.references.SystemReferencedObject;
|
import org.eclipse.rse.internal.references.SystemReferencedObject;
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.Iterator;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.Iterator;
|
||||||
import java.util.List;
|
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.ISystemFilterContainerReference;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterPool;
|
import org.eclipse.rse.core.filters.ISystemFilterPool;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterReference;
|
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.core.subsystems.ISubSystem;
|
||||||
import org.eclipse.rse.filters.SystemFilterReference;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.filters;
|
package org.eclipse.rse.internal.core.filters;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.ISystemFilterPool;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper;
|
import org.eclipse.rse.core.filters.ISystemFilterPoolWrapper;
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.filters;
|
package org.eclipse.rse.internal.core.filters;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.IRSEFilterNamingPolicy;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterConstants;
|
import org.eclipse.rse.core.filters.ISystemFilterConstants;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.IAdaptable;
|
||||||
import org.eclipse.core.runtime.Platform;
|
import org.eclipse.core.runtime.Platform;
|
|
@ -14,7 +14,7 @@
|
||||||
* {Name} (company) - description of contribution.
|
* {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.IAdaptable;
|
||||||
import org.eclipse.core.runtime.Platform;
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.rse.core.filters.ISystemFilter;
|
import org.eclipse.rse.core.filters.ISystemFilter;
|
Loading…
Add table
Reference in a new issue