From 8c7ca4bd786e6cae70a092cd3eae75bb191b1167 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 16 Nov 2007 16:20:10 +0000 Subject: [PATCH] [210109] store constants in IFileService rather than IFileServiceConstants --- .../rse/internal/efs/RSEFileStoreImpl.java | 6 ++--- .../dstore/files/DStoreFileService.java | 14 ++++++------ .../services/files/ftp/FTPService.java | 4 ++-- .../local/files/LocalFileService.java | 14 ++++++------ .../services/ssh/files/SftpFileService.java | 4 ++-- .../services/files/AbstractFileService.java | 19 ++++++++-------- .../rse/services/files/IFileService.java | 5 +++++ .../services/files/IFileServiceConstants.java | 22 ------------------- .../CommandEntryContentAssistProcessor.java | 7 +++--- .../core/subsystems/RemoteFileSubSystem.java | 21 +++++++++--------- .../FileSubsystemConsistencyTestCase.java | 9 ++++---- 11 files changed, 56 insertions(+), 69 deletions(-) delete mode 100644 rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceConstants.java diff --git a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java index 6682819d0a3..3d84273413f 100644 --- a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java +++ b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java @@ -48,7 +48,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.services.files.IFileServiceConstants; +import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; @@ -350,7 +350,7 @@ public class RSEFileStoreImpl extends FileStore if (subSys instanceof FileServiceSubSystem) { FileServiceSubSystem fileServiceSubSystem = ((FileServiceSubSystem)subSys); - IHostFile[] results = fileServiceSubSystem.getFileService().list(remoteFile.getAbsolutePath(), "*", IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ + IHostFile[] results = fileServiceSubSystem.getFileService().list(remoteFile.getAbsolutePath(), "*", IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ IRemoteFileSubSystemConfiguration config = subSys.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$ filterString.setShowFiles(true); @@ -425,7 +425,7 @@ public class RSEFileStoreImpl extends FileStore if (subSys instanceof FileServiceSubSystem) { FileServiceSubSystem fileServiceSubSystem = ((FileServiceSubSystem)subSys); - IHostFile[] results = fileServiceSubSystem.getFileService().list(remoteFile.getAbsolutePath(), "*", IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ + IHostFile[] results = fileServiceSubSystem.getFileService().list(remoteFile.getAbsolutePath(), "*", IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ IRemoteFileSubSystemConfiguration config = subSys.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$ filterString.setShowFiles(true); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index 6981988180c..831510a2792 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -25,6 +25,7 @@ * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * David McKnight (IBM) - [209423] Fix for null pointer - filter attributes need unique ids * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.internal.services.dstore.files; @@ -68,7 +69,6 @@ import org.eclipse.rse.services.dstore.AbstractDStoreService; import org.eclipse.rse.services.dstore.util.DownloadListener; import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IFileServiceConstants; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileSecurityException; @@ -1608,15 +1608,15 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer String queryString = null; switch (fileType) { - case IFileServiceConstants.FILE_TYPE_FILES: + case IFileService.FILE_TYPE_FILES: queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES; break; - case IFileServiceConstants.FILE_TYPE_FOLDERS: + case IFileService.FILE_TYPE_FOLDERS: queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS; break; - case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: + case IFileService.FILE_TYPE_FILES_AND_FOLDERS: default: queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL; break; @@ -1631,15 +1631,15 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { switch (fileTypes[i]) { - case IFileServiceConstants.FILE_TYPE_FILES: + case IFileService.FILE_TYPE_FILES: queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES; break; - case IFileServiceConstants.FILE_TYPE_FOLDERS: + case IFileService.FILE_TYPE_FOLDERS: queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS; break; - case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: + case IFileService.FILE_TYPE_FILES_AND_FOLDERS: default: queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL; break; diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java index a7181e9fa93..723ffcc1693 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java @@ -66,6 +66,7 @@ * Javier Montalvo Orus (Symbian) - [187096] Drag&Drop + Copy&Paste shows error message on FTP connection * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * Javier Montalvo Orus (Symbian) - [208912] Cannot expand /C on a VxWorks SSH Server + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.internal.services.files.ftp; @@ -107,7 +108,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IFileServiceConstants; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileIOException; @@ -713,7 +713,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT if (name.equals(".") || name.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$ //Never return the default directory names continue; - } else if (f.isDirectory() && fileType!=IFileServiceConstants.FILE_TYPE_FOLDERS) { + } else if (f.isDirectory() && fileType!=IFileService.FILE_TYPE_FOLDERS) { //get ALL directory names (unless looking for folders only) results.add(f); } else if (filematcher.matches(name)) { diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index 3019336b5d8..8edaa8b7b1b 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -25,6 +25,7 @@ * Kevin Doyle (IBM) - [209355] Retrieving list of FILE_TYPE_FOLDERS should return Archive's * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * Xuan Chen (IBM) - [209828] Need to move the Create operation to a job. + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.internal.services.local.files; @@ -64,7 +65,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IFileServiceConstants; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileException; import org.eclipse.rse.services.files.RemoteFileIOException; @@ -174,7 +174,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic if (entry.isFile()) { result = _matcher.matches(name); } else if (entry.isDirectory()) { - if (type == IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS || type == IFileServiceConstants.FILE_TYPE_FOLDERS) { + if (type == IFileService.FILE_TYPE_FILES_AND_FOLDERS || type == IFileService.FILE_TYPE_FOLDERS) { result = true; } } @@ -744,19 +744,19 @@ public class LocalFileService extends AbstractFileService implements IFileServic File file = files[i]; if (file.isDirectory()) { - if (type == IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS || - type == IFileServiceConstants.FILE_TYPE_FOLDERS) + if (type == IFileService.FILE_TYPE_FILES_AND_FOLDERS || + type == IFileService.FILE_TYPE_FOLDERS) { results.add(new LocalHostFile(file)); } } else if (file.isFile()) { - if (type == IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS || - type == IFileServiceConstants.FILE_TYPE_FILES) + if (type == IFileService.FILE_TYPE_FILES_AND_FOLDERS || + type == IFileService.FILE_TYPE_FILES) { results.add(new LocalHostFile(file)); - } else if (type == IFileServiceConstants.FILE_TYPE_FOLDERS && + } else if (type == IFileService.FILE_TYPE_FOLDERS && ArchiveHandlerManager.getInstance().isArchive(file)) { // On Local Archive's should be considered Folders // as they are containers that can be opened. diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java index cffaa7d7cb0..532de2c29d9 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [203500] Support encodings for SSH Sftp paths * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * Martin Oberhuber (Wind River) - [208912] Cannot expand /C on a VxWorks SSH Server + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants *******************************************************************************/ package org.eclipse.rse.internal.services.ssh.files; @@ -63,7 +64,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IFileServiceConstants; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileIOException; @@ -461,7 +461,7 @@ public class SftpFileService extends AbstractFileService implements IFileService //don't show the trivial names continue; } - if (filematcher.matches(fileName) || (lsEntry.getAttrs().isDir() && fileType!=IFileServiceConstants.FILE_TYPE_FOLDERS)) { + if (filematcher.matches(fileName) || (lsEntry.getAttrs().isDir() && fileType!=IFileService.FILE_TYPE_FOLDERS)) { //get ALL directory names (unless looking for folders only) SftpHostFile node = makeHostFile(parentPath, fileName, lsEntry.getAttrs()); if (isRightType(fileType, node)) { diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java index c7c7459952f..9bfbc9c0805 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java @@ -16,6 +16,7 @@ * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.services.files; @@ -37,12 +38,12 @@ public abstract class AbstractFileService implements IFileService /* Bring constants for {@link #internalFetch(String, String, int, IProgressMonitor)} * into local namespace for backward compatibility with 2.x service implementations */ - /** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FILES_AND_FOLDERS} directly */ - public static final int FILE_TYPE_FILES_AND_FOLDERS = IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS; - /** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FILES} directly */ - public static final int FILE_TYPE_FILES = IFileServiceConstants.FILE_TYPE_FILES; - /** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FOLDERS} directly */ - public static final int FILE_TYPE_FOLDERS = IFileServiceConstants.FILE_TYPE_FOLDERS; + /** @deprecated use {@link IFileService#FILE_TYPE_FILES_AND_FOLDERS} directly */ + public static final int FILE_TYPE_FILES_AND_FOLDERS = IFileService.FILE_TYPE_FILES_AND_FOLDERS; + /** @deprecated use {@link IFileService#FILE_TYPE_FILES} directly */ + public static final int FILE_TYPE_FILES = IFileService.FILE_TYPE_FILES; + /** @deprecated use {@link IFileService#FILE_TYPE_FOLDERS} directly */ + public static final int FILE_TYPE_FOLDERS = IFileService.FILE_TYPE_FOLDERS; protected abstract IHostFile[] internalFetch(String parentPath, String fileFilter, int fileType, IProgressMonitor monitor) throws SystemMessageException; @@ -101,9 +102,9 @@ public abstract class AbstractFileService implements IFileService { switch (fileType) { - case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: + case IFileService.FILE_TYPE_FILES_AND_FOLDERS: return true; - case IFileServiceConstants.FILE_TYPE_FILES: + case IFileService.FILE_TYPE_FILES: if (node.isFile()) { return true; @@ -112,7 +113,7 @@ public abstract class AbstractFileService implements IFileService { return false; } - case IFileServiceConstants.FILE_TYPE_FOLDERS: + case IFileService.FILE_TYPE_FOLDERS: if (node.isDirectory()) { return true; diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java index 8e5113ab06b..fc6463e106e 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java @@ -18,6 +18,7 @@ * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.services.files; @@ -52,6 +53,10 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException; public interface IFileService extends IService { + public static final int FILE_TYPE_FILES = 1; + public static final int FILE_TYPE_FILES_AND_FOLDERS = 0; + public static final int FILE_TYPE_FOLDERS = 2; + /** * Copy a file to the remote file system. The remote target is denoted by a * string representing the parent and a string representing the file. diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceConstants.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceConstants.java deleted file mode 100644 index 894d784e0b6..00000000000 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceConstants.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2007 IBM Corporation. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight. - * - * Contributors: - * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems - ********************************************************************************/ -package org.eclipse.rse.services.files; - -public interface IFileServiceConstants { - - public static final int FILE_TYPE_FILES = 1; - public static final int FILE_TYPE_FILES_AND_FOLDERS = 0; - public static final int FILE_TYPE_FOLDERS = 2; - -} diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java index ee2a6a1b94c..3f63ceb76bc 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java @@ -15,6 +15,7 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -37,7 +38,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.services.files.IFileServiceConstants; +import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; @@ -514,7 +515,7 @@ public class CommandEntryContentAssistProcessor implements IContentAssistProcess } else { - fileList = parent.getParentRemoteFileSubSystem().list(parent, currentText + "*", IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ + fileList = parent.getParentRemoteFileSubSystem().list(parent, currentText + "*", IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); //$NON-NLS-1$ } @@ -571,7 +572,7 @@ public class CommandEntryContentAssistProcessor implements IContentAssistProcess { try { - fileList = workingDirectory.getParentRemoteFileSubSystem().list(workingDirectory, filterString, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); + fileList = workingDirectory.getParentRemoteFileSubSystem().list(workingDirectory, filterString, IFileService.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); } catch (SystemMessageException e) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java index 3f6b482f1ee..0a50beefc88 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java @@ -21,6 +21,7 @@ * David McKnight (IBM) - [196664] prevent unnecessary query on the parent * Rupen Mardirossian (IBM) - [204307] listFolders now deals with a null parameter for fileNameFilter preventing NPE * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -64,7 +65,7 @@ import org.eclipse.rse.services.clientserver.IMatcher; import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.services.files.IFileServiceConstants; +import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; @@ -658,17 +659,17 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi else if (hasFileContents) { // already have the files, now add the folders - list(parent, filter, IFileServiceConstants.FILE_TYPE_FOLDERS, monitor); + list(parent, filter, IFileService.FILE_TYPE_FOLDERS, monitor); } else if (hasFolderContents) { // already have the folders, now add the files - list(parent, filter, IFileServiceConstants.FILE_TYPE_FILES, monitor); + list(parent, filter, IFileService.FILE_TYPE_FILES, monitor); } else { // don't have anything - query both - list(parent, filter, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); + list(parent, filter, IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); } children = parent.getContents(RemoteChildrenContentsType.getInstance(), filter); } @@ -680,7 +681,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi } else { - children = list(parent, filter, IFileServiceConstants.FILE_TYPE_FOLDERS, monitor); + children = list(parent, filter, IFileService.FILE_TYPE_FOLDERS, monitor); } } else @@ -691,7 +692,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi } else { - children = list(parent, filter, IFileServiceConstants.FILE_TYPE_FILES, monitor); + children = list(parent, filter, IFileService.FILE_TYPE_FILES, monitor); } } } @@ -837,11 +838,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi { if (showDirs && showFiles) //children = listFoldersAndFiles((IRemoteFile)parent, filterString); - children = list((IRemoteFile) parent, filterString, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); + children = list((IRemoteFile) parent, filterString, IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); else if (showDirs) - children = list((IRemoteFile) parent, filterString, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); + children = list((IRemoteFile) parent, filterString, IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); else - children = list((IRemoteFile) parent, filterString, IFileServiceConstants.FILE_TYPE_FILES, monitor); + children = list((IRemoteFile) parent, filterString, IFileService.FILE_TYPE_FILES, monitor); if (sort && (children != null) && (children.length > 1)) Arrays.sort(children); } @@ -905,7 +906,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi */ public IRemoteFile[] list(IRemoteFile parent, IProgressMonitor monitor) throws SystemMessageException { - return list(parent, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, monitor); + return list(parent, IFileService.FILE_TYPE_FILES_AND_FOLDERS, monitor); } /** diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java index c582c663736..9b3c439aaf0 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java @@ -9,6 +9,7 @@ * David McKnight (IBM) - [207095] test case to compare same op between subsystems * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated + * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -25,7 +26,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.files.IFileServiceConstants; +import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.tests.RSETestsPlugin; @@ -272,7 +273,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase { try { - IRemoteFile[] children = ss.list(remoteFiles[q], IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); + IRemoteFile[] children = ss.list(remoteFiles[q], IFileService.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); for (int c = 0; c < children.length; c++) { consolidatedResults.add(children[c]); @@ -358,7 +359,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase long t3 = System.currentTimeMillis(); try { - results = ss.listMultiple(remoteFiles, IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); + results = ss.listMultiple(remoteFiles, IFileService.FILE_TYPE_FILES_AND_FOLDERS, new NullProgressMonitor()); } catch (Exception e){ exception = e; @@ -450,7 +451,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase IRemoteFile includeDir = ss.getRemoteFileObject(remoteParentDir, monitor); // get all the files - IRemoteFile[] files = ss.list(includeDir, IFileServiceConstants.FILE_TYPE_FILES, monitor); + IRemoteFile[] files = ss.list(includeDir, IFileService.FILE_TYPE_FILES, monitor); System.out.println(systemType + ": downloading "+files.length+ " files");