Attachment #83866 for bug #210555

View | Details | Raw Unified | Return to bug 210555
Collapse All | Expand All




 * David McKnight   (IBM)        - [210109] store constants in IFileService rather than IFileServiceConstants
 * Martin Oberhuber (Wind River) - [210109] no need to declare IFileService constants in AbstractFileService
 * David McKnight   (IBM)        - [209704] [api] Ability to override default encoding conversion needed.
 * Xuan Chen        (IBM)        - [210555] [regression] NPE when deleting a file on SSH
 ********************************************************************************/

package org.eclipse.rse.services.files;

	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
	{
		boolean ok = true;
		SystemMessage msg = getMessage("RSEF1315");   //$NON-NLS-1$
		String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
		monitor.beginTask(deletingMessage, remoteParents.length);
		for (int i = 0; i < remoteParents.length; i++)
		{
			monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
			ok = ok && delete(remoteParents[i], fileNames[i], monitor);
			monitor.worked(1);
		}
		return ok;
	}




 * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
 * Xuan Chen        (IBM)        - [209828] Need to move the Create operation to a job.
 * David McKnight   (IBM)        - [210109] store constants in IFileService rather than IFileServiceConstants
 * Xuan Chen        (IBM)        - [210555] [regression] NPE when deleting a file on SSH
 ********************************************************************************/

package org.eclipse.rse.internal.services.local.files;

		}
	}
	
	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
	{
		boolean ok = true;
		SystemMessage msg = getMessage("RSEF1315");   //$NON-NLS-1$
		String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
		monitor.beginTask(deletingMessage, remoteParents.length);
		for (int i = 0; i < remoteParents.length; i++)
		{
			monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
			ok = ok && delete(remoteParents[i], fileNames[i], monitor);
			monitor.worked(1);
		}
		return ok;
	}
	
	private boolean deleteContents(File folder, IProgressMonitor monitor)
	{
		boolean result = true;

Return to bug 210555

Lines 19-24 Link Here

(-)src/org/eclipse/rse/services/files/AbstractFileService.java (-5 / +1 lines)
19	* David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants	19	* David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants
20	* Martin Oberhuber (Wind River) - [210109] no need to declare IFileService constants in AbstractFileService	20	* Martin Oberhuber (Wind River) - [210109] no need to declare IFileService constants in AbstractFileService
21	* David McKnight (IBM) - [209704] [api] Ability to override default encoding conversion needed.	21	* David McKnight (IBM) - [209704] [api] Ability to override default encoding conversion needed.
		22	* Xuan Chen (IBM) - [210555] [regression] NPE when deleting a file on SSH
22	********************************************************************************/	23	********************************************************************************/
23		24
24	package org.eclipse.rse.services.files;	25	package org.eclipse.rse.services.files;
Lines 131-144 Link Here
131	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException	132	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
132	{	133	{
133	boolean ok = true;	134	boolean ok = true;
134	SystemMessage msg = getMessage("RSEF1315"); //$NON-NLS-1$
135	String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
136	monitor.beginTask(deletingMessage, remoteParents.length);
137	for (int i = 0; i < remoteParents.length; i++)	135	for (int i = 0; i < remoteParents.length; i++)
138	{	136	{
139	monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
140	ok = ok && delete(remoteParents[i], fileNames[i], monitor);	137	ok = ok && delete(remoteParents[i], fileNames[i], monitor);
141	monitor.worked(1);
142	}	138	}
143	return ok;	139	return ok;
144	}	140	}

Lines 26-31 Link Here

(-)src/org/eclipse/rse/internal/services/local/files/LocalFileService.java (+16 lines)
26	* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread	26	* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
27	* Xuan Chen (IBM) - [209828] Need to move the Create operation to a job.	27	* Xuan Chen (IBM) - [209828] Need to move the Create operation to a job.
28	* David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants	28	* David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants
		29	* Xuan Chen (IBM) - [210555] [regression] NPE when deleting a file on SSH
29	********************************************************************************/	30	********************************************************************************/
30		31
31	package org.eclipse.rse.internal.services.local.files;	32	package org.eclipse.rse.internal.services.local.files;
Lines 1034-1039 Link Here
1034	}	1035	}
1035	}	1036	}
1036		1037
		1038	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
		1039	{
		1040	boolean ok = true;
		1041	SystemMessage msg = getMessage("RSEF1315"); //$NON-NLS-1$
		1042	String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
		1043	monitor.beginTask(deletingMessage, remoteParents.length);
		1044	for (int i = 0; i < remoteParents.length; i++)
		1045	{
		1046	monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
		1047	ok = ok && delete(remoteParents[i], fileNames[i], monitor);
		1048	monitor.worked(1);
		1049	}
		1050	return ok;
		1051	}
		1052
1037	private boolean deleteContents(File folder, IProgressMonitor monitor)	1053	private boolean deleteContents(File folder, IProgressMonitor monitor)
1038	{	1054	{
1039	boolean result = true;	1055	boolean result = true;