Attachment 107725 Details for Bug 241211 – Adds comment to ResourceDiffCompareInput and FileRevisionTypedElement

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

[patch] Adds comment to ResourceDiffCompareInput and FileRevisionTypedElement

patch.txt (text/plain), 3.67 KB, created by Dani Megert

on 2008-07-17 08:53:13 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2008-07-17 08:53:13 EDT

Size: 3.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java,v
>retrieving revision 1.9
>diff -u -r1.9 ResourceDiffCompareInput.java
>--- src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java	16 Mar 2007 21:03:34 -0000	1.9
>+++ src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java	17 Jul 2008 10:03:18 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 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
>@@ -297,12 +297,19 @@
> 			FileRevisionTypedElement newContributor) {
> 		if (oldContributor == null || newContributor == null)
> 			return false;
>-		String author = oldContributor.getAuthor();
>-		if (newContributor.getAuthor() == null 
>-				&& author != null
>-				&& oldContributor.getContentIdentifier().equals(newContributor.getContentIdentifier())) {
>-			newContributor.setAuthor(author);
>-			return true;
>+		if (oldContributor.getContentIdentifier().equals(newContributor.getContentIdentifier())) {
>+			boolean propagate = false;
>+			String author = oldContributor.getAuthor();
>+			if (newContributor.getAuthor() == null && author != null) {
>+				newContributor.setAuthor(author);
>+				propagate = true;
>+			}
>+			String comment = oldContributor.getComment();
>+			if (newContributor.getComment() == null && comment != null) {
>+				newContributor.setComment(comment);
>+				propagate= true;
>+			}
>+			return propagate;
> 		}
> 		return false;
> 	}
>Index: src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java,v
>retrieving revision 1.11
>diff -u -r1.11 FileRevisionTypedElement.java
>--- src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java	20 Dec 2006 22:06:05 -0000	1.11
>+++ src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java	17 Jul 2008 10:03:18 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 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
>@@ -30,6 +30,7 @@
> 
> 	private IFileRevision fileRevision;
> 	private String author;
>+	private String comment;
> 	
> 	/**
> 	 * Create a typed element that wraps the given file revision.
>@@ -138,11 +139,22 @@
> 	public void setAuthor(String author) {
> 		this.author = author;
> 	}
>+	
>+	public String getComment() {
>+		if (comment == null)
>+			comment = fileRevision.getComment();
>+		return comment;
>+	}
>+	
>+	public void setComment(String comment) {
>+		this.comment= comment;
>+	}
> 
> 	public void fetchAuthor(IProgressMonitor monitor) throws CoreException {
> 		if (getAuthor() == null && fileRevision.isPropertyMissing()) {
> 			IFileRevision other = fileRevision.withAllProperties(monitor);
> 			author = other.getAuthor();
>+			comment = other.getComment();
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 241211: 107725