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

removing compile warnings

Browse source
This commit is contained in:
David Dykstal 2006-06-21 16:03:48 +00:00
parent e7cdb7ee94
commit 3a3ba45922
9 changed files with 144 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java
View file

@ -187,7 +187,8 @@ public class DataStoreSchema
// miner-specific descriptors are defined in the miners when they extend the schema // miner-specific descriptors are defined in the miners when they extend the schema
// these first elements are the most fundamental // these first elements are the most fundamental
DataElement uiCmdD = _dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR); // DataElement uiCmdD = _dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
_dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
_commandDescriptor = _dataStore.createCommandDescriptor(schemaRoot, DE.T_COMMAND_DESCRIPTOR); _commandDescriptor = _dataStore.createCommandDescriptor(schemaRoot, DE.T_COMMAND_DESCRIPTOR);
_objectDescriptor = _dataStore.createObjectDescriptor(schemaRoot, DE.T_OBJECT_DESCRIPTOR); _objectDescriptor = _dataStore.createObjectDescriptor(schemaRoot, DE.T_OBJECT_DESCRIPTOR);
@ -207,16 +208,21 @@ public class DataStoreSchema
DataElement logD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_log); DataElement logD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_log);
DataElement statusD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_status); DataElement statusD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_status);
DataElement deletedD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted); // DataElement deletedD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted);
// misc // misc
DataElement allD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_all); DataElement allD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_all);
DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation); // DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
DataElement patternD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern); _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
// DataElement patternD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern);
DataElement inputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input); // DataElement inputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
DataElement outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output); _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
// DataElement outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
// types of relationships // types of relationships
_contents = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_contents); _contents = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_contents);
@ -291,8 +297,10 @@ public class DataStoreSchema
DataElement minersD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miners); DataElement minersD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miners);
DataElement minerD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miner); DataElement minerD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miner);
DataElement dataD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_data); DataElement dataD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_data);
DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient); // DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state); _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
// DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
// containers // containers
_dataStore.createReference(_container, rootD, _abstracts, _abstractedBy); _dataStore.createReference(_container, rootD, _abstracts, _abstractedBy);
_dataStore.createReference(_container, hostD, _abstracts, _abstractedBy); _dataStore.createReference(_container, hostD, _abstracts, _abstractedBy);

4
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java
View file

