Externalize error message used in CheckoutCommand

Change-Id: Ifbc469b07e63218107157ffbf23ae55c52a55ef4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 2e20ada6e8275d45485c7a00201ea6a1f29de298..10f5339aea117eb682dc453ca1efa58d970676a3 100644 (file)
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -44,6 +44,7 @@ cannotBeCombined=Cannot be combined.
 cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.
 cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}.
 cannotChangeToComment=Cannot change a non-comment line to a comment line.
+cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches.
 cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
 cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.
 cannotCommitOnARepoWithState=Cannot commit on a repo with state: {0}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
index 00c3e1f4bce836d8005a5631e6a38fb9f8472466..8d8aada6228496e6006ee7624daf93a224943fdc 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
@@ -673,7 +673,6 @@ public class CheckoutCommand extends GitCommand<Ref> {
        private void checkOptions() {
                if (checkoutStage != null && !isCheckoutIndex())
                        throw new IllegalStateException(
-                                       "Checking out ours/theirs is only possible when checking out index, "
-                                                       + "not when switching branches.");
+                                       JGitText.get().cannotCheckoutOursSwitchBranch);
        }
 }

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index efd1613845c441f11d639d7cca1caf91f57d5585..2448bf8964f67ba11ce9e00f539d3c6115db4c5c 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -103,6 +103,7 @@ public class JGitText extends TranslationBundle {
        /***/ public String cannotBeRecursiveWhenTreesAreIncluded;
        /***/ public String cannotChangeActionOnComment;
        /***/ public String cannotChangeToComment;
+       /***/ public String cannotCheckoutOursSwitchBranch;
        /***/ public String cannotCombineSquashWithNoff;
        /***/ public String cannotCombineTreeFilterWithRevFilter;
        /***/ public String cannotCommitOnARepoWithState;