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

[210109] store constants in IFileService rather than IFileServiceConstants

Browse source
This commit is contained in:
David McKnight 2007-11-16 16:20:10 +00:00
parent 2eed2f80e3
commit 8c7ca4bd78
11 changed files with 56 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java
View file

@ -48,7 +48,7 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; 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.services.files.IHostFile;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
@ -350,7 +350,7 @@ public class RSEFileStoreImpl extends FileStore
if (subSys instanceof FileServiceSubSystem) { if (subSys instanceof FileServiceSubSystem) {
FileServiceSubSystem fileServiceSubSystem = ((FileServiceSubSystem)subSys); 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(); IRemoteFileSubSystemConfiguration config = subSys.getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$ RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$
filterString.setShowFiles(true); filterString.setShowFiles(true);
@ -425,7 +425,7 @@ public class RSEFileStoreImpl extends FileStore
if (subSys instanceof FileServiceSubSystem) { if (subSys instanceof FileServiceSubSystem) {
FileServiceSubSystem fileServiceSubSystem = ((FileServiceSubSystem)subSys); 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(); IRemoteFileSubSystemConfiguration config = subSys.getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$ RemoteFileFilterString filterString = new RemoteFileFilterString(config, remoteFile.getAbsolutePath(), "*"); //$NON-NLS-1$
filterString.setShowFiles(true); filterString.setShowFiles(true);

14
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -25,6 +25,7 @@
* David McKnight (IBM) - [162195] new APIs for upload multi and download multi * 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) - [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) - [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; 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.DownloadListener;
import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil; import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil;
import org.eclipse.rse.services.files.IFileService; 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.IHostFile;
import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.services.files.RemoteFileSecurityException;
@ -1608,15 +1608,15 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
String queryString = null; String queryString = null;
switch (fileType) switch (fileType)
{ {
case IFileServiceConstants.FILE_TYPE_FILES: case IFileService.FILE_TYPE_FILES:
queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES; queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES;
break; break;
case IFileServiceConstants.FILE_TYPE_FOLDERS: case IFileService.FILE_TYPE_FOLDERS:
queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS; queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS;
break; break;
case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: case IFileService.FILE_TYPE_FILES_AND_FOLDERS:
default: default:
queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL; queryString = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL;
break; break;
@ -1631,15 +1631,15 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{ {
switch (fileTypes[i]) switch (fileTypes[i])
{ {
case IFileServiceConstants.FILE_TYPE_FILES: case IFileService.FILE_TYPE_FILES:
queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES; queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FILES;
break; break;
case IFileServiceConstants.FILE_TYPE_FOLDERS: case IFileService.FILE_TYPE_FOLDERS:
queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS; queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_FOLDERS;
break; break;
case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: case IFileService.FILE_TYPE_FILES_AND_FOLDERS:
default: default:
queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL; queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_VIEW_ALL;
break; break;

4
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
View file

@ -66,6 +66,7 @@
* Javier Montalvo Orus (Symbian) - [187096] Drag&Drop + Copy&Paste shows error message on FTP connection * 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 * 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 * 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; 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.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.AbstractFileService;
import org.eclipse.rse.services.files.IFileService; 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.IHostFile;
import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileIOException; 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$ if (name.equals(".") || name.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$
//Never return the default directory names //Never return the default directory names
continue; 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) //get ALL directory names (unless looking for folders only)
results.add(f); results.add(f);
} else if (filematcher.matches(name)) { } else if (filematcher.matches(name)) {

14
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
View file

@ -25,6 +25,7 @@
* Kevin Doyle (IBM) - [209355] Retrieving list of FILE_TYPE_FOLDERS should return Archive's * 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) - [160775] [api] rename (at least within a zip) blocks UI thread
* Xuan Chen (IBM) - [209828] Need to move the Create operation to a job. * 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; 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.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.AbstractFileService;
import org.eclipse.rse.services.files.IFileService; 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.IHostFile;
import org.eclipse.rse.services.files.RemoteFileException; import org.eclipse.rse.services.files.RemoteFileException;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
@ -174,7 +174,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
if (entry.isFile()) { if (entry.isFile()) {
result = _matcher.matches(name); result = _matcher.matches(name);
} else if (entry.isDirectory()) { } 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; result = true;
} }
} }
@ -744,19 +744,19 @@ public class LocalFileService extends AbstractFileService implements IFileServic
File file = files[i]; File file = files[i];
if (file.isDirectory()) if (file.isDirectory())
{ {
if (type == IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS || if (type == IFileService.FILE_TYPE_FILES_AND_FOLDERS ||
type == IFileServiceConstants.FILE_TYPE_FOLDERS) type == IFileService.FILE_TYPE_FOLDERS)
{ {
results.add(new LocalHostFile(file)); results.add(new LocalHostFile(file));
} }
} }
else if (file.isFile()) else if (file.isFile())
{ {
if (type == IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS || if (type == IFileService.FILE_TYPE_FILES_AND_FOLDERS ||
type == IFileServiceConstants.FILE_TYPE_FILES) type == IFileService.FILE_TYPE_FILES)
{ {
results.add(new LocalHostFile(file)); results.add(new LocalHostFile(file));
} else if (type == IFileServiceConstants.FILE_TYPE_FOLDERS && } else if (type == IFileService.FILE_TYPE_FOLDERS &&
ArchiveHandlerManager.getInstance().isArchive(file)) { ArchiveHandlerManager.getInstance().isArchive(file)) {
// On Local Archive's should be considered Folders // On Local Archive's should be considered Folders
// as they are containers that can be opened. // as they are containers that can be opened.

4
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [203500] Support encodings for SSH Sftp paths * Martin Oberhuber (Wind River) - [203500] Support encodings for SSH Sftp paths
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * 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 * 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; 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.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.AbstractFileService;
import org.eclipse.rse.services.files.IFileService; 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.IHostFile;
import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
@ -461,7 +461,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
//don't show the trivial names //don't show the trivial names
continue; 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) //get ALL directory names (unless looking for folders only)
SftpHostFile node = makeHostFile(parentPath, fileName, lsEntry.getAttrs()); SftpHostFile node = makeHostFile(parentPath, fileName, lsEntry.getAttrs());
if (isRightType(fileType, node)) { if (isRightType(fileType, node)) {

19
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java
View file

@ -16,6 +16,7 @@
* David McKnight (IBM) - [162195] new APIs for upload multi and download multi * 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 * 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) - [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; 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)} /* Bring constants for {@link #internalFetch(String, String, int, IProgressMonitor)}
* into local namespace for backward compatibility with 2.x service implementations * into local namespace for backward compatibility with 2.x service implementations
*/ */
/** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FILES_AND_FOLDERS} directly */ /** @deprecated use {@link IFileService#FILE_TYPE_FILES_AND_FOLDERS} directly */
public static final int FILE_TYPE_FILES_AND_FOLDERS = IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS; public static final int FILE_TYPE_FILES_AND_FOLDERS = IFileService.FILE_TYPE_FILES_AND_FOLDERS;
/** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FILES} directly */ /** @deprecated use {@link IFileService#FILE_TYPE_FILES} directly */
public static final int FILE_TYPE_FILES = IFileServiceConstants.FILE_TYPE_FILES; public static final int FILE_TYPE_FILES = IFileService.FILE_TYPE_FILES;
/** @deprecated use {@link IFileServiceConstants#FILE_TYPE_FOLDERS} directly */ /** @deprecated use {@link IFileService#FILE_TYPE_FOLDERS} directly */
public static final int FILE_TYPE_FOLDERS = IFileServiceConstants.FILE_TYPE_FOLDERS; 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; 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) switch (fileType)
{ {
case IFileServiceConstants.FILE_TYPE_FILES_AND_FOLDERS: case IFileService.FILE_TYPE_FILES_AND_FOLDERS:
return true; return true;
case IFileServiceConstants.FILE_TYPE_FILES: case IFileService.FILE_TYPE_FILES:
if (node.isFile()) if (node.isFile())
{ {
return true; return true;
@ -112,7 +113,7 @@ public abstract class AbstractFileService implements IFileService
{ {
return false; return false;
} }
case IFileServiceConstants.FILE_TYPE_FOLDERS: case IFileService.FILE_TYPE_FOLDERS:
if (node.isDirectory()) if (node.isDirectory())
{ {
return true; return true;

5
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java
View file

@ -18,6 +18,7 @@
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * 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) - [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) - [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; package org.eclipse.rse.services.files;
@ -52,6 +53,10 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
public interface IFileService extends IService 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 * 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. * string representing the parent and a string representing the file.

22
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceConstants.java
View file

@ -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;
}

7
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
* Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui * 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) - [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; 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.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin; import org.eclipse.rse.internal.shells.ui.ShellsUIPlugin;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; 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.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
@ -514,7 +515,7 @@ public class CommandEntryContentAssistProcessor implements IContentAssistProcess
} }
else 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 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) catch (SystemMessageException e)
{ {

21
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -21,6 +21,7 @@
* David McKnight (IBM) - [196664] prevent unnecessary query on the parent * 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 * 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) - [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; 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.NamePatternMatcher;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; 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.IHostSearchResult;
import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
@ -658,17 +659,17 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
else if (hasFileContents) else if (hasFileContents)
{ {
// already have the files, now add the folders // 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) else if (hasFolderContents)
{ {
// already have the folders, now add the files // 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 else
{ {
// don't have anything - query both // 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); children = parent.getContents(RemoteChildrenContentsType.getInstance(), filter);
} }
@ -680,7 +681,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
} }
else else
{ {
children = list(parent, filter, IFileServiceConstants.FILE_TYPE_FOLDERS, monitor); children = list(parent, filter, IFileService.FILE_TYPE_FOLDERS, monitor);
} }
} }
else else
@ -691,7 +692,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
} }
else 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) if (showDirs && showFiles)
//children = listFoldersAndFiles((IRemoteFile)parent, filterString); //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) 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 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)) if (sort && (children != null) && (children.length > 1))
Arrays.sort(children); Arrays.sort(children);
} }
@ -905,7 +906,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/ */
public IRemoteFile[] list(IRemoteFile parent, IProgressMonitor monitor) throws SystemMessageException 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);
} }
/** /**

9
rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java
View file

@ -9,6 +9,7 @@
* David McKnight (IBM) - [207095] test case to compare same op between subsystems * 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) - [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) - [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; 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.model.SystemStartHere;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.files.IFileService; 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.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.tests.RSETestsPlugin; import org.eclipse.rse.tests.RSETestsPlugin;
@ -272,7 +273,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase
{ {
try 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++) for (int c = 0; c < children.length; c++)
{ {
consolidatedResults.add(children[c]); consolidatedResults.add(children[c]);
@ -358,7 +359,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase
long t3 = System.currentTimeMillis(); long t3 = System.currentTimeMillis();
try 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){ catch (Exception e){
exception = e; exception = e;
@ -450,7 +451,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase
IRemoteFile includeDir = ss.getRemoteFileObject(remoteParentDir, monitor); IRemoteFile includeDir = ss.getRemoteFileObject(remoteParentDir, monitor);
// get all the files // 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"); System.out.println(systemType + ": downloading "+files.length+ " files");