Attachment 233424 Details for Bug 412571 – patch to make sure file is within RemoteSystemsTempFiles before attempting download

[patch] patch to make sure file is within RemoteSystemsTempFiles before attempting download

patch.txt (text/plain), 2.14 KB, created by David McKnight

on 2013-07-12 09:58:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2013-07-12 09:58:00 EDT

Size: 2.14 KB

patch

obsolete

>diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
>index 4a6761d..55f4a10 100644
>--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
>+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
>@@ -51,6 +51,7 @@
>  * David McKnight   (IBM)        - [390609] Cached file opened twice in case of eclipse linked resource..
>  * Xuan Chen        (IBM)        - [399101] RSE edit actions on local files that map to actually workspace resources should not use temp files
>  * Xuan Chen        (IBM)        - [399752] Cannot download remote file due to scoping rule
>+ * David McKnight   (IBM)        - [412571] Truncate file when compare file in workspace by Remote System Explorer
>  *******************************************************************************/
> 
> package org.eclipse.rse.files.ui.resources;
>@@ -61,6 +62,7 @@
> 
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceChangeEvent;
> import org.eclipse.core.resources.IResourceChangeListener;
>@@ -579,10 +581,18 @@
> 	 */
> 	public boolean download(IProgressMonitor monitor) throws Exception
> 	{
>-
> 		// DY:  check if the file exists and is read-only (because it was previously opened
> 		// in the system editor)
> 		IFile file = getLocalResource();
>+		IProject rseTempFilesProject = SystemRemoteEditManager.getInstance().getRemoteEditProject();
>+		
>+		// Don't download files that are not in temp files project.
>+		// With bug 399101, local RSE files that map to workspace project files 
>+		//   no longer get downloaded to the temp files project.
>+		if (file.exists() && !file.getProject().equals(rseTempFilesProject)){
>+			return true;
>+		}
>+		
> 		SystemIFileProperties properties = new SystemIFileProperties(file);
> 		boolean newFile = !file.exists();
> 		if (file.isReadOnly())

Actions: View | Diff

Attachments on bug 412571: 233424