mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 08:13:50 +02:00
Code Issues Wiki Activity

[165891] windows local part of the fix

Browse source
This commit is contained in:
David McKnight 2006-12-05 17:01:34 +00:00
parent 3aae0ca9b2
commit 237173d2de
1 changed files with 75 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,6 +185,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".upload()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".upload()"); //$NON-NLS-1$
else
return handler.add(stream, child.path, remoteFile, SystemEncodingUtil.ENCODING_UTF_8, hostEncoding, !isBinary); return handler.add(stream, child.path, remoteFile, SystemEncodingUtil.ENCODING_UTF_8, hostEncoding, !isBinary);
} }
if (ArchiveHandlerManager.getInstance().isArchive(destinationFile)) if (ArchiveHandlerManager.getInstance().isArchive(destinationFile))
@ -192,6 +193,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = ArchiveHandlerManager.getInstance().getRegisteredHandler(destinationFile); ISystemArchiveHandler handler = ArchiveHandlerManager.getInstance().getRegisteredHandler(destinationFile);
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$
else
return handler.add(stream, "", remoteFile, SystemEncodingUtil.ENCODING_UTF_8, hostEncoding, !isBinary); //$NON-NLS-1$ return handler.add(stream, "", remoteFile, SystemEncodingUtil.ENCODING_UTF_8, hostEncoding, !isBinary); //$NON-NLS-1$
} }
@ -221,16 +223,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
byte[] buffer = new byte[512000]; byte[] buffer = new byte[512000];
int readCount = 0; int readCount = 0;
int available = bufInputStream.available();
while( (readCount = bufInputStream.read(buffer)) > 0 && !isCancelled) while( (readCount = bufInputStream.read(buffer)) > 0 && !isCancelled)
{ {
if (isEncodingConversionRequired) if (isEncodingConversionRequired && bufWriter != null)
{ {
String s = new String(buffer, 0, readCount, hostEncoding); String s = new String(buffer, 0, readCount, hostEncoding);
bufWriter.write(s); bufWriter.write(s);
} }
else else if (bufOutputStream != null)
{ {
bufOutputStream.write(buffer, 0,readCount); bufOutputStream.write(buffer, 0,readCount);
} }
@ -353,12 +353,12 @@ public class LocalFileService extends AbstractFileService implements IFileServic
// need to convert encoding, i.e. text file, but not xml // need to convert encoding, i.e. text file, but not xml
// ensure we read in file using the encoding for the file system // ensure we read in file using the encoding for the file system
// which can be specified by user as text file encoding in preferences // which can be specified by user as text file encoding in preferences
if (isEncodingConversionRequired) if (isEncodingConversionRequired && bufWriter != null)
{ {
String s = new String(buffer, 0, bytesRead, hostEncoding); String s = new String(buffer, 0, bytesRead, hostEncoding);
bufWriter.write(s); bufWriter.write(s);
} }
else else if (bufOutputStream != null)
{ {
bufOutputStream.write(buffer, 0, bytesRead); bufOutputStream.write(buffer, 0, bytesRead);
} }
@ -408,13 +408,13 @@ public class LocalFileService extends AbstractFileService implements IFileServic
{ {
// throw new RemoteFileCancelledException(); // throw new RemoteFileCancelledException();
return false; return false;
} else if (destinationFile!=null && file.exists()) { } else if (file.exists()) {
destinationFile.setLastModified(file.lastModified()); destinationFile.setLastModified(file.lastModified());
//TODO check if we want to preserve permissions //TODO check if we want to preserve permissions
//if(!file.canWrite()) destinationFile.setReadOnly(); //if(!file.canWrite()) destinationFile.setReadOnly();
if (destinationFile.length() != file.length()) { if (destinationFile.length() != file.length()) {
// throw new RemoteFileCancelledException(); // throw new RemoteFileCancelledException();
System.err.println("local.upload: size mismach on "+destinationFile.getAbsolutePath()); System.err.println("local.upload: size mismach on "+destinationFile.getAbsolutePath()); //$NON-NLS-1$
return false; return false;
} }
} }
@ -442,6 +442,8 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = virtualChild.getHandler(); ISystemArchiveHandler handler = virtualChild.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$
else
{
if (file.isDirectory()) if (file.isDirectory())
{ {
ok = handler.add(file, path, newName, sourceEncoding, targetEncoding, _fileTypeRegistry); ok = handler.add(file, path, newName, sourceEncoding, targetEncoding, _fileTypeRegistry);
@ -451,11 +453,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ok = handler.add(file, path, newName, sourceEncoding, targetEncoding, isText); ok = handler.add(file, path, newName, sourceEncoding, targetEncoding, isText);
} }
} }
}
else if (ArchiveHandlerManager.getInstance().isArchive(destination)) else if (ArchiveHandlerManager.getInstance().isArchive(destination))
{ {
ISystemArchiveHandler handler = ArchiveHandlerManager.getInstance().getRegisteredHandler(destination); ISystemArchiveHandler handler = ArchiveHandlerManager.getInstance().getRegisteredHandler(destination);
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".copyToArchive()"); //$NON-NLS-1$
else
{
if (file.isDirectory()) if (file.isDirectory())
{ {
ok = handler.add(file, "", newName, sourceEncoding, targetEncoding, _fileTypeRegistry); //$NON-NLS-1$ ok = handler.add(file, "", newName, sourceEncoding, targetEncoding, _fileTypeRegistry); //$NON-NLS-1$
@ -465,6 +470,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ok = handler.add(file, "", newName, sourceEncoding, targetEncoding, isText); //$NON-NLS-1$ ok = handler.add(file, "", newName, sourceEncoding, targetEncoding, isText); //$NON-NLS-1$
} }
} }
}
if (!ok) if (!ok)
{ {
// SystemPlugin.logError("LocalFileSubSystemImpl.copyToArchive(): Handler's add() method returned false."); // SystemPlugin.logError("LocalFileSubSystemImpl.copyToArchive(): Handler's add() method returned false.");
@ -540,11 +546,12 @@ public class LocalFileService extends AbstractFileService implements IFileServic
break; break;
} }
if (isEncodingConversionRequired) { if (isEncodingConversionRequired && bufWriter != null) {
String s = new String(buffer, 0, bytesRead, srcEncoding); String s = new String(buffer, 0, bytesRead, srcEncoding);
bufWriter.write(s); bufWriter.write(s);
} }
else { else if (bufOutputStream != null)
{
bufOutputStream.write(buffer, 0, bytesRead); bufOutputStream.write(buffer, 0, bytesRead);
} }
@ -589,7 +596,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
//if(!localFile.canWrite()) destinationFile.setReadOnly(); //if(!localFile.canWrite()) destinationFile.setReadOnly();
if (destinationFile.length() != localFile.length()) { if (destinationFile.length() != localFile.length()) {
// throw new RemoteFileCancelledException(); // throw new RemoteFileCancelledException();
System.err.println("local.upload: size mismach on "+destinationFile.getAbsolutePath()); System.err.println("local.upload: size mismach on "+destinationFile.getAbsolutePath()); //$NON-NLS-1$
return false; return false;
} }
} }
@ -610,7 +617,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
try { try {
localParent = localParent.getCanonicalFile(); localParent = localParent.getCanonicalFile();
} catch (IOException e) { } catch (IOException e) {
System.out.println("Can not get canonical path: " + localParent.getAbsolutePath()); System.out.println("Can not get canonical path: " + localParent.getAbsolutePath()); //$NON-NLS-1$
} }
} }
if (remoteParent.endsWith(ArchiveHandlerManager.VIRTUAL_SEPARATOR)) { if (remoteParent.endsWith(ArchiveHandlerManager.VIRTUAL_SEPARATOR)) {
@ -754,7 +761,6 @@ public class LocalFileService extends AbstractFileService implements IFileServic
{ {
file = new File(remoteParent, name); file = new File(remoteParent, name);
} }
File parent = file.getParentFile();
return new LocalHostFile(file); return new LocalHostFile(file);
} }
else else
@ -819,11 +825,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".createFileInArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".createFileInArchive()"); //$NON-NLS-1$
else
{
if (!handler.createFile(child.fullName)) if (!handler.createFile(child.fullName))
{ {
//SystemPlugin.logError("LocalFileSubSystemImpl.createFileInArchive(): Archive Handler's createFile method returned false. Couldn't create virtual object."); //SystemPlugin.logError("LocalFileSubSystemImpl.createFileInArchive(): Archive Handler's createFile method returned false. Couldn't create virtual object.");
throw new SystemMessageException(getMessage("RSEG1124").makeSubstitution(newFile)); //$NON-NLS-1$ throw new SystemMessageException(getMessage("RSEG1124").makeSubstitution(newFile)); //$NON-NLS-1$
} }
}
return new LocalVirtualHostFile(child); return new LocalVirtualHostFile(child);
} }
@ -869,7 +878,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".createFolderInArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".createFolderInArchive()"); //$NON-NLS-1$
if (!handler.createFolder(child.fullName)) else if (!handler.createFolder(child.fullName))
{ {
// SystemPlugin.logError("LocalFileSubSystemImpl.createFolderInArchive(): Archive Handler's createFolder method returned false. Couldn't create virtual object."); // SystemPlugin.logError("LocalFileSubSystemImpl.createFolderInArchive(): Archive Handler's createFolder method returned false. Couldn't create virtual object.");
throw new SystemMessageException(getMessage("RSEG1124").makeSubstitution(newFolder)); //$NON-NLS-1$ throw new SystemMessageException(getMessage("RSEG1124").makeSubstitution(newFolder)); //$NON-NLS-1$
@ -936,7 +945,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".deleteFromArchive()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".deleteFromArchive()"); //$NON-NLS-1$
if (!handler.delete(child.fullName)) else if (!handler.delete(child.fullName))
{ {
// SystemPlugin.logError("LocalFileSubSystemImpl.deleteFromArchive(): Archive Handler's delete method returned false. Couldn't delete virtual object."); // SystemPlugin.logError("LocalFileSubSystemImpl.deleteFromArchive(): Archive Handler's delete method returned false. Couldn't delete virtual object.");
throw new SystemMessageException(getMessage("RSEG1125").makeSubstitution(destination)); //$NON-NLS-1$ throw new SystemMessageException(getMessage("RSEG1125").makeSubstitution(destination)); //$NON-NLS-1$
@ -974,21 +983,27 @@ public class LocalFileService extends AbstractFileService implements IFileServic
* *
* @param destination virtual file to rename * @param destination virtual file to rename
* @param newName the new name of the virtual file * @param newName the new name of the virtual file
* @return * @return whether the operation was successful or not
*/ */
protected boolean renameVirtualFile(File destination, String newName) throws SystemMessageException protected boolean renameVirtualFile(File destination, String newName) throws SystemMessageException
{ {
VirtualChild child = ArchiveHandlerManager.getInstance().getVirtualObject(destination.getAbsolutePath()); VirtualChild child = ArchiveHandlerManager.getInstance().getVirtualObject(destination.getAbsolutePath());
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
{
throwCorruptArchiveException(this.getClass() + ".renameVirtualFile()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".renameVirtualFile()"); //$NON-NLS-1$
}
else
{
boolean retval = handler.rename(child.fullName, newName); boolean retval = handler.rename(child.fullName, newName);
if (!retval) if (!retval)
{ {
// SystemPlugin.logError("LocalFileSubSystemImpl.renameVirtualFile(): Archive Handler's rename method returned false. Couldn't rename virtual object."); // SystemPlugin.logError("LocalFileSubSystemImpl.renameVirtualFile(): Archive Handler's rename method returned false. Couldn't rename virtual object.");
throw new SystemMessageException(getMessage("RSEG1127").makeSubstitution(child.fullName)); //$NON-NLS-1$ throw new SystemMessageException(getMessage("RSEG1127").makeSubstitution(child.fullName)); //$NON-NLS-1$
} }
else return retval; return retval;
}
return false;
} }
public boolean move(IProgressMonitor monitor, String srcParent, String srcName, String tgtParent, String tgtName) throws SystemMessageException public boolean move(IProgressMonitor monitor, String srcParent, String srcName, String tgtParent, String tgtName) throws SystemMessageException
@ -1069,7 +1084,23 @@ public class LocalFileService extends AbstractFileService implements IFileServic
command = "xcopy " + src + " " + target + " /S /E /K /Q /H /I"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ command = "xcopy " + src + " " + target + " /S /E /K /Q /H /I"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} }
else else
command = _osCmdShell + "copy " + src + " " + target; //$NON-NLS-1$ //$NON-NLS-2$ {
//command = _osCmdShell + "copy " + src + " " + target; //$NON-NLS-1$ //$NON-NLS-2$
// create target first so that not prompted
File targetFile = new File(tgtBuf.toString());
if (!targetFile.exists())
{
// create file so as to avoid ambiguity
try
{
targetFile.createNewFile();
}
catch (Exception e)
{
}
}
command = _osCmdShell + "xcopy " + src + " " + target + " /Y /K /O /Q /H"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
} }
else else
{ {
@ -1189,7 +1220,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
catch (IOException e) catch (IOException e)
{ {
// SystemPlugin.logError("LocalFileSubSystemImpl.copy(): Could not create temp file.", e); // SystemPlugin.logError("LocalFileSubSystemImpl.copy(): Could not create temp file.", e);
throw new SystemMessageException(getMessage("Copy failed")); throw new SystemMessageException(getMessage("Copy failed")); //$NON-NLS-1$
} }
tempSource.delete(); tempSource.delete();
if (!tempSource.mkdir()) if (!tempSource.mkdir())
@ -1200,6 +1231,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
ISystemArchiveHandler handler = child.getHandler(); ISystemArchiveHandler handler = child.getHandler();
if (handler == null) if (handler == null)
throwCorruptArchiveException(this.getClass() + ".copy()"); //$NON-NLS-1$ throwCorruptArchiveException(this.getClass() + ".copy()"); //$NON-NLS-1$
else
handler.extractVirtualDirectory(child.fullName, tempSource, sourceEncoding, isText); handler.extractVirtualDirectory(child.fullName, tempSource, sourceEncoding, isText);
src = tempSource.getAbsolutePath() + File.separatorChar + child.name; src = tempSource.getAbsolutePath() + File.separatorChar + child.name;
} }