From 622232b936fee6d2f308947359b4bc09811ce556 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Mon, 2 Apr 2012 11:36:29 +0200 Subject: [PATCH] Externalize parsing exception message for RebaseCommand#Action Change-Id: Id0d7801e4de98bf118dbecadf623c9ffd7ab7554 --- .../org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/api/RebaseCommand.java | 8 +++----- .../src/org/eclipse/jgit/internal/JGitText.java | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) 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 0554efacd7..93392e2026 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -476,6 +476,7 @@ unexpectedOddResult=odd: {0} + {1} - {2} unexpectedRefReport={0}: unexpected ref report: {1} unexpectedReportLine=unexpected report line: {0} unexpectedReportLine2={0} unexpected report line: {1} +unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed. unknownDIRCVersion=Unknown DIRC version {0} unknownHost=unknown host unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 7765c5d67f..aa6572600c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -955,11 +955,9 @@ public class RebaseCommand extends GitCommand { static Action parse(String token) { if (token.equals("pick") || token.equals("p")) return PICK; - throw new JGitInternalException( - MessageFormat - .format( - "Unknown or unsupported command \"{0}\", only \"pick\" is allowed", - token)); + throw new JGitInternalException(MessageFormat.format( + JGitText.get().unknownOrUnsupportedCommand, token, + PICK.toToken())); } } 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 c9f5d338f7..bcc9589da3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -536,6 +536,7 @@ public class JGitText extends TranslationBundle { /***/ public String unexpectedRefReport; /***/ public String unexpectedReportLine; /***/ public String unexpectedReportLine2; + /***/ public String unknownOrUnsupportedCommand; /***/ public String unknownDIRCVersion; /***/ public String unknownHost; /***/ public String unknownIndexVersionOrCorruptIndex; -- 2.39.5