Attachment 203903 Details for Bug 358392 – Fix v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix v01

bug358392.txt (text/plain), 2.80 KB, created by Tomasz Zarna

on 2011-09-23 10:03:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2011-09-23 10:03:39 EDT

Size: 2.80 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
>index ee6b283..e211b7b 100644
>--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
>+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/history/IFileRevision.java
>@@ -35,7 +35,7 @@ public interface IFileRevision {
> 	 * the returned <code>IFile</code>.
> 	 * @param monitor a progress monitor
> 	 * @return IStorage containing file storage 
>-	 * @throws CoreException 
>+	 * @throws CoreException if an error occurs
> 	 */
> 	public IStorage getStorage(IProgressMonitor monitor) throws CoreException;
> 
>@@ -126,7 +126,7 @@ public interface IFileRevision {
> 	 * Returns an {@link IFileRevision} with all supported properties present.
> 	 * @param monitor a monitor
> 	 * @return a complete version of this file revision or null
>-	 * @throws CoreException
>+	 * @throws CoreException if an error occurs
> 	 */
> 	public IFileRevision withAllProperties(IProgressMonitor monitor) throws CoreException;
> }
>diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
>index 85b92b3..cd387f1 100644
>--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
>+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -367,7 +367,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
> 	 * @since 3.7
> 	 */
> 	public void fetchAuthor(IProgressMonitor monitor) throws CoreException {
>-		author= null;
>+		author = null;
> 
> 		IFileHistoryProvider fileHistoryProvider= Utils.getHistoryProvider(getResource());
> 		if (fileHistoryProvider == null)
>@@ -377,10 +377,10 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
> 		if (revision == null)
> 			return;
> 
>-		// NOTE: Must not check for revision#isPropertyMissing() as this will always return true for the workspace file revision
>-		revision= revision.withAllProperties(monitor);
>-
>-		author= revision.getAuthor();
>+		if (revision.isPropertyMissing()) {
>+			IFileRevision other = revision.withAllProperties(monitor);
>+			author = other.getAuthor();
>+		}
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 358392: 203903 | 203904