DESCRIPTION

Unify label providers in EGit

Combines all label providers into one GitLabelProvider to have a
consistent look&feel across the whole UI. Several label providers were
left out that provide a specialized version of common objects for their
use-case (eg. search results).

Change-Id: Id4c2be70d7d18a70ed928003dd81f36a2928fe58
Signed-off-by: Marley Hopkins xxx@xxx.xxx


COMMENTS

author: Marley Hopkins
date: 2011-07-19 12:16:25.000000000

Uploaded patch set 4.

-------------------------------------
author: Brenden Conley
date: 2011-07-19 12:16:29.000000000

Patch Set 4:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/1329/ 

-------------------------------------
author: Brenden Conley
date: 2011-07-19 12:21:40.000000000

Patch Set 4: Build Successful

Build Successful 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1329/ : SUCCESS

-------------------------------------
author: Marlie Beasley
date: 2011-07-22 15:10:02.000000000

Patch Set 4:

UI Tests are not working:

Caused by: java.lang.NullPointerException
	at org.eclipse.jface.resource.JFaceResources.getResources(JFaceResources.java:207)
	at org.eclipse.jface.resource.JFaceResources.getResources(JFaceResources.java:232)
	at org.eclipse.egit.ui.internal.GitLabelProvider.<init>(GitLabelProvider.java:55)
	at org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider.<init>(RepositoriesViewLabelProvider.java:71)
	at org.eclipse.egit.ui.view.repositories.GitRepositoriesViewTestBase.<clinit>(GitRepositoriesViewTestBase.java:58)
	... 44 more

-------------------------------------
author: Gerrit Johnathan Pham
date: 2011-08-01 07:12:37.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
