Attachment #107725 for bug #241211

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

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




/*******************************************************************************
 * 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

			FileRevisionTypedElement newContributor) {
		if (oldContributor == null || newContributor == null)
			return false;
		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;
	}




/*******************************************************************************
 * 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


	private IFileRevision fileRevision;
	private String author;
	private String comment;
	
	/**
	 * Create a typed element that wraps the given file revision.

	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();
		}
	}


Return to bug 241211

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java (-7 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2007 IBM Corporation and others.	2	* Copyright (c) 2006, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 297-308 Link Here
297	FileRevisionTypedElement newContributor) {	297	FileRevisionTypedElement newContributor) {
298	if (oldContributor == null \|\| newContributor == null)	298	if (oldContributor == null \|\| newContributor == null)
299	return false;	299	return false;
300	String author = oldContributor.getAuthor();	300	if (oldContributor.getContentIdentifier().equals(newContributor.getContentIdentifier())) {
301	if (newContributor.getAuthor() == null	301	boolean propagate = false;
302	&& author != null	302	String author = oldContributor.getAuthor();
303	&& oldContributor.getContentIdentifier().equals(newContributor.getContentIdentifier())) {	303	if (newContributor.getAuthor() == null && author != null) {
304	newContributor.setAuthor(author);	304	newContributor.setAuthor(author);
305	return true;	305	propagate = true;
		306	}
		307	String comment = oldContributor.getComment();
		308	if (newContributor.getComment() == null && comment != null) {
		309	newContributor.setComment(comment);
		310	propagate= true;
		311	}
		312	return propagate;
306	}	313	}
307	return false;	314	return false;
308	}	315	}

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java (-1 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 30-35 Link Here
30		30
31	private IFileRevision fileRevision;	31	private IFileRevision fileRevision;
32	private String author;	32	private String author;
		33	private String comment;
33		34
34	/**	35	/**
35	* Create a typed element that wraps the given file revision.	36	* Create a typed element that wraps the given file revision.
Lines 138-148 Link Here
138	public void setAuthor(String author) {	139	public void setAuthor(String author) {
139	this.author = author;	140	this.author = author;
140	}	141	}
		142
		143	public String getComment() {
		144	if (comment == null)
		145	comment = fileRevision.getComment();
		146	return comment;
		147	}
		148
		149	public void setComment(String comment) {
		150	this.comment= comment;
		151	}
141		152
142	public void fetchAuthor(IProgressMonitor monitor) throws CoreException {	153	public void fetchAuthor(IProgressMonitor monitor) throws CoreException {
143	if (getAuthor() == null && fileRevision.isPropertyMissing()) {	154	if (getAuthor() == null && fileRevision.isPropertyMissing()) {
144	IFileRevision other = fileRevision.withAllProperties(monitor);	155	IFileRevision other = fileRevision.withAllProperties(monitor);
145	author = other.getAuthor();	156	author = other.getAuthor();
		157	comment = other.getComment();
146	}	158	}
147	}	159	}
148		160