diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java index 4fe2b72fe84..2018d0de13d 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolManager.java @@ -629,6 +629,7 @@ public class SystemFilterPoolManager extends RSEPersistableObject implements ISy */ public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type, boolean promptable) throws Exception { String[] filterStringsArray = new String[filterStrings.size()]; + filterStrings.toArray(filterStringsArray); ISystemFilter result = doCreateSystemFilter(parent, aliasName, filterStringsArray, type, promptable); return result; } @@ -637,8 +638,7 @@ public class SystemFilterPoolManager extends RSEPersistableObject implements ISy * @see org.eclipse.rse.core.filters.ISystemFilterPoolManager#createSystemFilter(org.eclipse.rse.core.filters.ISystemFilterContainer, java.lang.String, java.util.List, java.lang.String) */ public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type) throws Exception { - String[] filterStringsArray = new String[filterStrings.size()]; - ISystemFilter result = doCreateSystemFilter(parent, aliasName, filterStringsArray, type, false); + ISystemFilter result = createSystemFilter(parent, aliasName, filterStrings, type, false); return result; } @@ -646,11 +646,10 @@ public class SystemFilterPoolManager extends RSEPersistableObject implements ISy * @see org.eclipse.rse.core.filters.ISystemFilterPoolManager#createSystemFilter(org.eclipse.rse.core.filters.ISystemFilterContainer, java.lang.String, java.util.List) */ public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings) throws Exception { - String[] filterStringsArray = new String[filterStrings.size()]; - ISystemFilter result = doCreateSystemFilter(parent, aliasName, filterStringsArray, null, false); + ISystemFilter result = createSystemFilter(parent, aliasName, filterStrings, null, false); return result; } - + /** * Creates a new system filter within the given filter container (either a filter pool, or * a filter). This creates the filter, and then saves the filter pool. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java index e5c9dd80a2b..bebe682751d 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java @@ -16,10 +16,10 @@ * Martin Oberhuber (Wind River) - [189130] Move SystemIFileProperties from UI to Core * Martin Oberhuber (Wind River) - [189123] Move renameSubSystemProfile() from UI to Core * David Dykstal (IBM) - [197036] fixed NPE found during testing + * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; -import java.util.Vector; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -228,7 +228,6 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur * Return true if you support user-defined actions for the remote system objects returned from expansion of * subsystems created by this subsystem factory. *

We return true. - * @see #createActionSubSystem() */ public boolean supportsUserDefinedActions() { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java index 5a95a7b7e6d..d90f42c3ce0 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java @@ -13,12 +13,11 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin + * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters *******************************************************************************/ package org.eclipse.rse.subsystems.files.dstore; -import java.util.Vector; - import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java index c5d40bc4ed1..71b5e36b69c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java @@ -15,12 +15,11 @@ * Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files * Kevin Doyle (IBM) - [199871] LocalFileService needs to implement getMessage() * Martin Oberhuber (Wind River) - [220020][api][breaking] SystemFileTransferModeRegistry should be internal + * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters ********************************************************************************/ package org.eclipse.rse.subsystems.files.local; -import java.util.Vector; - import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.model.IHost; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java index 48e02605be0..d0f0c96552f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java @@ -12,12 +12,11 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin + * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters ********************************************************************************/ package org.eclipse.rse.subsystems.processes.core.subsystem.impl; -import java.util.Vector; - import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java index 84980873d7b..a0d15d92945 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java @@ -13,6 +13,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin + * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters *******************************************************************************/ package org.eclipse.rse.ui.filters.dialogs; @@ -629,14 +630,12 @@ public class SystemNewFilterWizard * @throws Exception if an error occurs */ public ISystemFilter createNewFilter(Shell shell, ISystemFilterContainer filterParent, String aliasName, Vector filterStringsVector, String type) throws Exception { - String[] filterStrings = new String[filterStringsVector.size()]; - filterStringsVector.toArray(filterStrings); ISystemFilter newFilter = null; ISystemFilterPoolManager fpMgr = filterParent.getSystemFilterPoolManager(); if (type == null) - newFilter = fpMgr.createSystemFilter(filterParent, aliasName, filterStrings); + newFilter = fpMgr.createSystemFilter(filterParent, aliasName, filterStringsVector); else - newFilter = fpMgr.createSystemFilter(filterParent, aliasName, filterStrings, type); + newFilter = fpMgr.createSystemFilter(filterParent, aliasName, filterStringsVector, type); return newFilter; }