diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.java index 05207a4943c..8777a1f1d68 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.java @@ -16,12 +16,12 @@ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; /** * This interface is implemented by any validator that - * does uniqueness checking. Allows common code that will set the - * list of string to check against. + * does uniqueness checking. Allows common code that will set the + * list of string to check against. */ public interface ISystemValidatorUniqueString { @@ -36,10 +36,13 @@ public interface ISystemValidatorUniqueString public void setExistingNamesList(String[] existingList); /** * Reset the existing names list. + * The collection used here is to be treated as + * read-only by any implementer of this interface. */ - public void setExistingNamesList(List existingList); + public void setExistingNamesList(Collection existingList); /** - * Return the existing names list. This will be a case-normalized and sorted list. + * Return the existing names list. + * This will be a case-normalized and sorted list. */ public String[] getExistingNamesList(); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorArchiveName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorArchiveName.java index 9d87e6fcc20..29e0d70cd2a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorArchiveName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorArchiveName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; @@ -35,7 +35,7 @@ public class ValidatorArchiveName extends ValidatorFileName { protected SystemMessage msg_NotRegisteredArchive; - public ValidatorArchiveName(List existingNameList) { + public ValidatorArchiveName(Collection existingNameList) { super(existingNameList); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.java index 741334c9c38..c80613d09d1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -38,8 +38,9 @@ public class ValidatorCompileCommandLabel extends ValidatorUniqueString /** * Use this constructor when you have a list of existing labels. + * The collection will not be modified by the validator. */ - public ValidatorCompileCommandLabel(List existingLabelList) + public ValidatorCompileCommandLabel(Collection existingLabelList) { super(existingLabelList, CASE_INSENSITIVE); // case insensitive uniqueness init(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorConnectionName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorConnectionName.java index 7b7c02a56b5..46db5dbcf12 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorConnectionName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorConnectionName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; @@ -41,7 +41,7 @@ public class ValidatorConnectionName extends ValidatorUniqueString implements IS * Constructor. * @param existingNameList list of existing names (strings) in owning profile. Can be null if not a rename operation. */ - public ValidatorConnectionName(List existingNameList) + public ValidatorConnectionName(Collection existingNameList) { super(existingNameList, CASE_SENSITIVE); setErrorMessages( diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFactory.java index 780822f9381..6bf1d03165d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFactory.java @@ -13,7 +13,7 @@ package org.eclipse.rse.ui.validators; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.ISystemProfileManager; @@ -32,7 +32,7 @@ public class ValidatorFactory { public static ISystemValidator getProfileNameValidator(String profileName) { ISystemProfileManager manager = RSECorePlugin.getTheSystemRegistry().getSystemProfileManager(); String[] nameArray = manager.getSystemProfileNames(); - List names = new ArrayList(Arrays.asList(nameArray)); + Collection names = Arrays.asList(nameArray); if (profileName != null) names.remove(profileName); ISystemValidator nameValidator = new ValidatorProfileName(names); return nameValidator; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFileName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFileName.java index b12f5c79f6c..1588ad2fd52 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFileName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFileName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -44,9 +44,10 @@ public class ValidatorFileName /** * Use this constructor when the name must be unique. - * @param existingNameList a list of existing names to compare against. + * @param existingNameList a collection of existing names to compare against. + * This will not be modified by the validator. */ - public ValidatorFileName(List existingNameList) + public ValidatorFileName(Collection existingNameList) { super(existingNameList, false); // case insensitive uniqueness super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java index bfe10de0c51..4f08e9e3198 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; @@ -37,11 +37,12 @@ public class ValidatorFilterName //public static final boolean CASE_INSENSITIVE = false; /** - * Constructor accepting a List. - * @param existingList a list of existing filter names to compare against. - * Note that toString() is used to get the string from each item. + * Constructor accepting a Collection. + * @param existingList a collection of existing filter names to compare against. + * The collection will not be modified by the validator. + * Note that toString() is used to get the string from each item. */ - public ValidatorFilterName(List existingList) + public ValidatorFilterName(Collection existingList) { super(existingList, CASE_SENSITIVE); init(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java index 9217713d5c1..0d749fa9598 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; @@ -34,18 +34,19 @@ public class ValidatorFilterPoolName public static final int MAX_FILTERPOOLNAME_LENGTH = 50; /** - * Constructor accepting a list. - * @param existingList a list of existing filter names to compare against. - * Note that toString() is used to get the string from each item. + * Constructor accepting a Collection. + * @param existingList a collection of existing filter names to compare against. + * This will not be modified by the validator. + * Note that toString() is used to get the string from each item. */ - public ValidatorFilterPoolName(List existingList) + public ValidatorFilterPoolName(Collection existingList) { super(existingList, CASE_SENSITIVE); init(); } /** * Constructor accepting an Array. - * @param existingList An array containing list of existing strings to compare against. + * @param existingList An array containing a list of existing strings to compare against. */ public ValidatorFilterPoolName(String[] existingList) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterString.java index faea4018395..0e3aec2a0ea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterString.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterString.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.services.clientserver.messages.SystemMessage; @@ -39,11 +39,12 @@ public class ValidatorFilterString protected SystemMessage msg_Invalid; /** - * Constructor accepting a list of existing strings, as simple strings. - * @param existingList A list of strings to compare against. + * Constructor accepting a collection of existing strings, as simple strings. + * @param existingList A collection of strings to compare against. + * This will not be modified by the validator. * @param caseSensitive true if comparisons are to be case sensitive, false if case insensitive. */ - public ValidatorFilterString(List existingList, boolean caseSensitive) + public ValidatorFilterString(Collection existingList, boolean caseSensitive) { super(existingList, caseSensitive); // case sensitive uniqueness init(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFolderName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFolderName.java index 718298ecf81..bae7f1ec943 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFolderName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFolderName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -44,9 +44,10 @@ public class ValidatorFolderName /** * Use this constructor when the name must be unique. Give the - * @param existingNameList a list of existing names to compare against. + * @param existingNameList a collection of existing names to compare against. + * This will not be modified by the validator. */ - public ValidatorFolderName(List existingNameList) + public ValidatorFolderName(Collection existingNameList) { super(existingNameList, CASE_INSENSITIVE); // case insensitive uniqueness super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), @@ -56,7 +57,7 @@ public class ValidatorFolderName } /** * Use this constructor when the name must be unique. Give the - * ctor a string array of existing names to compare against. + * constructor a string array of existing names to compare against. */ public ValidatorFolderName(String existingNameList[]) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorLocalPath.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorLocalPath.java index 0093bd1daeb..a257552533c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorLocalPath.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorLocalPath.java @@ -16,7 +16,7 @@ package org.eclipse.rse.ui.validators; import java.io.File; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.services.clientserver.messages.SystemMessage; @@ -37,7 +37,7 @@ public class ValidatorLocalPath extends ValidatorPathName /** * Constructor for ValidatorLocalPath */ - public ValidatorLocalPath(List existingNameList) + public ValidatorLocalPath(Collection existingNameList) { super(existingNameList); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorPathName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorPathName.java index d8f6063e162..eb10b584e95 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorPathName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorPathName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; @@ -40,16 +40,17 @@ public class ValidatorPathName /** * Use this constructor when the name must be unique. - * @param existingNameList a list of existing names to compare against. + * @param existingNameList a collection of existing names to compare against. + * This will not be modified by the validator. */ - public ValidatorPathName(List existingNameList) + public ValidatorPathName(Collection existingNameList) { super(existingNameList, CASE_INSENSITIVE); // case insensitive uniqueness init(); } /** * Use this constructor when the name must be unique. Give the - * ctor a string array of existing names to compare against. + * constructor a string array of existing names to compare against. */ public ValidatorPathName(String existingNameList[]) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java index 21630b33c2a..8efc09ac364 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; @@ -36,10 +36,11 @@ public class ValidatorProfileName private SystemMessage reservedNameMsg; /** - * The list of existing names can be null if this is not a rename operation. - * @param existingNameList the list of names to compare against + * The collection of existing names can be null if this is not a rename operation. + * @param existingNameList the collection of names to compare against. + * This will not be modified by the validator. */ - public ValidatorProfileName(List existingNameList) + public ValidatorProfileName(Collection existingNameList) { super(existingNameList); super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_EMPTY), diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java index cd18683c29e..2a0a0c5116e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; @@ -42,9 +42,10 @@ public class ValidatorSystemName /** * Use this constructor when the name must be unique. - * @param existingNameList a list of existing names to compare against. + * @param existingNameList a collection of existing names to compare against. + * This collection will not be modified by the validator. */ - public ValidatorSystemName(List existingNameList) + public ValidatorSystemName(Collection existingNameList) { super(existingNameList, true); // case sensitive uniqueness super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY), diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java index 9e64706f4a1..73b2c85a065 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java @@ -16,7 +16,7 @@ package org.eclipse.rse.ui.validators; import java.util.Arrays; -import java.util.List; +import java.util.Collection; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; @@ -49,11 +49,11 @@ public class ValidatorUniqueString protected SystemMessage currentMessage; /** - * @param existingList a list of existing strings to compare against. - * Note that toString() is used to get the string from each item. + * @param existingList a collection of existing strings to compare against. + * Note that toString() is used to get the string from each item. * @param caseSensitive true if comparisons are to be case sensitive, false if case insensitive. */ - public ValidatorUniqueString(List existingList, boolean caseSensitive) + public ValidatorUniqueString(Collection existingList, boolean caseSensitive) { this.caseSensitive = caseSensitive; setExistingNamesList(existingList); @@ -75,15 +75,15 @@ public class ValidatorUniqueString RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTUNIQUE)); } /** - * Constructor accepting a List and another validator to use for the syntax checking. - * @param existingList A list of existing strings to compare against. - * Note that toString() is used to get the string from each item. + * Constructor accepting a collection and another validator to use for the syntax checking. + * @param existingList A collection of existing strings to compare against. + * Note that toString() is used to get the string from each item. * @param caseSensitive true if comparisons are to be case sensitive, false if case insensitive. * @param syntaxValidator Another IInputValidator who does the job of checking the syntax. After * checking for non-nullness and uniqueness, this validator is used to * check for syntax. */ - public ValidatorUniqueString(List existingList, boolean caseSensitive, + public ValidatorUniqueString(Collection existingList, boolean caseSensitive, ISystemValidator syntaxValidator) { this(existingList, caseSensitive); @@ -121,9 +121,10 @@ public class ValidatorUniqueString } /** - * Reset the existing names list. + * Reset the collection of existing names. + * The collection will not be modified by the validator. */ - public void setExistingNamesList(List newList) + public void setExistingNamesList(Collection newList) { if (newList == null) existingList = null; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java index ed00c08a62a..460dcef72a8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java @@ -15,7 +15,7 @@ ********************************************************************************/ package org.eclipse.rse.ui.validators; -import java.util.List; +import java.util.Collection; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -38,9 +38,10 @@ public class ValidatorUserActionName extends ValidatorUniqueString /** * Use this constructor when the name must be unique. - * @param existingNameList a list of existing names to compare against. + * @param existingNameList a collection of existing names to compare against. + * The collection will not be modified by the validator. */ - public ValidatorUserActionName(List existingNameList) + public ValidatorUserActionName(Collection existingNameList) { super(existingNameList, CASE_SENSITIVE); // case sensitive uniqueness init();