1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 12:35:22 +02:00

removing compile warnings

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

View file

@ -187,7 +187,8 @@ public class DataStoreSchema
// miner-specific descriptors are defined in the miners when they extend the schema
// 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);
_objectDescriptor = _dataStore.createObjectDescriptor(schemaRoot, DE.T_OBJECT_DESCRIPTOR);
@ -207,16 +208,21 @@ public class DataStoreSchema
DataElement logD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_log);
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
DataElement allD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_all);
DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
DataElement patternD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern);
// DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
_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 outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
// DataElement inputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
// DataElement outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
// types of relationships
_contents = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_contents);
@ -291,8 +297,10 @@ public class DataStoreSchema
DataElement minersD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miners);
DataElement minerD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miner);
DataElement dataD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_data);
DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
// DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
// DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
// containers
_dataStore.createReference(_container, rootD, _abstracts, _abstractedBy);
_dataStore.createReference(_container, hostD, _abstracts, _abstractedBy);

View file

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

View file

@ -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"))

View file

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

View file

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

View file

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

View file

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

View file

@ -29,13 +29,11 @@ import java.util.HashMap;
import java.util.Map;
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.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreAttributes;
import org.eclipse.dstore.core.model.DataStoreResources;
import org.eclipse.dstore.core.model.IDataStoreConstants;
import org.eclipse.dstore.core.model.IDataStoreProvider;
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
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.IHostFile;
public class DStoreFileService extends AbstractDStoreService implements IFileService, IUniversalDataStoreConstants
{
@ -189,7 +183,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
try
{
DataElement uploadLog = findUploadLog();
// DataElement uploadLog = findUploadLog();
findUploadLog();
// listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog);
// 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);
// 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));
String tempRoot = getDataStoreRoot();
// String tempRoot = getDataStoreRoot();
getDataStoreRoot();
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)
{
String src = srcParent + getSeparator(srcParent) + srcName;
String tgt = tgtParent + getSeparator(tgtParent) + tgtName;
boolean isVirtual = ArchiveHandlerManager.isVirtual(src) || ArchiveHandlerManager.isVirtual(tgt);
// String src = srcParent + getSeparator(srcParent) + srcName;
// String tgt = tgtParent + getSeparator(tgtParent) + tgtName;
// boolean isVirtual = ArchiveHandlerManager.isVirtual(src) || ArchiveHandlerManager.isVirtual(tgt);
//if (isVirtual || isArchive)
{
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)) {
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
@ -1050,7 +1047,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
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

View file

@ -64,7 +64,8 @@ public class DStoreFileTransferStatusListener extends StatusChangeListener
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
{