diff options
Diffstat (limited to 'rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners')
6 files changed, 115 insertions, 104 deletions
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java index 7e2ef21e7..f2e182fe2 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java @@ -22,8 +22,10 @@ public class UniversalServerUtilities { 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 diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java index dbbda403c..94c3e9b71 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMiner.java @@ -134,8 +134,10 @@ public class CommandMiner extends Miner DataElement shellD = createCommandDescriptor(fsD, "Shell", "C_SHELL", false); _dataStore.createReference(cancellable, shellD, "abstracts", "abstracted by"); - DataElement inputD = _dataStore.createObject(cmdD, "input", "Enter command"); - DataElement outputD = _dataStore.createObject(cmdD, "output", "Command Output"); +// DataElement inputD = _dataStore.createObject(cmdD, "input", "Enter command"); + _dataStore.createObject(cmdD, "input", "Enter command"); +// DataElement outputD = _dataStore.createObject(cmdD, "output", "Command Output"); + _dataStore.createObject(cmdD, "output", "Command Output"); _descriptors = new CommandMinerDescriptors(); _descriptors._stdout = _dataStore.createObjectDescriptor(schemaRoot, "stdout"); @@ -151,7 +153,8 @@ public class CommandMiner extends Miner _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); } @@ -189,7 +192,8 @@ public class CommandMiner extends Miner else if (name.equals("C_SEND_INPUT")) { 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)); } else if (name.equals("C_CANCEL")) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMinerThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMinerThread.java index 0efb70452..9587a7c3a 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMinerThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/CommandMinerThread.java @@ -403,42 +403,42 @@ public class CommandMinerThread extends MinerThread } - private String[] parseArgs(String full) - { - StringBuffer result = new StringBuffer(); - char[] chars = full.toCharArray(); - boolean inQuotes = false; - boolean escaping = false; - for (int i = 0; i < chars.length; i++) - { - char c = chars[i]; - if (c == '\"') - { - inQuotes = !inQuotes; - } - else - { - if (c == '\\') - { - escaping = true; - } - else - { - if (c == ' ') - { - if (!inQuotes && !escaping) - { - c = ','; - } - escaping = false; - } - } - result.append(c); - } - - } - return result.toString().split(","); - } +// private String[] parseArgs(String full) +// { +// StringBuffer result = new StringBuffer(); +// char[] chars = full.toCharArray(); +// boolean inQuotes = false; +// boolean escaping = false; +// for (int i = 0; i < chars.length; i++) +// { +// char c = chars[i]; +// if (c == '\"') +// { +// inQuotes = !inQuotes; +// } +// else +// { +// if (c == '\\') +// { +// escaping = true; +// } +// else +// { +// if (c == ' ') +// { +// if (!inQuotes && !escaping) +// { +// c = ','; +// } +// escaping = false; +// } +// } +// result.append(c); +// } +// +// } +// return result.toString().split(","); +// } public Process getProcess() { @@ -498,7 +498,8 @@ public class CommandMinerThread extends MinerThread if (!_isDone) { - byte[] intoout = input.getBytes(); +// byte[] intoout = input.getBytes(); + input.getBytes(); try { @@ -538,8 +539,8 @@ public class CommandMinerThread extends MinerThread else { - String cwd = getCWD(); - String line = cwd + ">" + input; +// String cwd = getCWD(); +// String line = cwd + ">" + input; //createObject("prompt", line); //createPrompt(line, cwd); } @@ -935,7 +936,7 @@ public class CommandMinerThread extends MinerThread // special processing String statement = line.substring(1); String pair[] = statement.split("="); - String key = pair[0]; +// String key = pair[0]; String value = pair[1]; _status.setAttribute(DE.A_SOURCE, value); @@ -976,7 +977,7 @@ public class CommandMinerThread extends MinerThread try { String fileName = parsedMsg.file; - DataElement object = null; +// DataElement object = null; if (parsedMsg.type.equals("prompt")) { File promptFile = new File(fileName); @@ -991,11 +992,13 @@ public class CommandMinerThread extends MinerThread } 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 { - 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)); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/OutputHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/OutputHandler.java index ac3b938b7..ddf9015a4 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/OutputHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/command/OutputHandler.java @@ -36,7 +36,7 @@ public class OutputHandler extends Handler private CommandMinerThread _commandThread; private boolean _isShell; - private static int MAX_OFFSET = 10000; +// private static int MAX_OFFSET = 10000; private boolean _endOfStream = false; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalDownloadHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalDownloadHandler.java index 62e783791..5c4a1ef92 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalDownloadHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalDownloadHandler.java @@ -135,18 +135,20 @@ public class UniversalDownloadHandler extends Thread implements ICancellableHand } 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(); String localPath = arg2.getName(); boolean isText = (mode == IUniversalDataStoreConstants.TEXT_MODE); - String clientEncoding = null; +// String clientEncoding = null; if (isText) { - clientEncoding = arg2.getSource(); +// clientEncoding = arg2.getSource(); + arg2.getSource(); } // Read in the file diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java index 60c716ebf..3fecf0501 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java @@ -53,19 +53,19 @@ public class UniversalFileSystemMiner extends Miner implements public static final String MINER_ID = UniversalFileSystemMiner.class.getName(); - private DataElement deUFSfilters; +// private DataElement deUFSfilters; private DataElement deUFSnode; - private DataElement deUFStemp; +// private DataElement deUFStemp; 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 deUniversalFolderObject; @@ -188,7 +188,8 @@ public class UniversalFileSystemMiner extends Miner implements "C_SEARCH - subject is null", null); } else if ("C_CANCEL".equals(name)) { if (subject != null) { - String commandToCancel = subject.getName(); +// String commandToCancel = subject.getName(); + subject.getName(); return handleCancel(subject, status); } else UniversalServerUtilities.logError(CLASSNAME, @@ -672,7 +673,8 @@ public class UniversalFileSystemMiner extends Miner implements boolean isIncludeArchives = Boolean.valueOf(arg3.getType()).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( textString, isCaseSensitive, isTextRegex, fileNamesString, @@ -1018,7 +1020,8 @@ private DataElement createDataElementFromLSString(DataElement subject, * Method to list the roots. */ 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; if (System.getProperty("os.name").toLowerCase().startsWith("windows")) { @@ -2423,14 +2426,12 @@ private DataElement createDataElementFromLSString(DataElement subject, */ public void load() { // Create datastore tree structure for UniversalFileSystemMiner - deUFSnode = _dataStore.createObject(_minerData, - UNIVERSAL_NODE_DESCRIPTOR, "universal.node"); - deUFStemp = _dataStore.createObject(deUFSnode, - UNIVERSAL_NODE_DESCRIPTOR, "universal.temp"); - deUFSfilters = _dataStore.createObject(deUFSnode, - UNIVERSAL_NODE_DESCRIPTOR, "universal.filters"); - deUFSuploadlog = _dataStore.createObject(deUFSnode, - UNIVERSAL_NODE_DESCRIPTOR, "universal.uploadlog"); + deUFSnode = _dataStore.createObject(_minerData, UNIVERSAL_NODE_DESCRIPTOR, "universal.node"); +// deUFStemp = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.temp"); + _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.temp"); +// deUFSfilters = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.filters"); + _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.filters"); + deUFSuploadlog = _dataStore.createObject(deUFSnode, UNIVERSAL_NODE_DESCRIPTOR, "universal.uploadlog"); UniversalByteStreamHandler universalHandler = new UniversalByteStreamHandler(_dataStore, deUFSuploadlog); @@ -2580,10 +2581,10 @@ private DataElement createDataElementFromLSString(DataElement subject, * @see Miner#extendSchema(DataElement) */ public void extendSchema(DataElement schemaRoot) { - DataElement root = _dataStore.find(schemaRoot, DE.A_NAME, - DataStoreResources.model_root, 1); - DataElement snode = createObjectDescriptor(schemaRoot, - UNIVERSAL_NODE_DESCRIPTOR); +// DataElement root = _dataStore.find(schemaRoot, DE.A_NAME, DataStoreResources.model_root, 1); + _dataStore.find(schemaRoot, DE.A_NAME, DataStoreResources.model_root, 1); +// DataElement snode = createObjectDescriptor(schemaRoot, UNIVERSAL_NODE_DESCRIPTOR); + createObjectDescriptor(schemaRoot, UNIVERSAL_NODE_DESCRIPTOR); DataElement tempnode = createObjectDescriptor(schemaRoot, UNIVERSAL_TEMP_DESCRIPTOR); @@ -2665,8 +2666,8 @@ private DataElement createDataElementFromLSString(DataElement subject, "C_SET_LASTMODIFIED"); createCommandDescriptor(deUniversalFileObject, "GetAdvanceProperty", "C_QUERY_ADVANCE_PROPERTY"); - dePropertyQuery = createCommandDescriptor(deUniversalFileObject, - "GetBasicProperty", "C_QUERY_BASIC_PROPERTY"); +// dePropertyQuery = createCommandDescriptor(deUniversalFileObject, "GetBasicProperty", "C_QUERY_BASIC_PROPERTY"); + createCommandDescriptor(deUniversalFileObject, "GetBasicProperty", "C_QUERY_BASIC_PROPERTY"); createCommandDescriptor(deUniversalFileObject, "GetcanWriteProperty", "C_QUERY_CAN_WRITE_PROPERTY"); @@ -2688,12 +2689,10 @@ private DataElement createDataElementFromLSString(DataElement subject, createCommandDescriptor(deUniversalFolderObject, "GetcanWriteProperty", "C_QUERY_CAN_WRITE_PROPERTY"); - deFileClassificationQuery = createCommandDescriptor( - deUniversalFileObject, "GetFileClassifications", - "C_QUERY_FILE_CLASSIFICATIONS"); - deFolderClassificationQuery = createCommandDescriptor( - deUniversalFolderObject, "GetFolderClassifications", - "C_QUERY_FILE_CLASSIFICATION"); +// deFileClassificationQuery = createCommandDescriptor(deUniversalFileObject, "GetFileClassifications", "C_QUERY_FILE_CLASSIFICATIONS"); + createCommandDescriptor(deUniversalFileObject, "GetFileClassifications", "C_QUERY_FILE_CLASSIFICATIONS"); +// deFolderClassificationQuery = createCommandDescriptor(deUniversalFolderObject, "GetFolderClassifications", "C_QUERY_FILE_CLASSIFICATION"); + createCommandDescriptor(deUniversalFolderObject, "GetFolderClassifications", "C_QUERY_FILE_CLASSIFICATION"); createCommandDescriptor(deUniversalFolderObject, "Exists", "C_QUERY_EXISTS"); createCommandDescriptor(deUniversalFolderObject, "CreateNewFile", @@ -2862,28 +2861,27 @@ private DataElement createDataElementFromLSString(DataElement subject, } } - private DataElement findExistingVirtual(DataElement subject, - VirtualChild vchild) { - String name = vchild.name; - for (int i = 0; i < subject.getNestedSize(); i++) { - DataElement child = subject.get(i); - String deName = child.getName(); - if (name.equals(deName)) { - if (vchild.isDirectory) { - if (child.getType().equals( - UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) { - return child; - } - } else { - if (child.getType().equals( - UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR)) { - return child; - } - } - } - } - return null; - } +// private DataElement findExistingVirtual(DataElement subject, VirtualChild vchild) { +// String name = vchild.name; +// for (int i = 0; i < subject.getNestedSize(); i++) { +// DataElement child = subject.get(i); +// String deName = child.getName(); +// if (name.equals(deName)) { +// if (vchild.isDirectory) { +// if (child.getType().equals( +// UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) { +// return child; +// } +// } else { +// if (child.getType().equals( +// UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR)) { +// return child; +// } +// } +// } +// } +// return null; +// } public ISystemArchiveHandler getArchiveHandlerFor(String archivePath) { File file = new File(archivePath); @@ -2905,7 +2903,8 @@ private DataElement createDataElementFromLSString(DataElement subject, status.setAttribute(DE.A_SOURCE, FAILED); return statusDone(status); } - VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); +// VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); + handler.getVirtualFile(vpath.getVirtualPart()); handler.createFile(vpath.getVirtualPart()); status.setAttribute(DE.A_SOURCE, SUCCESS); @@ -2938,7 +2937,8 @@ private DataElement createDataElementFromLSString(DataElement subject, status.setAttribute(DE.A_SOURCE, FAILED); return statusDone(status); } - VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); +// VirtualChild child = handler.getVirtualFile(vpath.getVirtualPart()); + handler.getVirtualFile(vpath.getVirtualPart()); handler.createFolder(vpath.getVirtualPart()); status.setAttribute(DE.A_SOURCE, SUCCESS); |