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-18 00:38:05.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2011-07-18 00:38:11.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2011-07-18 00:42:51.000000000

Patch Set 3: Build Successful

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

-------------------------------------
author: Jaidyn Nichols
date: 2011-07-18 03:18:57.000000000

Patch Set 3: (1 inline comment)



Line:138, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java -> What do you think about the following? It removes the branch string and the += performed on it which creates an unneeded extra string.

string.append(' ');

string.append('[', StyledString.DECORATIONS_STYLER);

string.append(repository.getBranch(), StyledString.DECORATIONS_STYLER);

RepositoryState state = repository.getRepositoryState();

if (state != RepositoryState.SAFE) {

string.append(" - ", StyledString.DECORATIONS_STYLER);

string.append(state.getDescription(), StyledString.DECORATIONS_STYLER);

}

string.append(']', StyledString.DECORATIONS_STYLER);

-------------------------------------
author: Juliet Cantu
date: 2011-07-18 22:01:33.000000000

Patch Set 3: (1 inline comment)



Line:118, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java -> Maybe we should add element.toString to the error

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

Patch Set 3: (2 inline comments)



Line:118, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java -> Yep, good idea!

Line:138, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java -> Yep, like the idea, integrated your idea (with minor modifications). Normally we should do this in a separate commit as this commit was only meant for the whole refactoring.

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

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