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

[199854] Fix regressions in unit tests

Browse source
This commit is contained in:
Martin Oberhuber 2008-05-07 06:53:48 +00:00
parent e00d3e5182
commit ad14cc2ddf
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,6 +523,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
handler.add(file, path, newName, sourceEncoding, targetEncoding, isText, archiveOperationMonitor); handler.add(file, path, newName, sourceEncoding, targetEncoding, isText, archiveOperationMonitor);
} }
} catch (SystemMessageException e) { } catch (SystemMessageException e) {
//e.printStackTrace();
if (null != monitor && monitor.isCanceled()) if (null != monitor && monitor.isCanceled())
{ {
//This operation has been cancelled by the user. //This operation has been cancelled by the user.
@ -1192,7 +1193,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
// for 192705, we need to throw an exception when rename fails // for 192705, we need to throw an exception when rename fails
String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, child.fullName); String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, child.fullName);
//String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS; //String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS;
e.printStackTrace(); //e.printStackTrace();
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED, ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED,
IStatus.ERROR, IStatus.ERROR,

5
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
View file

@ -1120,6 +1120,7 @@ public class SystemTarHandler implements ISystemArchiveHandler {
if (exists(fullVirtualName, archiveOperationMonitor)) { if (exists(fullVirtualName, archiveOperationMonitor)) {
replace(fullVirtualName, file, name, archiveOperationMonitor); replace(fullVirtualName, file, name, archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return;
} }
else { else {
File[] files = new File[1]; File[] files = new File[1];
@ -1128,6 +1129,7 @@ public class SystemTarHandler implements ISystemArchiveHandler {
names[0] = name; names[0] = name;
add(files, virtualPath, names, archiveOperationMonitor); add(files, virtualPath, names, archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return;
} }
} }
else { else {
@ -1157,6 +1159,7 @@ public class SystemTarHandler implements ISystemArchiveHandler {
add(sources, virtualPath, newNames, archiveOperationMonitor); add(sources, virtualPath, newNames, archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return;
} }
} }
} }
@ -1228,6 +1231,7 @@ public class SystemTarHandler implements ISystemArchiveHandler {
replace(fullVirtualName, files[i], names[i], archiveOperationMonitor); replace(fullVirtualName, files[i], names[i], archiveOperationMonitor);
setArchiveOperationMonitorStatusDone(archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor);
return;
} }
} }
@ -1670,6 +1674,7 @@ public class SystemTarHandler implements ISystemArchiveHandler {
// if the virtual file does not exist, we actually want to add // if the virtual file does not exist, we actually want to add
if (!exists(fullVirtualName, archiveOperationMonitor)) { if (!exists(fullVirtualName, archiveOperationMonitor)) {
add(file, fullVirtualName, name, archiveOperationMonitor); add(file, fullVirtualName, name, archiveOperationMonitor);
return;
} }
try { try {