@ -22,8 +22,10 @@ public class UniversalServerUtilities {
private static String _userPreferencesDirectory = null; private static String _userPreferencesDirectory = null;
private static ServerLogger log = new ServerLogger(getUserPreferencesDirectory());
static {
new ServerLogger(getUserPreferencesDirectory());
}
/** /**
* getUserPreferencesDirectory() - returns directory on IFS where to store user settings * getUserPreferencesDirectory() - returns directory on IFS where to store user settings

12
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java
View file

@ -134,8 +134,10 @@ public class CommandMiner extends Miner
DataElement shellD = createCommandDescriptor(fsD, "Shell", "C_SHELL", false); DataElement shellD = createCommandDescriptor(fsD, "Shell", "C_SHELL", false);
_dataStore.createReference(cancellable, shellD, "abstracts", "abstracted by"); _dataStore.createReference(cancellable, shellD, "abstracts", "abstracted by");
DataElement inputD = _dataStore.createObject(cmdD, "input", "Enter command"); // DataElement inputD = _dataStore.createObject(cmdD, "input", "Enter command");
DataElement outputD = _dataStore.createObject(cmdD, "output", "Command Output"); _dataStore.createObject(cmdD, "input", "Enter command");
// DataElement outputD = _dataStore.createObject(cmdD, "output", "Command Output");
_dataStore.createObject(cmdD, "output", "Command Output");
_descriptors = new CommandMinerDescriptors(); _descriptors = new CommandMinerDescriptors();
_descriptors._stdout = _dataStore.createObjectDescriptor(schemaRoot, "stdout"); _descriptors._stdout = _dataStore.createObjectDescriptor(schemaRoot, "stdout");
@ -151,7 +153,8 @@ public class CommandMiner extends Miner
_descriptors._process =_dataStore.createObjectDescriptor(schemaRoot, "process"); _descriptors._process =_dataStore.createObjectDescriptor(schemaRoot, "process");
DataElement getPossibleCmds = createCommandDescriptor(fsD, "Get Commands", "C_GET_POSSIBLE_COMMANDS", false); // DataElement getPossibleCmds = createCommandDescriptor(fsD, "Get Commands", "C_GET_POSSIBLE_COMMANDS", false);
createCommandDescriptor(fsD, "Get Commands", "C_GET_POSSIBLE_COMMANDS", false);
_dataStore.refresh(schemaRoot); _dataStore.refresh(schemaRoot);
} }
@ -189,7 +192,8 @@ public class CommandMiner extends Miner
else if (name.equals("C_SEND_INPUT")) else if (name.equals("C_SEND_INPUT"))
{ {
DataElement input = getCommandArgument(theElement, 1); DataElement input = getCommandArgument(theElement, 1);
DataElement de = (DataElement) subject.dereference().get(1); // DataElement de = (DataElement) subject.dereference().get(1);
subject.dereference().get(1);
sendInputToCommand(input.getName(), getCommandStatus(subject)); sendInputToCommand(input.getName(), getCommandStatus(subject));
} }
else if (name.equals("C_CANCEL")) else if (name.equals("C_CANCEL"))

89
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMinerThread.java
View file

@ -403,42 +403,42 @@ public class CommandMinerThread extends MinerThread
} }
private String[] parseArgs(String full) // private String[] parseArgs(String full)
{ // {
StringBuffer result = new StringBuffer(); // StringBuffer result = new StringBuffer();
char[] chars = full.toCharArray(); // char[] chars = full.toCharArray();
boolean inQuotes = false; // boolean inQuotes = false;
boolean escaping = false; // boolean escaping = false;
for (int i = 0; i < chars.length; i++) // for (int i = 0; i < chars.length; i++)
{ // {
char c = chars[i]; // char c = chars[i];
if (c == '\"') // if (c == '\"')
{ // {
inQuotes = !inQuotes; // inQuotes = !inQuotes;
} // }
else // else
{ // {
if (c == '\\') // if (c == '\\')
{ // {
escaping = true; // escaping = true;
} // }
else // else
{ // {
if (c == ' ') // if (c == ' ')
{ // {
if (!inQuotes && !escaping) // if (!inQuotes && !escaping)
{ // {
c = ','; // c = ',';
} // }
escaping = false; // escaping = false;
} // }
} // }
result.append(c); // result.append(c);
} // }
//
} // }
return result.toString().split(","); // return result.toString().split(",");
} // }
public Process getProcess() public Process getProcess()
{ {
@ -498,7 +498,8 @@ public class CommandMinerThread extends MinerThread
if (!_isDone) if (!_isDone)
{ {
byte[] intoout = input.getBytes(); // byte[] intoout = input.getBytes();
input.getBytes();
try try
{ {
@ -538,8 +539,8 @@ public class CommandMinerThread extends MinerThread
else else
{ {
String cwd = getCWD(); // String cwd = getCWD();
String line = cwd + ">" + input; // String line = cwd + ">" + input;
//createObject("prompt", line); //createObject("prompt", line);
//createPrompt(line, cwd); //createPrompt(line, cwd);
} }
@ -935,7 +936,7 @@ public class CommandMinerThread extends MinerThread
// special processing // special processing
String statement = line.substring(1); String statement = line.substring(1);
String pair[] = statement.split("="); String pair[] = statement.split("=");
String key = pair[0]; // String key = pair[0];
String value = pair[1]; String value = pair[1];
_status.setAttribute(DE.A_SOURCE, value); _status.setAttribute(DE.A_SOURCE, value);
@ -976,7 +977,7 @@ public class CommandMinerThread extends MinerThread
try try
{ {
String fileName = parsedMsg.file; String fileName = parsedMsg.file;
DataElement object = null; // DataElement object = null;
if (parsedMsg.type.equals("prompt")) if (parsedMsg.type.equals("prompt"))
{ {
File promptFile = new File(fileName); File promptFile = new File(fileName);
@ -991,11 +992,13 @@ public class CommandMinerThread extends MinerThread
} }
else if (parsedMsg.type.equals("file")) else if (parsedMsg.type.equals("file"))
{ {
object = createObject(parsedMsg.type, line, fileName, null); // object = createObject(parsedMsg.type, line, fileName, null);
createObject(parsedMsg.type, line, fileName, null);
} }
else else
{ {
object = createObject(parsedMsg.type, line, fileName, new Integer(parsedMsg.line)); // object = createObject(parsedMsg.type, line, fileName, new Integer(parsedMsg.line));
createObject(parsedMsg.type, line, fileName, new Integer(parsedMsg.line));
} }
} }

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/OutputHandler.java
View file

@ -36,7 +36,7 @@ public class OutputHandler extends Handler
private CommandMinerThread _commandThread; private CommandMinerThread _commandThread;
private boolean _isShell; private boolean _isShell;
private static int MAX_OFFSET = 10000; // private static int MAX_OFFSET = 10000;
private boolean _endOfStream = false; private boolean _endOfStream = false;

8
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalDownloadHandler.java
View file

@ -135,18 +135,20 @@ public class UniversalDownloadHandler extends Thread implements ICancellableHand
} }
DataElement arg2 = _miner.getCommandArgument(theElement, 2); DataElement arg2 = _miner.getCommandArgument(theElement, 2);
DataElement arg3 = _miner.getCommandArgument(theElement, 3); // DataElement arg3 = _miner.getCommandArgument(theElement, 3);
_miner.getCommandArgument(theElement, 3);
int mode = (Integer.valueOf(arg1.getSource())).intValue(); int mode = (Integer.valueOf(arg1.getSource())).intValue();
String localPath = arg2.getName(); String localPath = arg2.getName();
boolean isText = (mode == IUniversalDataStoreConstants.TEXT_MODE); boolean isText = (mode == IUniversalDataStoreConstants.TEXT_MODE);
String clientEncoding = null; // String clientEncoding = null;
if (isText) if (isText)
{ {
clientEncoding = arg2.getSource(); // clientEncoding = arg2.getSource();
arg2.getSource();
} }
// Read in the file // Read in the file

104
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java
View file

@ -53,19 +53,19 @@ public class UniversalFileSystemMiner extends Miner implements
public static final String MINER_ID = UniversalFileSystemMiner.class.getName(); public static final String MINER_ID = UniversalFileSystemMiner.class.getName();
private DataElement deUFSfilters; // private DataElement deUFSfilters;
private DataElement deUFSnode; private DataElement deUFSnode;
private DataElement deUFStemp; // private DataElement deUFStemp;
private DataElement deUFSuploadlog; private DataElement deUFSuploadlog;
private DataElement dePropertyQuery; // private DataElement dePropertyQuery;
private DataElement deFileClassificationQuery; // private DataElement deFileClassificationQuery;
private DataElement deFolderClassificationQuery; // private DataElement deFolderClassificationQuery;
private DataElement deUniversalFileObject; private DataElement deUniversalFileObject;
private DataElement deUniversalFolderObject; private DataElement deUniversalFolderObject;
@ -188,7 +188,8 @@ public class UniversalFileSystemMiner extends Miner implements
"C_SEARCH - subject is null", null); "C_SEARCH - subject is null", null);
} else if ("C_CANCEL".equals(name)) { } else if ("C_CANCEL".equals(name)) {
if (subject != null) { if (subject != null) {
String commandToCancel = subject.getName(); // String commandToCancel = subject.getName();
subject.getName();
return handleCancel(subject, status); return handleCancel(subject, status);
} else } else
UniversalServerUtilities.logError(CLASSNAME, UniversalServerUtilities.logError(CLASSNAME,
@ -672,7 +673,8 @@ public class UniversalFileSystemMiner extends Miner implements
boolean isIncludeArchives = Boolean.valueOf(arg3.getType()).booleanValue(); boolean isIncludeArchives = Boolean.valueOf(arg3.getType()).booleanValue();
boolean isIncludeSubfolders = Boolean.valueOf(arg3.getName()).booleanValue(); boolean isIncludeSubfolders = Boolean.valueOf(arg3.getName()).booleanValue();
boolean showHidden = Boolean.valueOf(arg3.getSource()).booleanValue(); // boolean showHidden = Boolean.valueOf(arg3.getSource()).booleanValue();
Boolean.valueOf(arg3.getSource()).booleanValue();
SystemSearchString searchString = new SystemSearchString( SystemSearchString searchString = new SystemSearchString(
textString, isCaseSensitive, isTextRegex, fileNamesString, textString, isCaseSensitive, isTextRegex, fileNamesString,
@ -1018,7 +1020,8 @@ private DataElement createDataElementFromLSString(DataElement subject,
* Method to list the roots. * Method to list the roots.
*/ */
public DataElement handleQueryRoots(DataElement subject, DataElement status) { public DataElement handleQueryRoots(DataElement subject, DataElement status) {
File fileobj = new File(subject.getName()); // File fileobj = new File(subject.getName());
new File(subject.getName());
DataElement deObj = null; DataElement deObj = null;
if (System.getProperty("os.name").toLowerCase().startsWith("windows")) { if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
@ -2423,14 +2426,12 @@ private DataElement createDataElementFromLSString(DataElement subject,
*/ */
public void load() { public void load() {
// Create datastore tree structure for UniversalFileSystemMiner // Create datastore tree structure for UniversalFileSystemMiner
deUFSnode = _dataStore.createObject(_minerData, deUFSnode = _dataStore.createObject(_minerData, UNIVERSAL_NODE_DESCRIPTOR, "universal.node");
UNIVERSAL_NODE_DESCRIPTOR, "universal.node"); // deUFStemp = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.temp");
deUFStemp = _dataStore.createObject(deUFSnode, _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.temp");
UNIVERSAL_NODE_DESCRIPTOR, "universal.temp"); // deUFSfilters = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.filters");
deUFSfilters = _dataStore.createObject(deUFSnode, _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.filters");
UNIVERSAL_NODE_DESCRIPTOR, "universal.filters"); deUFSuploadlog = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.uploadlog");
deUFSuploadlog = _dataStore.createObject(deUFSnode,
UNIVERSAL_NODE_DESCRIPTOR, "universal.uploadlog");
UniversalByteStreamHandler universalHandler = new UniversalByteStreamHandler(_dataStore, deUFSuploadlog); UniversalByteStreamHandler universalHandler = new UniversalByteStreamHandler(_dataStore, deUFSuploadlog);
@ -2580,10 +2581,10 @@ private DataElement createDataElementFromLSString(DataElement subject,
* @see Miner#extendSchema(DataElement) * @see Miner#extendSchema(DataElement)
*/ */
public void extendSchema(DataElement schemaRoot) { public void extendSchema(DataElement schemaRoot) {
DataElement root = _dataStore.find(schemaRoot, DE.A_NAME, // DataElement root = _dataStore.find(schemaRoot, DE.A_NAME, DataStoreResources.model_root, 1);
DataStoreResources.model_root, 1); _dataStore.find(schemaRoot, DE.A_NAME, DataStoreResources.model_root, 1);
DataElement snode = createObjectDescriptor(schemaRoot, // DataElement snode = createObjectDescriptor(schemaRoot, UNIVERSAL_NODE_DESCRIPTOR);
UNIVERSAL_NODE_DESCRIPTOR); createObjectDescriptor(schemaRoot, UNIVERSAL_NODE_DESCRIPTOR);
DataElement tempnode = createObjectDescriptor(schemaRoot, DataElement tempnode = createObjectDescriptor(schemaRoot,
UNIVERSAL_TEMP_DESCRIPTOR); UNIVERSAL_TEMP_DESCRIPTOR);
@ -2665,8 +2666,8 @@ private DataElement createDataElementFromLSString(DataElement subject,
"C_SET_LASTMODIFIED"); "C_SET_LASTMODIFIED");
createCommandDescriptor(deUniversalFileObject, "GetAdvanceProperty", createCommandDescriptor(deUniversalFileObject, "GetAdvanceProperty",
"C_QUERY_ADVANCE_PROPERTY"); "C_QUERY_ADVANCE_PROPERTY");
dePropertyQuery = createCommandDescriptor(deUniversalFileObject, // dePropertyQuery = createCommandDescriptor(deUniversalFileObject, "GetBasicProperty", "C_QUERY_BASIC_PROPERTY");
"GetBasicProperty", "C_QUERY_BASIC_PROPERTY"); createCommandDescriptor(deUniversalFileObject, "GetBasicProperty", "C_QUERY_BASIC_PROPERTY");
createCommandDescriptor(deUniversalFileObject, "GetcanWriteProperty", createCommandDescriptor(deUniversalFileObject, "GetcanWriteProperty",
"C_QUERY_CAN_WRITE_PROPERTY"); "C_QUERY_CAN_WRITE_PROPERTY");
@ -2688,12 +2689,10 @@ private DataElement createDataElementFromLSString(DataElement subject,
createCommandDescriptor(deUniversalFolderObject, "GetcanWriteProperty", createCommandDescriptor(deUniversalFolderObject, "GetcanWriteProperty",
"C_QUERY_CAN_WRITE_PROPERTY"); "C_QUERY_CAN_WRITE_PROPERTY");
deFileClassificationQuery = createCommandDescriptor( // deFileClassificationQuery = createCommandDescriptor(deUniversalFileObject, "GetFileClassifications", "C_QUERY_FILE_CLASSIFICATIONS");
deUniversalFileObject, "GetFileClassifications", createCommandDescriptor(deUniversalFileObject, "GetFileClassifications", "C_QUERY_FILE_CLASSIFICATIONS");
"C_QUERY_FILE_CLASSIFICATIONS"); // deFolderClassificationQuery = createCommandDescriptor(deUniversalFolderObject, "GetFolderClassifications", "C_QUERY_FILE_CLASSIFICATION");
deFolderClassificationQuery = createCommandDescriptor( createCommandDescriptor(deUniversalFolderObject, "GetFolderClassifications", "C_QUERY_FILE_CLASSIFICATION");
deUniversalFolderObject, "GetFolderClassifications",
"C_QUERY_FILE_CLASSIFICATION");
createCommandDescriptor(deUniversalFolderObject, "Exists", createCommandDescriptor(deUniversalFolderObject, "Exists",
"C_QUERY_EXISTS"); "C_QUERY_EXISTS");
createCommandDescriptor(deUniversalFolderObject, "CreateNewFile", createCommandDescriptor(deUniversalFolderObject, "CreateNewFile",
@ -2862,28 +2861,27 @@ private DataElement createDataElementFromLSString(DataElement subject,
} }
} }
private DataElement findExistingVirtual(DataElement subject, // private DataElement findExistingVirtual(DataElement subject, VirtualChild vchild) {
VirtualChild vchild) { // String name = vchild.name;
String name = vchild.name; // for (int i = 0; i < subject.getNestedSize(); i++) {
for (int i = 0; i < subject.getNestedSize(); i++) { // DataElement child = subject.get(i);
DataElement child = subject.get(i); // String deName = child.getName();
String deName = child.getName(); // if (name.equals(deName)) {
if (name.equals(deName)) { // if (vchild.isDirectory) {
if (vchild.isDirectory) { // if (child.getType().equals(
if (child.getType().equals( // UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) {
UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) { // return child;
return child; // }
} // } else {
} else { // if (child.getType().equals(
if (child.getType().equals( // UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR)) {
UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR)) { // return child;
return child; // }
} // }
} // }
} // }
} // return null;
return null; // }
}
public ISystemArchiveHandler getArchiveHandlerFor(String archivePath) { public ISystemArchiveHandler getArchiveHandlerFor(String archivePath) {
File file = new File(archivePath); File file = new File(archivePath);
@ -2905,7 +2903,8 @@ private DataElement createDataElementFromLSString(DataElement subject,
status.setAttribute(DE.A_SOURCE, FAILED); status.setAttribute(DE.A_SOURCE, FAILED);
return statusDone(status); return statusDone(status);
} }
VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); // VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart());
handler.getVirtualFile(vpath.getVirtualPart());
handler.createFile(vpath.getVirtualPart()); handler.createFile(vpath.getVirtualPart());
status.setAttribute(DE.A_SOURCE, SUCCESS); status.setAttribute(DE.A_SOURCE, SUCCESS);
@ -2938,7 +2937,8 @@ private DataElement createDataElementFromLSString(DataElement subject,
status.setAttribute(DE.A_SOURCE, FAILED); status.setAttribute(DE.A_SOURCE, FAILED);
return statusDone(status); return statusDone(status);
} }
VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); // VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart());
handler.getVirtualFile(vpath.getVirtualPart());
handler.createFolder(vpath.getVirtualPart()); handler.createFolder(vpath.getVirtualPart());
status.setAttribute(DE.A_SOURCE, SUCCESS); status.setAttribute(DE.A_SOURCE, SUCCESS);

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

@ -29,13 +29,11 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreAttributes; import org.eclipse.dstore.core.model.DataStoreAttributes;
import org.eclipse.dstore.core.model.DataStoreResources; import org.eclipse.dstore.core.model.DataStoreResources;
import org.eclipse.dstore.core.model.IDataStoreConstants;
import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.dstore.core.model.IDataStoreProvider;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler; import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler;
@ -53,10 +51,6 @@ 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.IHostFile; import org.eclipse.rse.services.files.IHostFile;
public class DStoreFileService extends AbstractDStoreService implements IFileService, IUniversalDataStoreConstants public class DStoreFileService extends AbstractDStoreService implements IFileService, IUniversalDataStoreConstants
{ {
@ -189,7 +183,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
try try
{ {
DataElement uploadLog = findUploadLog(); // DataElement uploadLog = findUploadLog();
findUploadLog();
// listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog); // listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog);
// ds.getDomainNotifier().addDomainListener(listener); // ds.getDomainNotifier().addDomainListener(listener);
@ -358,7 +353,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
DataElement uploadLog = findUploadLog(); // DataElement uploadLog = findUploadLog();
findUploadLog();
// listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog); // listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog);
// ds.getDomainNotifier().addDomainListener(listener); // ds.getDomainNotifier().addDomainListener(listener);
@ -596,7 +592,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
DataElement remoteElement = ds.createObject(universaltemp, de.getType(), remotePath, String.valueOf(mode)); DataElement remoteElement = ds.createObject(universaltemp, de.getType(), remotePath, String.valueOf(mode));
String tempRoot = getDataStoreRoot(); // String tempRoot = getDataStoreRoot();
getDataStoreRoot();
String dataStoreLocalPath = prepareForDownload(localFile.getAbsolutePath()); String dataStoreLocalPath = prepareForDownload(localFile.getAbsolutePath());
@ -863,9 +860,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
public boolean move(IProgressMonitor monitor, String srcParent, String srcName, String tgtParent, String tgtName) public boolean move(IProgressMonitor monitor, String srcParent, String srcName, String tgtParent, String tgtName)
{ {
String src = srcParent + getSeparator(srcParent) + srcName; // String src = srcParent + getSeparator(srcParent) + srcName;
String tgt = tgtParent + getSeparator(tgtParent) + tgtName; // String tgt = tgtParent + getSeparator(tgtParent) + tgtName;
boolean isVirtual = ArchiveHandlerManager.isVirtual(src) || ArchiveHandlerManager.isVirtual(tgt); // boolean isVirtual = ArchiveHandlerManager.isVirtual(src) || ArchiveHandlerManager.isVirtual(tgt);
//if (isVirtual || isArchive) //if (isVirtual || isArchive)
{ {
if (copy(monitor, srcParent, srcName, tgtParent, tgtName)) if (copy(monitor, srcParent, srcName, tgtParent, tgtName))
@ -1000,7 +997,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
if (status.getAttribute(DE.A_SOURCE).equals(FAILED)) { if (status.getAttribute(DE.A_SOURCE).equals(FAILED)) {
String errMsg = status.getAttribute(DE.A_VALUE); // String errMsg = status.getAttribute(DE.A_VALUE);
/* /*
// for an unexpected error, we don't have an error message from the server // for an unexpected error, we don't have an error message from the server
@ -1050,7 +1047,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
if (status.getAttribute(DE.A_SOURCE).equals(FAILED)) { if (status.getAttribute(DE.A_SOURCE).equals(FAILED)) {
String errMsg = status.getAttribute(DE.A_VALUE); // String errMsg = status.getAttribute(DE.A_VALUE);
/* /*
// for an unexpected error, we don't have an error message from the server // for an unexpected error, we don't have an error message from the server

3
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreFileTransferStatusListener.java
View file

@ -64,7 +64,8 @@ public class DStoreFileTransferStatusListener extends StatusChangeListener
DataElement cmd = ds.findCommandDescriptor(DataStoreSchema.C_SET); DataElement cmd = ds.findCommandDescriptor(DataStoreSchema.C_SET);
DataElement setstatus = ds.command(cmd, _log, true); // DataElement setstatus = ds.command(cmd, _log, true);
ds.command(cmd, _log, true);
/* /*
try try
{ {