[EGIT PATCH 1/2] Make Git property page cope with empty repositories and not yet born branches

[EGIT PATCH 1/2] Make Git property page cope with empty repositories and not yet born branches

[Robin Rosenberg]

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 .../preferences/GitProjectPropertyPage.java        |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
index 4c97cc8..d3afd97 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
@@ -94,7 +94,13 @@ private void fillValues(Repository repository) throws IOException {
 
 		final ObjectId objectId = repository
 				.resolve(repository.getFullBranch());
-		id.setText(objectId.name());
+		if (objectId == null) {
+			if (repository.getAllRefs().size() == 0)
+				id.setText("None (empty repository)");
+			else
+				id.setText("None (unborn branch)");
+		} else
+			id.setText(objectId.name());
 	}
 
 	/**
-- 
1.6.2.2.446.gfbdc0

[EGIT PATCH 2/2] Externalize strings in GitPropertyPage

[Robin Rosenberg]

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 .../src/org/spearce/egit/ui/UIText.java            |   21 ++++++++++++++++++++
 .../preferences/GitProjectPropertyPage.java        |   15 +++++++------
 .../src/org/spearce/egit/ui/uitext.properties      |    7 ++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
index 5a1e328..f14eada 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
@@ -98,6 +98,27 @@
 	public static String GitCloneWizard_errorCannotCreate;
 
 	/** */
+	public static String GitProjectPropertyPage_LabelBranch;
+
+	/** */
+	public static String GitProjectPropertyPage_LabelGitDir;
+
+	/** */
+	public static String GitProjectPropertyPage_LabelId;
+
+	/** */
+	public static String GitProjectPropertyPage_LabelState;
+
+	/** */
+	public static String GitProjectPropertyPage_LabelWorkdir;
+
+	/** */
+	public static String GitProjectPropertyPage_ValueEmptyRepository;
+
+	/** */
+	public static String GitProjectPropertyPage_ValueUnbornBranch;
+
+	/** */
 	public static String RepositorySelectionPage_sourceSelectionTitle;
 
 	/** */
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
index d3afd97..79cf60e 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java
@@ -21,6 +21,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
 import org.spearce.egit.core.project.RepositoryMapping;
+import org.spearce.egit.ui.UIText;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Repository;
 
@@ -53,11 +54,11 @@ protected Control createContents(Composite parent) {
 		layout.verticalSpacing = 0;
 		composite.setLayout(layout);
 
-		gitDir = createLabeledReadOnlyText(composite, "Git directory:");
-		workDir = createLabeledReadOnlyText(composite, "Working directory:");
-		branch = createLabeledReadOnlyText(composite, "Branch:");
-		id = createLabeledReadOnlyText(composite, "Id:");
-		state = createLabeledReadOnlyText(composite, "Current state:");
+		gitDir = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelGitDir);
+		workDir = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelWorkdir);
+		branch = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelBranch);
+		id = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelId);
+		state = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelState);
 
 		// Get the project that is the source of this property page
 		IProject project = null;
@@ -96,9 +97,9 @@ private void fillValues(Repository repository) throws IOException {
 				.resolve(repository.getFullBranch());
 		if (objectId == null) {
 			if (repository.getAllRefs().size() == 0)
-				id.setText("None (empty repository)");
+				id.setText(UIText.GitProjectPropertyPage_ValueEmptyRepository);
 			else
-				id.setText("None (unborn branch)");
+				id.setText(UIText.GitProjectPropertyPage_ValueUnbornBranch);
 		} else
 			id.setText(objectId.name());
 	}
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
index 692df5f..1e1a29d 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
@@ -46,6 +46,13 @@ GitCloneWizard_title=Import Git Repository
 GitCloneWizard_jobName=Cloning from {0}
 GitCloneWizard_failed=Git repository clone failed.
 GitCloneWizard_errorCannotCreate=Cannot create directory {0}.
+GitProjectPropertyPage_LabelBranch=Branch:
+GitProjectPropertyPage_LabelGitDir=Git directory:
+GitProjectPropertyPage_LabelId=Id:
+GitProjectPropertyPage_LabelState=Current state:
+GitProjectPropertyPage_LabelWorkdir=Working directory:
+GitProjectPropertyPage_ValueEmptyRepository=None (empty repository)
+GitProjectPropertyPage_ValueUnbornBranch=None (unborn branch)
 
 RepositorySelectionPage_sourceSelectionTitle=Source Git Repository
 RepositorySelectionPage_sourceSelectionDescription=Enter the location of the source repository.
-- 
1.6.2.2.446.gfbdc0