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

[189274] formatting prior to adding new operations for adding filters

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=189274
This commit is contained in:
David Dykstal 2008-03-11 00:19:46 +00:00
parent 894fbb040a
commit a6e7bc0b7f
1 changed files with 444 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

310
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterContainerCommonMethods.java
View file

@ -15,6 +15,7 @@
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.core.filters; package org.eclipse.rse.internal.core.filters;
import java.util.Iterator; import java.util.Iterator;
import java.util.Vector; import java.util.Vector;
@ -23,7 +24,6 @@ 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; import org.eclipse.rse.logging.Logger;
/** /**
* This class abstracts out some common code needed by any class that * This class abstracts out some common code needed by any class that
* implements ISystemFilterContainer. * implements ISystemFilterContainer.
@ -34,7 +34,7 @@ import org.eclipse.rse.logging.Logger;
* are stored internally. * are stored internally.
*/ */
public class SystemFilterContainerCommonMethods public class SystemFilterContainerCommonMethods
//implements ISystemFilterContainer //implements ISystemFilterContainer
{ {
private Vector filterNameVector, filterVector; private Vector filterNameVector, filterVector;
private ISystemFilter[] filterArray; private ISystemFilter[] filterArray;
@ -42,12 +42,10 @@ public class SystemFilterContainerCommonMethods
/** /**
* Constructor * Constructor
*/ */
public SystemFilterContainerCommonMethods() public SystemFilterContainerCommonMethods() {
{
super(); super();
} }
/** /**
* For performance reasons we have decided to store a cache of the * For performance reasons we have decided to store a cache of the
* filters in vector and array form, so each request will not result * filters in vector and array form, so each request will not result
@ -55,8 +53,7 @@ public class SystemFilterContainerCommonMethods
* of date, so this method must be called religiously to invalidate it * of date, so this method must be called religiously to invalidate it
* after any change in the filters. * after any change in the filters.
*/ */
public void invalidateCache() public void invalidateCache() {
{
filterNameVector = filterVector = null; filterNameVector = filterVector = null;
filterArray = null; filterArray = null;
} }
@ -68,17 +65,13 @@ public class SystemFilterContainerCommonMethods
* @param aliasName The name to give the new filter. Must be unique for this pool. * @param aliasName The name to give the new filter. Must be unique for this pool.
* @param filterStrings The list of String objects that represent the filter strings. * @param filterStrings The list of String objects that represent the filter strings.
*/ */
public ISystemFilter createSystemFilter(java.util.List filters, public ISystemFilter createSystemFilter(java.util.List filters, ISystemFilterPool parentPool, String aliasName, Vector filterStrings) {
ISystemFilterPool parentPool,
String aliasName, Vector filterStrings)
{
ISystemFilter newFilter = null; ISystemFilter newFilter = null;
// FIXME - not using error message and null return // FIXME - not using error message and null return
// because I want to restore filters while not being hit with conflicts // because I want to restore filters while not being hit with conflicts
newFilter = getSystemFilter(filters, aliasName); newFilter = getSystemFilter(filters, aliasName);
if (newFilter != null) if (newFilter != null) {
{
return newFilter; return newFilter;
} }
/* DKM /* DKM
@ -91,10 +84,10 @@ public class SystemFilterContainerCommonMethods
} }
*/ */
newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings); newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings);
if (newFilter != null) if (newFilter != null) internalAddSystemFilter(filters, newFilter);
internalAddSystemFilter(filters, newFilter);
return newFilter; return newFilter;
} }
/** /**
* Creates a new system filter within this pool or filter. * Creates a new system filter within this pool or filter.
* @param filters Vector of filters the new filter is to be added to. * @param filters Vector of filters the new filter is to be added to.
@ -102,43 +95,32 @@ public class SystemFilterContainerCommonMethods
* @param aliasName The name to give the new filter. Must be unique for this pool. * @param aliasName The name to give the new filter. Must be unique for this pool.
* @param filterStrings The list of String objects that represent the filter strings. * @param filterStrings The list of String objects that represent the filter strings.
*/ */
public ISystemFilter createSystemFilter(Vector filters, public ISystemFilter createSystemFilter(Vector filters, ISystemFilterPool parentPool, String aliasName, Vector filterStrings) {
ISystemFilterPool parentPool,
String aliasName, Vector filterStrings)
{
ISystemFilter newFilter = null; ISystemFilter newFilter = null;
boolean exists = getSystemFilter(filters, aliasName) != null; boolean exists = getSystemFilter(filters, aliasName) != null;
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$
RSECorePlugin.getDefault().getLogger().logError(msg, null); RSECorePlugin.getDefault().getLogger().logError(msg, null);
return null; return null;
} }
newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings); newFilter = internalCreateSystemFilter(parentPool, aliasName, filterStrings);
if (newFilter != null) if (newFilter != null) internalAddSystemFilter(filters, newFilter);
internalAddSystemFilter(filters, newFilter);
return newFilter; return newFilter;
} }
/** /**
* Internal encapsulation of mof effort to create new filter, and setting of * Internal encapsulation of mof effort to create new filter, and setting of
* the core attributes. * the core attributes.
*/ */
private ISystemFilter internalCreateSystemFilter( private ISystemFilter internalCreateSystemFilter(ISystemFilterPool parentPool, String aliasName, Vector filterStrings) {
ISystemFilterPool parentPool,
String aliasName, Vector filterStrings)
{
ISystemFilter newFilter = null; ISystemFilter newFilter = null;
try try {
{
newFilter = new SystemFilter(); newFilter = new SystemFilter();
// FIXME getMOFfactory().createSystemFilter(); // FIXME getMOFfactory().createSystemFilter();
newFilter.setRelease(RSECorePlugin.CURRENT_RELEASE); newFilter.setRelease(RSECorePlugin.CURRENT_RELEASE);
newFilter.setName(aliasName); newFilter.setName(aliasName);
newFilter.setParentFilterPool(parentPool); newFilter.setParentFilterPool(parentPool);
if (filterStrings != null) if (filterStrings != null) newFilter.setFilterStrings(filterStrings);
newFilter.setFilterStrings(filterStrings);
//java.util.List filterStringList = newFilter.getFilterStrings(); //java.util.List filterStringList = newFilter.getFilterStrings();
//for (int idx=0; idx<filterStrings.size(); idx++) //for (int idx=0; idx<filterStrings.size(); idx++)
//{ //{
@ -146,8 +128,7 @@ public class SystemFilterContainerCommonMethods
//string.setString((String)filterStrings.elementAt(idx)); //string.setString((String)filterStrings.elementAt(idx));
//filterStringList.add(string); //filterStringList.add(string);
//} //}
} catch (Exception e) } catch (Exception e) {
{
Logger logger = RSECorePlugin.getDefault().getLogger(); Logger logger = RSECorePlugin.getDefault().getLogger();
logger.logError("Error creating filter: " + e.getClass().getName() + ": " + e.getMessage(), null); //$NON-NLS-1$ //$NON-NLS-2$ 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$ logger.logError("...Alias name.: " + aliasName, null); //$NON-NLS-1$
@ -155,22 +136,17 @@ public class SystemFilterContainerCommonMethods
return newFilter; return newFilter;
} }
/** /**
* Return Vector of String objects: the names of existing filters in this container. * Return Vector of String objects: the names of existing filters in this container.
* Needed by name validators for New and Rename actions to verify new name is unique. * Needed by name validators for New and Rename actions to verify new name is unique.
*/ */
public Vector getSystemFilterNames(java.util.List filters) public Vector getSystemFilterNames(java.util.List filters) {
{ if ((filterNameVector == null) || (filterNameVector.size() != filters.size())) {
if ((filterNameVector == null) || (filterNameVector.size() != filters.size()))
{
filterNameVector = new Vector(); filterNameVector = new Vector();
if (filters == null) if (filters == null) return filterNameVector;
return filterNameVector;
Iterator i = filters.iterator(); Iterator i = filters.iterator();
while (i.hasNext()) while (i.hasNext()) {
{ ISystemFilter next = (ISystemFilter) i.next();
ISystemFilter next = (ISystemFilter)i.next();
filterNameVector.addElement(next.getName()); filterNameVector.addElement(next.getName());
} }
} }
@ -181,30 +157,23 @@ public class SystemFilterContainerCommonMethods
* Return Vector of String objects: the names of existing filters in this container. * Return Vector of String objects: the names of existing filters in this container.
* Needed by name validators for New and Rename actions to verify new name is unique. * Needed by name validators for New and Rename actions to verify new name is unique.
*/ */
public Vector getSystemFilterNames(Vector filters) public Vector getSystemFilterNames(Vector filters) {
{ if ((filterNameVector == null) || (filterNameVector.size() != filters.size())) {
if ((filterNameVector == null) || (filterNameVector.size() != filters.size()))
{
Vector filterNameVector = new Vector(); Vector filterNameVector = new Vector();
if ((filters == null) || (filters.size()==0)) if ((filters == null) || (filters.size() == 0)) return filterNameVector;
return filterNameVector; for (int idx = 0; idx < filters.size(); idx++) {
for (int idx=0; idx<filters.size(); idx++) ISystemFilter next = (ISystemFilter) filters.elementAt(idx);
{
ISystemFilter next = (ISystemFilter)filters.elementAt(idx);
filterNameVector.addElement(next.getName()); filterNameVector.addElement(next.getName());
} }
} }
return filterNameVector; return filterNameVector;
} }
/** /**
* Return the nested filters as a Vector * Return the nested filters as a Vector
*/ */
public Vector getSystemFiltersVector(java.util.List filters) public Vector getSystemFiltersVector(java.util.List filters) {
{ if ((filterVector == null) || (filterVector.size() != filters.size())) {
if ((filterVector == null) || (filterVector.size() != filters.size()))
{
filterVector = new Vector(); filterVector = new Vector();
Iterator i = filters.iterator(); Iterator i = filters.iterator();
while (i.hasNext()) while (i.hasNext())
@ -212,42 +181,38 @@ public class SystemFilterContainerCommonMethods
} }
return filterVector; return filterVector;
} }
/** /**
* Return the nested filters as a Vector * Return the nested filters as a Vector
*/ */
public Vector getSystemFiltersVector(Vector filters) public Vector getSystemFiltersVector(Vector filters) {
{
return filters; return filters;
} }
/** /**
* Return the nested filters as an array * Return the nested filters as an array
*/ */
public ISystemFilter[] getSystemFilters(java.util.List filters) public ISystemFilter[] getSystemFilters(java.util.List filters) {
{ if ((filterArray == null) || (filterArray.length != filters.size())) {
if ((filterArray == null) || (filterArray.length != filters.size()))
{
filterArray = new ISystemFilter[filters.size()]; filterArray = new ISystemFilter[filters.size()];
Iterator i = filters.iterator(); Iterator i = filters.iterator();
int idx = 0; int idx = 0;
while (i.hasNext()) while (i.hasNext())
filterArray[idx++]=(ISystemFilter)(i.next()); filterArray[idx++] = (ISystemFilter) (i.next());
} }
return filterArray; return filterArray;
//return null; //return null;
} }
/** /**
* Return the filters as an array * Return the filters as an array
*/ */
public ISystemFilter[] getSystemFilters(Vector filters) public ISystemFilter[] getSystemFilters(Vector filters) {
{ if (filters == null) return null;
if (filters == null) if ((filterArray == null) || (filterArray.length != filters.size())) {
return null;
if ((filterArray == null) || (filterArray.length != filters.size()))
{
filterArray = new ISystemFilter[filters.size()]; filterArray = new ISystemFilter[filters.size()];
for (int idx=0; idx<filters.size(); idx++) for (int idx = 0; idx < filters.size(); idx++)
filterArray[idx]=(ISystemFilter)(filters.elementAt(idx)); filterArray[idx] = (ISystemFilter) (filters.elementAt(idx));
} }
return filterArray; return filterArray;
} }
@ -255,8 +220,7 @@ public class SystemFilterContainerCommonMethods
/** /**
* Return how many filters are defined in this filter container * Return how many filters are defined in this filter container
*/ */
public int getSystemFilterCount(java.util.List filters) public int getSystemFilterCount(java.util.List filters) {
{
int nbrChildren = (filters == null) ? 0 : filters.size(); int nbrChildren = (filters == null) ? 0 : filters.size();
return nbrChildren; return nbrChildren;
} }
@ -264,8 +228,7 @@ public class SystemFilterContainerCommonMethods
/** /**
* Return how many filters are defined in this filter container * Return how many filters are defined in this filter container
*/ */
public int getSystemFilterCount(Vector filters) public int getSystemFilterCount(Vector filters) {
{
int nbrChildren = (filters == null) ? 0 : filters.size(); int nbrChildren = (filters == null) ? 0 : filters.size();
return nbrChildren; return nbrChildren;
} }
@ -273,19 +236,17 @@ public class SystemFilterContainerCommonMethods
/** /**
* Return true if there are system filters * Return true if there are system filters
*/ */
public boolean hasSystemFilters(java.util.List filters) public boolean hasSystemFilters(java.util.List filters) {
{ return (filters != null) && (filters.size() > 0);
return (filters!=null) && (filters.size()>0);
} }
/** /**
* Return true if there are system filters * Return true if there are system filters
*/ */
public boolean hasSystemFilters(Vector filters) public boolean hasSystemFilters(Vector filters) {
{ return (filters != null) && (filters.size() > 0);
return (filters!=null) && (filters.size()>0);
} }
/** /**
* Return a filter object, given its aliasname. * Return a filter object, given its aliasname.
* Can be used to test if an aliasname is already used (non-null return). * Can be used to test if an aliasname is already used (non-null return).
@ -293,19 +254,17 @@ public class SystemFilterContainerCommonMethods
* @return SystemFilter object with unique aliasName, or null if * @return SystemFilter object with unique aliasName, or null if
* no filter object with this name exists. * no filter object with this name exists.
*/ */
public ISystemFilter getSystemFilter(java.util.List filters, String aliasName) public ISystemFilter getSystemFilter(java.util.List filters, String aliasName) {
{
ISystemFilter filter = null; ISystemFilter filter = null;
ISystemFilter currFilter = null; ISystemFilter currFilter = null;
Iterator i = filters.iterator(); Iterator i = filters.iterator();
while (i.hasNext() && (filter==null)) while (i.hasNext() && (filter == null)) {
{ currFilter = (ISystemFilter) i.next();
currFilter = (ISystemFilter)i.next(); if (currFilter.getName().equalsIgnoreCase(aliasName)) filter = currFilter;
if (currFilter.getName().equalsIgnoreCase(aliasName))
filter = currFilter;
} }
return filter; return filter;
} }
/** /**
* Return a filter object, given its aliasname. * Return a filter object, given its aliasname.
* Can be used to test if an aliasname is already used (non-null return). * Can be used to test if an aliasname is already used (non-null return).
@ -313,21 +272,43 @@ public class SystemFilterContainerCommonMethods
* @return SystemFilter object with unique aliasName, or null if * @return SystemFilter object with unique aliasName, or null if
* no filter object with this name exists. * no filter object with this name exists.
*/ */
public ISystemFilter getSystemFilter(Vector filters, String aliasName) public ISystemFilter getSystemFilter(Vector filters, String aliasName) {
{ if ((filters == null) || (filters.size() == 0)) return null;
if ((filters == null) || (filters.size()==0))
return null;
ISystemFilter filter = null; ISystemFilter filter = null;
ISystemFilter currFilter = null; ISystemFilter currFilter = null;
for (int idx=0; (idx<filters.size()) && (filter==null); idx++) for (int idx = 0; (idx < filters.size()) && (filter == null); idx++) {
{ currFilter = (ISystemFilter) filters.elementAt(idx);
currFilter = (ISystemFilter)filters.elementAt(idx); if (currFilter.getName().equalsIgnoreCase(aliasName)) filter = currFilter;
if (currFilter.getName().equalsIgnoreCase(aliasName))
filter = currFilter;
} }
return filter; return filter;
} }
/**
* Adds given filter to the list.
* <p>PLEASE NOTE:
* <ul>
* <li> createSystemFilter calls this method for you!
* <li> this is a no-op if a filter with the same aliasname already exists
* </ul>
* @param filter SystemFilter object to add
* @return true if added, false if filter with this aliasname already existed.
*/
public boolean addSystemFilter(java.util.List filters, ISystemFilter filter) {
boolean exists = getSystemFilter(filters, filter.getName()) != null;
if (!exists)
return internalAddSystemFilter(filters, filter);
else
return false;
}
/**
* Internally, we can skip the uniqueness checking.
*/
protected boolean internalAddSystemFilter(java.util.List filters, ISystemFilter filter) {
filters.add(filter);
invalidateCache();
return true;
}
/** /**
* Adds given filter to the list. * Adds given filter to the list.
@ -339,52 +320,22 @@ public class SystemFilterContainerCommonMethods
* @param filter SystemFilter object to add * @param filter SystemFilter object to add
* @return true if added, false if filter with this aliasname already existed. * @return true if added, false if filter with this aliasname already existed.
*/ */
public boolean addSystemFilter(java.util.List filters, ISystemFilter filter) public boolean addSystemFilter(Vector filters, ISystemFilter filter) {
{
boolean exists = getSystemFilter(filters, filter.getName()) != null; boolean exists = getSystemFilter(filters, filter.getName()) != null;
if (!exists) if (!exists)
return internalAddSystemFilter(filters, filter); return internalAddSystemFilter(filters, filter);
else else
return false; return false;
} }
/** /**
* Internally, we can skip the uniqueness checking. * Internally, we can skip the uniqueness checking.
*/ */
protected boolean internalAddSystemFilter(java.util.List filters, ISystemFilter filter) private boolean internalAddSystemFilter(Vector filters, ISystemFilter filter) {
{
filters.add(filter); filters.add(filter);
invalidateCache(); invalidateCache();
return true; return true;
} }
/**
* Adds given filter to the list.
* <p>PLEASE NOTE:
* <ul>
* <li> createSystemFilter calls this method for you!
* <li> this is a no-op if a filter with the same aliasname already exists
* </ul>
* @param filter SystemFilter object to add
* @return true if added, false if filter with this aliasname already existed.
*/
public boolean addSystemFilter(Vector filters, ISystemFilter filter)
{
boolean exists = getSystemFilter(filters, filter.getName()) != null;
if (!exists)
return internalAddSystemFilter(filters, filter);
else
return false;
}
/**
* Internally, we can skip the uniqueness checking.
*/
private boolean internalAddSystemFilter(Vector filters, ISystemFilter filter)
{
filters.add(filter);
invalidateCache();
return true;
}
/** /**
* Removes a given filter from the list. * Removes a given filter from the list.
@ -392,19 +343,18 @@ public class SystemFilterContainerCommonMethods
* @param filters MOF list to remove from * @param filters MOF list to remove from
* @param filter SystemFilter object to remove * @param filter SystemFilter object to remove
*/ */
public void deleteSystemFilter(java.util.List filters, ISystemFilter filter) public void deleteSystemFilter(java.util.List filters, ISystemFilter filter) {
{
filters.remove(filter); filters.remove(filter);
invalidateCache(); invalidateCache();
} }
/** /**
* Renames a given filter from the list. * Renames a given filter from the list.
* @param filters java.util.List list * @param filters java.util.List list
* @param filter SystemFilter object to rename * @param filter SystemFilter object to rename
* @param newName new name to give filter * @param newName new name to give filter
*/ */
public void renameSystemFilter(java.util.List filters, ISystemFilter filter, String newName) public void renameSystemFilter(java.util.List filters, ISystemFilter filter, String newName) {
{
filter.setName(newName); filter.setName(newName);
invalidateCache(); invalidateCache();
} }
@ -415,22 +365,22 @@ public class SystemFilterContainerCommonMethods
* @param filters Vector list to remove from * @param filters Vector list to remove from
* @param filter SystemFilter object to remove * @param filter SystemFilter object to remove
*/ */
public void deleteSystemFilter(Vector filters, ISystemFilter filter) public void deleteSystemFilter(Vector filters, ISystemFilter filter) {
{
filters.remove(filter); filters.remove(filter);
invalidateCache(); invalidateCache();
} }
/** /**
* Renames a given filter from the list. * Renames a given filter from the list.
* @param filters Vector list * @param filters Vector list
* @param filter SystemFilter object to rename * @param filter SystemFilter object to rename
* @param newName new name to give filter * @param newName new name to give filter
*/ */
public void renameSystemFilter(Vector filters, ISystemFilter filter, String newName) public void renameSystemFilter(Vector filters, ISystemFilter filter, String newName) {
{
filter.setName(newName); filter.setName(newName);
invalidateCache(); invalidateCache();
} }
/** /**
* Updates a given filter in the list. * Updates a given filter in the list.
* @param filters Vector list * @param filters Vector list
@ -438,12 +388,12 @@ public class SystemFilterContainerCommonMethods
* @param newName new name to give filter * @param newName new name to give filter
* @param newStrings 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) {
{
filter.setName(newName); filter.setName(newName);
filter.setFilterStrings(newStrings); filter.setFilterStrings(newStrings);
invalidateCache(); invalidateCache();
} }
/** /**
* Updates a given filter in the list. * Updates a given filter in the list.
* @param filters java.util.List list * @param filters java.util.List list
@ -451,52 +401,43 @@ public class SystemFilterContainerCommonMethods
* @param newName new name to give filter * @param newName new name to give filter
* @param newStrings 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) {
{
filter.setName(newName); filter.setName(newName);
filter.setFilterStrings(newStrings); filter.setFilterStrings(newStrings);
invalidateCache(); invalidateCache();
} }
/** /**
* Duplicates a given filter in the list. * Duplicates a given filter in the list.
* @param filters MOF list of filters into which to place the clone * @param filters MOF list of filters into which to place the clone
* @param filter SystemFilter object to clone * @param filter SystemFilter object to clone
* @param aliasName New, unique, alias name to give this filter. Clone will fail if this is not unique. * @param aliasName New, unique, alias name to give this filter. Clone will fail if this is not unique.
*/ */
public ISystemFilter cloneSystemFilter(java.util.List filters, ISystemFilter filter, String aliasName) public ISystemFilter cloneSystemFilter(java.util.List filters, ISystemFilter filter, String aliasName) {
{
ISystemFilter copy = ISystemFilter copy = createSystemFilter(filters, filter.getParentFilterPool(), aliasName, filter.getFilterStringsVector());
createSystemFilter(filters, filter.getParentFilterPool(),
aliasName, filter.getFilterStringsVector());
internalAfterCloneSystemFilter(filter, copy); internalAfterCloneSystemFilter(filter, copy);
// now clone nested filters... // now clone nested filters...
ISystemFilter[] nested = filter.getSystemFilters(); ISystemFilter[] nested = filter.getSystemFilters();
if ((nested!=null) && (nested.length>0)) if ((nested != null) && (nested.length > 0)) for (int idx = 0; idx < nested.length; idx++) {
for (int idx=0; idx<nested.length; idx++)
{
} }
return copy; return copy;
} }
/** /**
* Duplicates a given filter in the list. * Duplicates a given filter in the list.
* @param filters Vector of filters into which to place the clone * @param filters Vector of filters into which to place the clone
* @param filter SystemFilter object to clone * @param filter SystemFilter object to clone
* @param aliasName New, unique, alias name to give this filter. Clone will fail if this is not unique. * @param aliasName New, unique, alias name to give this filter. Clone will fail if this is not unique.
*/ */
public ISystemFilter cloneSystemFilter(Vector filters, ISystemFilter filter, String aliasName) public ISystemFilter cloneSystemFilter(Vector filters, ISystemFilter filter, String aliasName) {
{
ISystemFilter copy = ISystemFilter copy = createSystemFilter(filters, filter.getParentFilterPool(), aliasName, filter.getFilterStringsVector());
createSystemFilter(filters, filter.getParentFilterPool(),
aliasName, filter.getFilterStringsVector());
internalAfterCloneSystemFilter(filter, copy); internalAfterCloneSystemFilter(filter, copy);
// now clone nested filters... // now clone nested filters...
ISystemFilter[] nested = filter.getSystemFilters(); ISystemFilter[] nested = filter.getSystemFilters();
if ((nested!=null) && (nested.length>0)) if ((nested != null) && (nested.length > 0)) for (int idx = 0; idx < nested.length; idx++) {
for (int idx=0; idx<nested.length; idx++)
{
} }
return copy; return copy;
@ -507,8 +448,7 @@ public class SystemFilterContainerCommonMethods
* @param oldFilter SystemFilter original filter * @param oldFilter SystemFilter original filter
* @param newFilter SystemFilter that is new * @param newFilter SystemFilter that is new
*/ */
public void internalAfterCloneSystemFilter(ISystemFilter oldFilter, ISystemFilter newFilter) public void internalAfterCloneSystemFilter(ISystemFilter oldFilter, ISystemFilter newFilter) {
{
newFilter.setParentFilterPool(oldFilter.getParentFilterPool()); newFilter.setParentFilterPool(oldFilter.getParentFilterPool());
newFilter.setSupportsNestedFilters(oldFilter.isSupportsNestedFilters()); newFilter.setSupportsNestedFilters(oldFilter.isSupportsNestedFilters());
newFilter.setType(oldFilter.getType()); newFilter.setType(oldFilter.getType());
@ -519,52 +459,44 @@ public class SystemFilterContainerCommonMethods
/** /**
* Return a given filter's zero-based location * Return a given filter's zero-based location
*/ */
public int getSystemFilterPosition(java.util.List filters, ISystemFilter filter) public int getSystemFilterPosition(java.util.List filters, ISystemFilter filter) {
{
int position = -1; int position = -1;
Iterator i = filters.iterator(); Iterator i = filters.iterator();
for (int idx=0; (position<0) && (idx < filters.size()); idx++) for (int idx = 0; (position < 0) && (idx < filters.size()); idx++) {
{ ISystemFilter currFilter = (ISystemFilter) i.next();
ISystemFilter currFilter = (ISystemFilter)i.next(); if (currFilter.getName().equals(filter.getName())) position = idx;
if (currFilter.getName().equals(filter.getName()))
position = idx;
}
return position;
}
/**
* Return a given filter's zero-based location
*/
public int getSystemFilterPosition(Vector filters, ISystemFilter filter)
{
int position = -1;
for (int idx=0; (position<0) && (idx < filters.size()); idx++)
{
ISystemFilter currFilter = (ISystemFilter)filters.elementAt(idx);
if (currFilter.getName().equals(filter.getName()))
position = idx;
} }
return position; return position;
} }
/**
* Return a given filter's zero-based location
*/
public int getSystemFilterPosition(Vector filters, ISystemFilter filter) {
int position = -1;
for (int idx = 0; (position < 0) && (idx < filters.size()); idx++) {
ISystemFilter currFilter = (ISystemFilter) filters.elementAt(idx);
if (currFilter.getName().equals(filter.getName())) position = idx;
}
return position;
}
/** /**
* Move a given filter to a given zero-based location * Move a given filter to a given zero-based location
*/ */
public void moveSystemFilter(java.util.List filters, int pos, ISystemFilter filter) public void moveSystemFilter(java.util.List filters, int pos, ISystemFilter filter) {
{
filters.remove(filter); filters.remove(filter);
filters.add(pos, filter); filters.add(pos, filter);
invalidateCache(); invalidateCache();
} }
/** /**
* Move a given filter to a given zero-based location * Move a given filter to a given zero-based location
*/ */
public void moveSystemFilter(Vector filters, int pos, ISystemFilter filter) public void moveSystemFilter(Vector filters, int pos, ISystemFilter filter) {
{
filters.remove(filter); filters.remove(filter);
filters.insertElementAt(filter, pos); filters.insertElementAt(filter, pos);
invalidateCache(); invalidateCache();
} }
} }