Making branch nodes' names more consistent.

Renaming "Remote Branches" to "Remote Tracking" and "Local Branches" to
"Local".  This makes Git Repositories view easier to understand for Git
beginners.  I have seen many of them thinking that branches under the "Remote
Branches" node are branches from a remote repository. Changing the name to
"Remote Tracking" will help and will be also consistent with the standard Git
terminology.  Removing the " Branches" suffix makes UI look better.

Bug: 327454
Change-Id: I3d4378d173abca9b4d47f2400cb2679c88e61073
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>

12 files changed, 46 insertions, 46 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
index e34c4e315b..3e55a8402e 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
@@ -23,7 +23,7 @@ import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.UIText;
 import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
 import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider;
-import org.eclipse.egit.ui.internal.repository.tree.LocalBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.LocalNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode;
 import org.eclipse.egit.ui.internal.repository.tree.TagsNode;
 import org.eclipse.egit.ui.test.ContextMenuHelper;
@@ -76,7 +76,7 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
 		touchAndSubmit(null);
 
 		RepositoriesViewLabelProvider provider = new RepositoriesViewLabelProvider();
-		LOCAL_BRANCHES = provider.getText(new LocalBranchesNode(
+		LOCAL_BRANCHES = provider.getText(new LocalNode(
 				new RepositoryNode(null, repo), repo));
 		TAGS = provider.getText(new TagsNode(new RepositoryNode(null, repo),
 				repo));
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/FetchAndMergeActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/FetchAndMergeActionTest.java
index 52eb51f394..f374485123 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/FetchAndMergeActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/FetchAndMergeActionTest.java
@@ -19,7 +19,7 @@ import java.io.File;
 import org.eclipse.egit.ui.UIText;
 import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
 import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider;
-import org.eclipse.egit.ui.internal.repository.tree.RemoteBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.RemoteTrackingNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode;
 import org.eclipse.egit.ui.test.ContextMenuHelper;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -58,7 +58,7 @@ public class FetchAndMergeActionTest extends LocalRepositoryTestCase {
 		bot.perspectiveById("org.eclipse.pde.ui.PDEPerspective").activate();
 		RepositoriesViewLabelProvider provider = new RepositoriesViewLabelProvider();
 		Repository repo = lookupRepository(childRepositoryFile);
-		REMOTE_BRANCHES = provider.getText(new RemoteBranchesNode(
+		REMOTE_BRANCHES = provider.getText(new RemoteTrackingNode(
 				new RepositoryNode(null, repo), repo));
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java
index 86e3aee261..bf98c74cc4 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java
@@ -14,8 +14,8 @@ import java.io.File;
 
 import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider;
 import org.eclipse.egit.ui.internal.repository.tree.BranchesNode;
-import org.eclipse.egit.ui.internal.repository.tree.LocalBranchesNode;
-import org.eclipse.egit.ui.internal.repository.tree.RemoteBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.LocalNode;
+import org.eclipse.egit.ui.internal.repository.tree.RemoteTrackingNode;
 import org.eclipse.egit.ui.internal.repository.tree.RemotesNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode;
 import org.eclipse.egit.ui.internal.repository.tree.SymbolicRefsNode;
@@ -34,7 +34,7 @@ public class GitRepositoriesViewTestUtils {
 		Repository repository = lookupRepository(repo);
 		RepositoryNode root = new RepositoryNode(null, repository);
 		BranchesNode branches = new BranchesNode(root, repository);
-		LocalBranchesNode localBranches = new LocalBranchesNode(branches,
+		LocalNode localBranches = new LocalNode(branches,
 				repository);
 
 		String rootText = labelProvider.getStyledText(root).getString();
@@ -64,7 +64,7 @@ public class GitRepositoriesViewTestUtils {
 		Repository repository = lookupRepository(repositoryFile);
 		RepositoryNode root = new RepositoryNode(null, repository);
 		BranchesNode branches = new BranchesNode(root, repository);
-		RemoteBranchesNode remoteBranches = new RemoteBranchesNode(branches,
+		RemoteTrackingNode remoteBranches = new RemoteTrackingNode(branches,
 				repository);
 
 		String rootText = labelProvider.getStyledText(root).getString();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 6ba3c22091..1a59c15455 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -1885,10 +1885,10 @@ public class UIText extends NLS {
 	public static String RepositoriesViewLabelProvider_BareRepositoryMessage;
 
 	/** */
-	public static String RepositoriesViewLabelProvider_LocalBranchesNodetext;
+	public static String RepositoriesViewLabelProvider_LocalNodetext;
 
 	/** */
-	public static String RepositoriesViewLabelProvider_RemoteBrancheNodetext;
+	public static String RepositoriesViewLabelProvider_RemoteTrackingNodetext;
 
 	/** */
 	public static String RepositoriesViewLabelProvider_SymbolicRefNodeText;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java
index b8ed1cf8b4..d43336ad3b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java
@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider;
 import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider;
-import org.eclipse.egit.ui.internal.repository.tree.LocalBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.LocalNode;
 import org.eclipse.egit.ui.internal.repository.tree.RefNode;
-import org.eclipse.egit.ui.internal.repository.tree.RemoteBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.RemoteTrackingNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNodeType;
 import org.eclipse.egit.ui.internal.repository.tree.TagNode;
@@ -99,8 +99,8 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog {
 			Repository repository, String refToMark) {
 		super(parentShell);
 		this.repo = repository;
-		localBranches = new LocalBranchesNode(null, this.repo);
-		remoteBranches = new RemoteBranchesNode(null, this.repo);
+		localBranches = new LocalNode(null, this.repo);
+		remoteBranches = new RemoteTrackingNode(null, this.repo);
 		tags = new TagsNode(null, this.repo);
 		this.refToMark = refToMark;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
index 12ab30bbd9..ca980570e2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
@@ -38,10 +38,10 @@ import org.eclipse.egit.ui.internal.repository.tree.ErrorNode;
 import org.eclipse.egit.ui.internal.repository.tree.FetchNode;
 import org.eclipse.egit.ui.internal.repository.tree.FileNode;
 import org.eclipse.egit.ui.internal.repository.tree.FolderNode;
-import org.eclipse.egit.ui.internal.repository.tree.LocalBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.LocalNode;
 import org.eclipse.egit.ui.internal.repository.tree.PushNode;
 import org.eclipse.egit.ui.internal.repository.tree.RefNode;
-import org.eclipse.egit.ui.internal.repository.tree.RemoteBranchesNode;
+import org.eclipse.egit.ui.internal.repository.tree.RemoteTrackingNode;
 import org.eclipse.egit.ui.internal.repository.tree.RemoteNode;
 import org.eclipse.egit.ui.internal.repository.tree.RemotesNode;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode;
@@ -150,12 +150,12 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider,
 
 		case BRANCHES: {
 			List<RepositoryTreeNode> nodes = new ArrayList<RepositoryTreeNode>();
-			nodes.add(new LocalBranchesNode(node, repo));
-			nodes.add(new RemoteBranchesNode(node, repo));
+			nodes.add(new LocalNode(node, repo));
+			nodes.add(new RemoteTrackingNode(node, repo));
 			return nodes.toArray();
 		}
 
-		case LOCALBRANCHES: {
+		case LOCAL: {
 			if (branchHierarchyMode) {
 				BranchHierarchyNode hierNode = new BranchHierarchyNode(node,
 						repo, new Path(Constants.R_HEADS));
@@ -189,7 +189,7 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider,
 			}
 		}
 
-		case REMOTEBRANCHES: {
+		case REMOTETRACKING: {
 			if (branchHierarchyMode) {
 				BranchHierarchyNode hierNode = new BranchHierarchyNode(node,
 						repo, new Path(Constants.R_REMOTES));
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
index 0d67ee4d4d..6b88b1b347 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
@@ -215,9 +215,9 @@ public class RepositoriesViewLabelProvider extends LabelProvider implements ISty
 				// fall through
 			case BRANCHES:
 				// fall through
-			case LOCALBRANCHES:
+			case LOCAL:
 				// fall through
-			case REMOTEBRANCHES:
+			case REMOTETRACKING:
 				// fall through
 			case BRANCHHIERARCHY:
 				// fall through
@@ -260,10 +260,10 @@ public class RepositoriesViewLabelProvider extends LabelProvider implements ISty
 			return ((File) node.getObject()).getName();
 		case BRANCHES:
 			return UIText.RepositoriesView_Branches_Nodetext;
-		case LOCALBRANCHES:
-			return UIText.RepositoriesViewLabelProvider_LocalBranchesNodetext;
-		case REMOTEBRANCHES:
-			return UIText.RepositoriesViewLabelProvider_RemoteBrancheNodetext;
+		case LOCAL:
+			return UIText.RepositoriesViewLabelProvider_LocalNodetext;
+		case REMOTETRACKING:
+			return UIText.RepositoriesViewLabelProvider_RemoteTrackingNodetext;
 		case BRANCHHIERARCHY:
 			IPath fullPath = (IPath) node.getObject();
 			return fullPath.lastSegment();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/LocalBranchesNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/LocalNode.java
index 350ab9133c..b00376fdb6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/LocalBranchesNode.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/LocalNode.java
@@ -13,9 +13,9 @@ package org.eclipse.egit.ui.internal.repository.tree;
 import org.eclipse.jgit.lib.Repository;
 
 /**
- * Represents the "Local Branches" node
+ * Represents the "Local" node
  */
-public class LocalBranchesNode extends RepositoryTreeNode<Repository> {
+public class LocalNode extends RepositoryTreeNode<Repository> {
 
 	/**
 	 * Constructs the node.
@@ -25,8 +25,8 @@ public class LocalBranchesNode extends RepositoryTreeNode<Repository> {
 	 * @param repository
 	 *            the {@link Repository}
 	 */
-	public LocalBranchesNode(RepositoryTreeNode parent, Repository repository) {
-		super(parent, RepositoryTreeNodeType.LOCALBRANCHES, repository,
+	public LocalNode(RepositoryTreeNode parent, Repository repository) {
+		super(parent, RepositoryTreeNodeType.LOCAL, repository,
 				repository);
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RemoteBranchesNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RemoteTrackingNode.java
index 6a32b19155..1e276c473f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RemoteBranchesNode.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RemoteTrackingNode.java
@@ -13,9 +13,9 @@ package org.eclipse.egit.ui.internal.repository.tree;
 import org.eclipse.jgit.lib.Repository;
 
 /**
- * Represents the "Remote Branches" node
+ * Represents the "Remote Tracking" node
  */
-public class RemoteBranchesNode extends RepositoryTreeNode<Repository> {
+public class RemoteTrackingNode extends RepositoryTreeNode<Repository> {
 
 	/**
 	 * Constructs the node.
@@ -25,8 +25,8 @@ public class RemoteBranchesNode extends RepositoryTreeNode<Repository> {
 	 * @param repository
 	 *            the {@link Repository}
 	 */
-	public RemoteBranchesNode(RepositoryTreeNode parent, Repository repository) {
-		super(parent, RepositoryTreeNodeType.REMOTEBRANCHES, repository,
+	public RemoteTrackingNode(RepositoryTreeNode parent, Repository repository) {
+		super(parent, RepositoryTreeNodeType.REMOTETRACKING, repository,
 				repository);
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java
index f27eb267dc..82367e6602 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java
@@ -83,11 +83,11 @@ public abstract class RepositoryTreeNode<T> implements Comparable<RepositoryTree
 	 * <td>{@link String}</td>
 	 * </tr>
 	 * <tr>
-	 * <td>{@link RepositoryTreeNodeType#LOCALBRANCHES}</td>
+	 * <td>{@link RepositoryTreeNodeType#LOCAL}</td>
 	 * <td>{@link String}</td>
 	 * </tr>
 	 * <tr>
-	 * <td>{@link RepositoryTreeNodeType#REMOTEBRANCHES}</td>
+	 * <td>{@link RepositoryTreeNodeType#REMOTETRACKING}</td>
 	 * <td>{@link String}</td>
 	 * </tr>
 	 * <tr>
@@ -123,9 +123,9 @@ public abstract class RepositoryTreeNode<T> implements Comparable<RepositoryTree
 			// fall through
 		case REMOTES:
 			// fall through
-		case LOCALBRANCHES:
+		case LOCAL:
 			// fall through
-		case REMOTEBRANCHES:
+		case REMOTETRACKING:
 			// fall through
 		case BRANCHES:
 			// fall through
@@ -230,9 +230,9 @@ public abstract class RepositoryTreeNode<T> implements Comparable<RepositoryTree
 
 		case BRANCHES:
 			// fall through
-		case LOCALBRANCHES:
+		case LOCAL:
 			// fall through
-		case REMOTEBRANCHES:
+		case REMOTETRACKING:
 			// fall through
 		case BRANCHHIERARCHY:
 			return myObject.toString().compareTo(
@@ -293,9 +293,9 @@ public abstract class RepositoryTreeNode<T> implements Comparable<RepositoryTree
 			// fall through
 		case BRANCHES:
 			// fall through
-		case LOCALBRANCHES:
+		case LOCAL:
 			// fall through
-		case REMOTEBRANCHES:
+		case REMOTETRACKING:
 			// fall through
 		case SYMBOLICREFS:
 			// fall through
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNodeType.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNodeType.java
index 8a4fd2a8b0..1a2e9fccf1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNodeType.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNodeType.java
@@ -26,13 +26,13 @@ public enum RepositoryTreeNodeType {
 	/** */
 	REF(UIIcons.BRANCH.createImage()), //
 	/** */
-	LOCALBRANCHES(PlatformUI.getWorkbench().getSharedImages().getImage(
+	LOCAL(PlatformUI.getWorkbench().getSharedImages().getImage(
 			ISharedImages.IMG_OBJ_FOLDER)), //
 			/** */
 	BRANCHHIERARCHY(PlatformUI.getWorkbench().getSharedImages().getImage(
 			ISharedImages.IMG_OBJ_FOLDER)), //
 	/** */
-	REMOTEBRANCHES(PlatformUI.getWorkbench().getSharedImages().getImage(
+	REMOTETRACKING(PlatformUI.getWorkbench().getSharedImages().getImage(
 			ISharedImages.IMG_OBJ_FOLDER)), //
 	/** */
 	TAGS(UIIcons.TAGS.createImage()), //
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 8d9a79b12f..b72a2ed858 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -667,8 +667,8 @@ RepositoriesView_RenameBranchTitle=Rename Branch
 RepositoriesView_WorkingDir_treenode=Working directory
 RepositoriesViewContentProvider_ExceptionNodeText=Exception encountered while fetching children
 RepositoriesViewLabelProvider_BareRepositoryMessage=This is a bare repository
-RepositoriesViewLabelProvider_LocalBranchesNodetext=Local Branches
-RepositoriesViewLabelProvider_RemoteBrancheNodetext=Remote Branches
+RepositoriesViewLabelProvider_LocalNodetext=Local
+RepositoriesViewLabelProvider_RemoteTrackingNodetext=Remote Tracking
 RepositoriesViewLabelProvider_SymbolicRefNodeText=Symbolic References
 RepositoriesViewLabelProvider_TagsNodeText=Tags