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
Signed-off-by: Marlie Beasley xxx@xxx.xxx

COMMENTS

author: Marlie Beasley
date: 2011-07-22 15:16:51.000000000

Uploaded patch set 5.

-------------------------------------
author: Brenden Conley
date: 2011-07-22 15:16:55.000000000

Patch Set 5:

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

-------------------------------------
author: Marlie Beasley
date: 2011-07-22 15:18:55.000000000

Patch Set 5:

- Changed GitLabelProvider.java to make UI Tests work
- rebased to current master

-------------------------------------
author: Brenden Conley
date: 2011-07-22 15:21:54.000000000

Patch Set 5: Build Successful

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

-------------------------------------
author: Marlie Beasley
date: 2011-07-25 07:50:05.000000000

Patch Set 5: I would prefer that you didn't submit this

File->Import
Git->Projects from Git
Press Next
=> labels in the tree are missing

-------------------------------------
author: Marlie Beasley
date: 2011-07-25 08:21:37.000000000

Patch Set 5:

Found another bug:
Repositories View: Add existing Git repository; Press Search; Repository Icon is missing in the results table

-------------------------------------
author: Marlie Beasley
date: 2011-07-29 18:45:08.000000000

Patch Set 5: (2 inline comments)



Line:140, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java -> Using GitLabelProvider does not work here because the Content Provider provides String objects and no Repository objects.

Line:355, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java -> Should be super.getText

-------------------------------------
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.

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