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

[168973] Stage 2 - remove UI dependencies

Browse source
This commit is contained in:
David Dykstal 2007-03-29 20:05:48 +00:00
parent 5f3cf618e3
commit 52f45406a8
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -246,7 +246,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
* Create a single filter refererence to a given filter. * Create a single filter refererence to a given filter.
* If there already is a reference to this filter, it is returned. * 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. * 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) 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. * Return an existing reference to a given system filter.
* If no reference currently exists to this filter, returns null. * If no reference currently exists to this filter, returns null.
* @see #getSystemFilterReference(ISystemFilter) * @see #getSystemFilterReference(ISubSystem, ISystemFilter)
*/ */
public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter)
{ {

15
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java
View file

@ -19,9 +19,9 @@ import java.util.Iterator;
import java.util.Vector; import java.util.Vector;
import org.eclipse.rse.core.RSECorePlugin; 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.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.logging.Logger;
/** /**
@ -111,7 +111,7 @@ public class SystemFilterContainerCommonMethods
if (exists) if (exists)
{ {
String msg = "Error creating filter: aliasName " + aliasName + " is not unique"; // no need to xlate, internal only //$NON-NLS-1$ //$NON-NLS-2$ 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; return null;
} }
newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings); newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings);
@ -148,10 +148,9 @@ public class SystemFilterContainerCommonMethods
//} //}
} catch (Exception e) } catch (Exception e)
{ {
SystemBasePlugin.logError("Error creating filter: " + e.getClass().getName() + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ Logger logger = RSECorePlugin.getDefault().getLogger();
SystemBasePlugin.logError("...Alias name.: " + aliasName); //$NON-NLS-1$ 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$
//e.printStackTrace();
} }
return newFilter; return newFilter;
} }
@ -437,7 +436,7 @@ public class SystemFilterContainerCommonMethods
* @param filters Vector list * @param filters Vector list
* @param filter SystemFilter object to update * @param filter SystemFilter object to update
* @param newName new name to give filter * @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) 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 filters java.util.List list
* @param filter SystemFilter object to update * @param filter SystemFilter object to update
* @param newName new name to give filter * @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) public void updateSystemFilter(java.util.List filters, ISystemFilter filter, String newName, String[] newStrings)
{ {

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

@ -953,8 +953,8 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
// FIXME SystemFilterImpl.initMOF(); // to be safe // FIXME SystemFilterImpl.initMOF(); // to be safe
ISystemFilterPool pool = null; ISystemFilterPool pool = null;
SystemFilterPool poolImpl = null;
/* FIXME /* FIXME
SystemFilterPool poolImpl = null;
switch(savePolicy) switch(savePolicy)
{ {
case SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL: case SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL:
@ -996,11 +996,11 @@ public class SystemFilterPool extends SystemPersistableReferencedObject
} }
break; break;
} }
*/
if (poolImpl != null) if (poolImpl != null)
{ {
poolImpl.initialize(name,savePolicy,namingPolicy); poolImpl.initialize(name,savePolicy,namingPolicy);
} }
*/
return pool; return pool;
} }

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

@ -21,6 +21,7 @@ import java.util.regex.Pattern;
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.RSECorePlugin;
import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterContainer; import org.eclipse.rse.core.filters.ISystemFilterContainer;
import org.eclipse.rse.core.filters.ISystemFilterContainerReference; 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.ISystemFilterPoolReferenceManagerProvider;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.model.ISystemProfile; 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.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.references.SystemPersistableReferencingObject; 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". * 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); Matcher m = p.matcher(filterPoolName);
if (m.find()) { if (m.find()) {
String profileName = m.group(1); String profileName = m.group(1);
ISystemProfile profile = SystemRegistry.getSystemRegistry().getSystemProfile(profileName); ISystemRegistry registry = RSECorePlugin.getDefault().getSystemRegistry();
ISystemProfile profile = registry.getSystemProfile(profileName);
if (profile != null) { if (profile != null) {
ISystemFilterPool[] pools = profile.getFilterPools(); ISystemFilterPool[] pools = profile.getFilterPools();
for (int i = 0; i < pools.length && filterPool == null; i++) { for (int i = 0; i < pools.length && filterPool == null; i++) {

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

@ -110,7 +110,7 @@ public class SystemFilterStartHere
* SystemFilterPoolReferenceManagerProvider interface, and pass "this" for this parameter. * SystemFilterPoolReferenceManagerProvider interface, and pass "this" for this parameter.
* Given any filter framework object, it is possible to retrieve the caller's * Given any filter framework object, it is possible to retrieve the caller's
* object via the getProvider method call. * 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. * this manager will contain references to.
* @param name the name of the filter pool reference manager. This is not currently * @param name the name of the filter pool reference manager. This is not currently
* used, but you may find a use for it. * used, but you may find a use for it.