Attachment 162572 Details for Bug 306573 – Quick hack to avoid snapshot file copy

[patch] Quick hack to avoid snapshot file copy

snapshotCopyHack.diff.txt (text/plain), 3.86 KB, created by Martin Oberhuber

on 2010-03-19 17:37:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2010-03-19 17:37:53 EDT

Size: 3.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/resources/Project.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java,v
>retrieving revision 1.167
>diff -u -r1.167 Project.java
>--- src/org/eclipse/core/internal/resources/Project.java	5 Mar 2010 16:08:18 -0000	1.167
>+++ src/org/eclipse/core/internal/resources/Project.java	19 Mar 2010 21:23:41 -0000
>@@ -28,6 +28,8 @@
> import org.eclipse.osgi.util.NLS;
> 
> public class Project extends Container implements IProject {
>+	
>+	private URI snapshotPath = null;
> 
> 	protected Project(IPath path, Workspace container) {
> 		super(path, container);
>@@ -835,9 +837,7 @@
> 				throw new CoreException(status);
> 			}
> 			// copy the snapshot from the URI into the project metadata
>-			IPath snapshotPath = workspace.getMetaArea().getRefreshLocationFor(this);
>-			IFileStore snapshotFileStore = EFS.getStore(org.eclipse.core.filesystem.URIUtil.toURI(snapshotPath));
>-			EFS.getStore(snapshotLocation).copy(snapshotFileStore, EFS.OVERWRITE, monitor);
>+			snapshotPath = snapshotLocation;
> 		}
> 	}
> 	/* (non-Javadoc)
>@@ -947,7 +947,7 @@
> 					boolean refreshed = false;
> 					if (!used) {
> 						refreshed = workspace.getSaveManager().restoreFromRefreshSnapshot(
>-								this, Policy.subMonitorFor(monitor, Policy.opWork * 20 / 100));
>+								this, snapshotPath, Policy.subMonitorFor(monitor, Policy.opWork * 20 / 100));
> 						if (refreshed) {	// account for the refresh work
> 							monitor.worked(Policy.opWork * 60 / 100);
> 						}
>Index: src/org/eclipse/core/internal/resources/SaveManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java,v
>retrieving revision 1.103
>diff -u -r1.103 SaveManager.java
>--- src/org/eclipse/core/internal/resources/SaveManager.java	4 Mar 2010 23:02:51 -0000	1.103
>+++ src/org/eclipse/core/internal/resources/SaveManager.java	19 Mar 2010 21:23:42 -0000
>@@ -11,17 +11,12 @@
>  *******************************************************************************/
> package org.eclipse.core.internal.resources;
> 
>-import org.eclipse.core.runtime.OperationCanceledException;
>-
>-import org.eclipse.core.filesystem.IFileStore;
>-
>-import org.eclipse.core.filesystem.EFS;
>-
>-import java.net.URI;
>-
> import java.io.*;
>+import java.net.URI;
> import java.util.*;
> import java.util.zip.*;
>+import org.eclipse.core.filesystem.EFS;
>+import org.eclipse.core.filesystem.IFileStore;
> import org.eclipse.core.internal.events.*;
> import org.eclipse.core.internal.localstore.*;
> import org.eclipse.core.internal.utils.*;
>@@ -725,12 +720,16 @@
> 	 * and <code>false</code> if the refresh snapshot was not found or could not be opened.
> 	 * @exception CoreException if an error occurred reading the snapshot file.
> 	 */
>-	protected boolean restoreFromRefreshSnapshot(Project project,
>+	protected boolean restoreFromRefreshSnapshot(Project project, URI snapshotLocation,
> 			IProgressMonitor monitor) throws CoreException {
> 		boolean status = true;
>-		IPath snapshotPath = workspace.getMetaArea().getRefreshLocationFor(project);
>-		java.io.File snapshotFile = snapshotPath.toFile();
>-		if (!snapshotFile.exists())
>+		//IPath snapshotPath = workspace.getMetaArea().getRefreshLocationFor(project);
>+		//java.io.File snapshotFile = snapshotPath.toFile();
>+		if (snapshotLocation==null) {
>+			return false;
>+		}
>+		java.io.File snapshotFile = EFS.getStore(snapshotLocation).toLocalFile(EFS.NONE, null);
>+		if (snapshotFile==null || !snapshotFile.exists())
> 			return false;
> 		if (Policy.DEBUG_RESTORE)
> 			System.out.println("Restore project " + project.getFullPath() + ": starting..."); //$NON-NLS-1$ //$NON-NLS-2$

Actions: View | Diff

Attachments on bug 306573: 162569 | 162572 | 162660