From f3d8a8ecad614906a2c4ec0077cdb24129da6c6d Mon Sep 17 00:00:00 2001
From: Sasa Zivkov <sasa.zivkov@sap.com>
Date: Wed, 19 May 2010 16:59:28 +0200
Subject: [PATCH] Externalize strings from JGit
The strings are externalized into the root resource bundles.
The resource bundles are stored under the new "resources" source
folder to get proper maven build.
Strings from tests are, in general, not externalized. Only in
cases where it was necessary to make the test pass the strings
were externalized. This was typically necessary in cases where
e.getMessage() was used in assert and the exception message was
slightly changed due to reuse of the externalized strings.
Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
---
org.eclipse.jgit.console/.classpath | 1 +
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 3 +-
org.eclipse.jgit.console/pom.xml | 3 +
.../jgit/console/ConsoleText.properties | 5 +
.../jgit/console/ConsoleAuthenticator.java | 7 +-
.../console/ConsoleSshSessionFactory.java | 6 +-
.../org/eclipse/jgit/console/ConsoleText.java | 66 +++
org.eclipse.jgit.http.server/.classpath | 1 +
.../META-INF/MANIFEST.MF | 1 +
org.eclipse.jgit.http.server/pom.xml | 3 +
.../http/server/HttpServerText.properties | 21 +
.../eclipse/jgit/http/server/FileSender.java | 5 +-
.../eclipse/jgit/http/server/GitServlet.java | 11 +-
.../jgit/http/server/HttpServerText.java | 82 ++++
.../jgit/http/server/ReceivePackServlet.java | 2 +-
.../jgit/http/server/RepositoryFilter.java | 7 +-
.../jgit/http/server/ServletUtils.java | 7 +-
.../jgit/http/server/UploadPackServlet.java | 2 +-
.../jgit/http/server/glue/MetaServlet.java | 7 +-
.../http/server/glue/RegexGroupFilter.java | 7 +-
.../http/server/glue/ServletBinderImpl.java | 8 +-
.../ServiceNotAuthorizedException.java | 4 +-
.../resolver/ServiceNotEnabledException.java | 4 +-
org.eclipse.jgit.iplog/.classpath | 1 +
org.eclipse.jgit.iplog/META-INF/MANIFEST.MF | 1 +
org.eclipse.jgit.iplog/pom.xml | 3 +
.../eclipse/jgit/iplog/IpLogText.properties | 17 +
.../src/org/eclipse/jgit/iplog/CQ.java | 3 +-
.../src/org/eclipse/jgit/iplog/CSV.java | 3 +-
.../src/org/eclipse/jgit/iplog/Committer.java | 3 +-
.../org/eclipse/jgit/iplog/Contributor.java | 3 +-
.../org/eclipse/jgit/iplog/IPZillaQuery.java | 21 +-
.../eclipse/jgit/iplog/IpLogGenerator.java | 21 +-
.../src/org/eclipse/jgit/iplog/IpLogMeta.java | 5 +-
.../src/org/eclipse/jgit/iplog/IpLogText.java | 78 ++++
.../src/org/eclipse/jgit/iplog/Project.java | 3 +-
org.eclipse.jgit.pgm/.classpath | 3 +-
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 13 +-
org.eclipse.jgit.pgm/pom.xml | 3 +
.../org/eclipse/jgit/pgm/CLIText.properties | 174 ++++++++
.../jgit/pgm/AbstractFetchCommand.java | 25 +-
.../org/eclipse/jgit/pgm/AmazonS3Client.java | 19 +-
.../src/org/eclipse/jgit/pgm/Branch.java | 52 ++-
.../src/org/eclipse/jgit/pgm/CLIText.java | 142 ++++++
.../src/org/eclipse/jgit/pgm/Clone.java | 21 +-
.../src/org/eclipse/jgit/pgm/CommandRef.java | 13 +-
.../src/org/eclipse/jgit/pgm/Daemon.java | 29 +-
.../src/org/eclipse/jgit/pgm/Diff.java | 8 +-
.../src/org/eclipse/jgit/pgm/DiffTree.java | 8 +-
.../src/org/eclipse/jgit/pgm/Fetch.java | 14 +-
.../src/org/eclipse/jgit/pgm/Glog.java | 4 +-
.../src/org/eclipse/jgit/pgm/IndexPack.java | 6 +-
.../src/org/eclipse/jgit/pgm/Init.java | 8 +-
.../src/org/eclipse/jgit/pgm/Log.java | 19 +-
.../src/org/eclipse/jgit/pgm/LsRemote.java | 4 +-
.../src/org/eclipse/jgit/pgm/LsTree.java | 4 +-
.../src/org/eclipse/jgit/pgm/Main.java | 65 +--
.../src/org/eclipse/jgit/pgm/MergeBase.java | 6 +-
.../src/org/eclipse/jgit/pgm/Push.java | 26 +-
.../src/org/eclipse/jgit/pgm/ReceivePack.java | 7 +-
.../eclipse/jgit/pgm/RevWalkTextBuiltin.java | 12 +-
.../src/org/eclipse/jgit/pgm/Rm.java | 4 +-
.../src/org/eclipse/jgit/pgm/Tag.java | 19 +-
.../src/org/eclipse/jgit/pgm/TextBuiltin.java | 36 +-
.../src/org/eclipse/jgit/pgm/UploadPack.java | 9 +-
.../src/org/eclipse/jgit/pgm/Version.java | 10 +-
.../eclipse/jgit/pgm/debug/MakeCacheTree.java | 15 +-
.../eclipse/jgit/pgm/debug/ReadDirCache.java | 6 +-
.../jgit/pgm/debug/RebuildCommitGraph.java | 45 +-
.../eclipse/jgit/pgm/debug/ShowCacheTree.java | 17 +-
.../eclipse/jgit/pgm/debug/ShowCommands.java | 11 +-
.../eclipse/jgit/pgm/debug/WriteDirCache.java | 5 +-
.../org/eclipse/jgit/pgm/eclipse/Iplog.java | 20 +-
.../org/eclipse/jgit/pgm/eclipse/Ipzilla.java | 13 +-
.../pgm/opt/AbstractTreeIteratorHandler.java | 15 +-
.../eclipse/jgit/pgm/opt/CmdLineParser.java | 3 +-
.../eclipse/jgit/pgm/opt/ObjectIdHandler.java | 6 +-
.../jgit/pgm/opt/PathTreeFilterHandler.java | 3 +-
.../eclipse/jgit/pgm/opt/RefSpecHandler.java | 3 +-
.../jgit/pgm/opt/RevCommitHandler.java | 17 +-
.../eclipse/jgit/pgm/opt/RevTreeHandler.java | 13 +-
.../jgit/pgm/opt/SubcommandHandler.java | 5 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 6 +
.../eclipse/jgit/lib/ObjectCheckerTest.java | 5 +-
.../tst/org/eclipse/jgit/nls/TestNLS.java | 12 +-
.../jgit/nls/TestTranslationBundle.java | 10 +-
.../eclipse/jgit/patch/PatchCcErrorTest.java | 7 +-
.../transport/SideBandOutputStreamTest.java | 5 +-
org.eclipse.jgit.ui/.classpath | 1 +
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 1 +
org.eclipse.jgit.ui/pom.xml | 3 +
.../org/eclipse/jgit/awtui/UIText.properties | 8 +
.../eclipse/jgit/awtui/AwtAuthenticator.java | 9 +-
.../jgit/awtui/AwtSshSessionFactory.java | 2 +-
.../eclipse/jgit/awtui/CommitGraphPane.java | 6 +-
.../src/org/eclipse/jgit/awtui/UIText.java | 69 +++
org.eclipse.jgit/.classpath | 1 +
org.eclipse.jgit/META-INF/MANIFEST.MF | 3 +-
org.eclipse.jgit/pom.xml | 3 +
.../org/eclipse/jgit/JGitText.properties | 360 +++++++++++++++
.../src/org/eclipse/jgit/JGitText.java | 420 ++++++++++++++++++
.../org/eclipse/jgit/api/CommitCommand.java | 20 +-
.../api/ConcurrentRefUpdateException.java | 11 +-
.../src/org/eclipse/jgit/api/GitCommand.java | 8 +-
.../src/org/eclipse/jgit/api/LogCommand.java | 12 +-
.../org/eclipse/jgit/diff/DiffFormatter.java | 3 +-
.../src/org/eclipse/jgit/diff/MyersDiff.java | 13 +-
.../org/eclipse/jgit/dircache/DirCache.java | 37 +-
.../jgit/dircache/DirCacheBuilder.java | 14 +-
.../eclipse/jgit/dircache/DirCacheEditor.java | 10 +-
.../eclipse/jgit/dircache/DirCacheEntry.java | 16 +-
.../errors/CheckoutConflictException.java | 7 +-
.../jgit/errors/CompoundException.java | 4 +-
.../jgit/errors/CorruptObjectException.java | 4 +-
.../jgit/errors/EntryExistsException.java | 5 +-
.../errors/IncorrectObjectTypeException.java | 4 +-
.../jgit/errors/InvalidObjectIdException.java | 5 +-
.../MissingBundlePrerequisiteException.java | 3 +-
.../jgit/errors/MissingObjectException.java | 4 +-
.../errors/NoClosingBracketException.java | 6 +-
.../jgit/errors/PackInvalidException.java | 5 +-
.../errors/RepositoryNotFoundException.java | 5 +-
.../eclipse/jgit/errors/RevWalkException.java | 3 +-
.../jgit/errors/UnmergedPathException.java | 4 +-
.../eclipse/jgit/fnmatch/AbstractHead.java | 4 +-
.../org/eclipse/jgit/fnmatch/GroupHead.java | 8 +-
.../eclipse/jgit/lib/AbbreviatedObjectId.java | 8 +-
.../src/org/eclipse/jgit/lib/BinaryDelta.java | 6 +-
.../org/eclipse/jgit/lib/BlobBasedConfig.java | 10 +-
.../src/org/eclipse/jgit/lib/Commit.java | 16 +-
.../src/org/eclipse/jgit/lib/Config.java | 42 +-
.../src/org/eclipse/jgit/lib/Constants.java | 28 +-
.../jgit/lib/DeltaOfsPackedObjectLoader.java | 3 +-
.../jgit/lib/DeltaPackedObjectLoader.java | 6 +-
.../org/eclipse/jgit/lib/FileBasedConfig.java | 10 +-
.../src/org/eclipse/jgit/lib/GitIndex.java | 32 +-
.../org/eclipse/jgit/lib/IndexTreeWalker.java | 9 +-
.../src/org/eclipse/jgit/lib/LockFile.java | 7 +-
.../org/eclipse/jgit/lib/MutableObjectId.java | 6 +-
.../org/eclipse/jgit/lib/ObjectChecker.java | 6 +-
.../org/eclipse/jgit/lib/ObjectDirectory.java | 8 +-
.../org/eclipse/jgit/lib/ObjectWriter.java | 8 +-
.../src/org/eclipse/jgit/lib/PackFile.java | 35 +-
.../src/org/eclipse/jgit/lib/PackIndex.java | 6 +-
.../src/org/eclipse/jgit/lib/PackIndexV2.java | 3 +-
.../org/eclipse/jgit/lib/PackIndexWriter.java | 6 +-
.../eclipse/jgit/lib/PackIndexWriterV1.java | 3 +-
.../eclipse/jgit/lib/PackReverseIndex.java | 16 +-
.../src/org/eclipse/jgit/lib/PackWriter.java | 17 +-
.../src/org/eclipse/jgit/lib/PersonIdent.java | 10 +-
.../org/eclipse/jgit/lib/RefDirectory.java | 23 +-
.../src/org/eclipse/jgit/lib/RefUpdate.java | 6 +-
.../org/eclipse/jgit/lib/ReflogReader.java | 9 +-
.../src/org/eclipse/jgit/lib/Repository.java | 26 +-
.../src/org/eclipse/jgit/lib/Tag.java | 16 +-
.../src/org/eclipse/jgit/lib/Tree.java | 12 +-
.../org/eclipse/jgit/lib/TreeIterator.java | 4 +-
.../jgit/lib/UnpackedObjectLoader.java | 19 +-
.../jgit/lib/WholePackedObjectLoader.java | 6 +-
.../src/org/eclipse/jgit/lib/WindowCache.java | 18 +-
.../org/eclipse/jgit/lib/WorkDirCheckout.java | 6 +-
.../src/org/eclipse/jgit/lib/WriteTree.java | 8 +-
.../org/eclipse/jgit/merge/MergeStrategy.java | 5 +-
.../src/org/eclipse/jgit/merge/Merger.java | 9 +-
.../src/org/eclipse/jgit/nls/NLS.java | 3 +-
.../eclipse/jgit/nls/TranslationBundle.java | 19 +-
.../jgit/patch/CombinedHunkHeader.java | 10 +-
.../org/eclipse/jgit/patch/FileHeader.java | 9 +-
.../org/eclipse/jgit/patch/HunkHeader.java | 14 +-
.../src/org/eclipse/jgit/patch/Patch.java | 7 +-
.../eclipse/jgit/revplot/PlotCommitList.java | 4 +-
.../org/eclipse/jgit/revplot/PlotWalk.java | 3 +-
.../jgit/revwalk/MergeBaseGenerator.java | 4 +-
.../org/eclipse/jgit/revwalk/ObjectWalk.java | 13 +-
.../src/org/eclipse/jgit/revwalk/RevFlag.java | 8 +-
.../eclipse/jgit/revwalk/RevObjectList.java | 5 +-
.../src/org/eclipse/jgit/revwalk/RevWalk.java | 16 +-
.../eclipse/jgit/revwalk/StartGenerator.java | 6 +-
.../jgit/revwalk/filter/AndRevFilter.java | 5 +-
.../jgit/revwalk/filter/AuthorRevFilter.java | 3 +-
.../revwalk/filter/CommitterRevFilter.java | 3 +-
.../jgit/revwalk/filter/MessageRevFilter.java | 3 +-
.../jgit/revwalk/filter/OrRevFilter.java | 5 +-
.../revwalk/filter/PatternMatchRevFilter.java | 3 +-
.../jgit/revwalk/filter/RevFilter.java | 3 +-
.../org/eclipse/jgit/transport/AmazonS3.java | 31 +-
.../jgit/transport/BaseConnection.java | 5 +-
.../jgit/transport/BasePackConnection.java | 11 +-
.../transport/BasePackFetchConnection.java | 5 +-
.../transport/BasePackPushConnection.java | 29 +-
.../jgit/transport/BundleFetchConnection.java | 14 +-
.../eclipse/jgit/transport/BundleWriter.java | 6 +-
.../org/eclipse/jgit/transport/Daemon.java | 3 +-
.../eclipse/jgit/transport/FetchProcess.java | 35 +-
.../org/eclipse/jgit/transport/IndexPack.java | 62 +--
.../eclipse/jgit/transport/PacketLineIn.java | 12 +-
.../eclipse/jgit/transport/PushProcess.java | 14 +-
.../eclipse/jgit/transport/ReceivePack.java | 18 +-
.../org/eclipse/jgit/transport/RefSpec.java | 19 +-
.../jgit/transport/RemoteRefUpdate.java | 8 +-
.../jgit/transport/SideBandInputStream.java | 6 +-
.../jgit/transport/SideBandOutputStream.java | 12 +-
.../eclipse/jgit/transport/SshTransport.java | 7 +-
.../org/eclipse/jgit/transport/TagOpt.java | 6 +-
.../org/eclipse/jgit/transport/Transport.java | 18 +-
.../jgit/transport/TransportAmazonS3.java | 13 +-
.../jgit/transport/TransportBundleFile.java | 5 +-
.../jgit/transport/TransportBundleStream.java | 5 +-
.../jgit/transport/TransportGitAnon.java | 7 +-
.../jgit/transport/TransportGitSsh.java | 10 +-
.../eclipse/jgit/transport/TransportHttp.java | 48 +-
.../jgit/transport/TransportLocal.java | 9 +-
.../org/eclipse/jgit/transport/URIish.java | 3 +-
.../eclipse/jgit/transport/UploadPack.java | 12 +-
.../jgit/transport/WalkEncryption.java | 9 +-
.../jgit/transport/WalkFetchConnection.java | 53 +--
.../jgit/transport/WalkPushConnection.java | 13 +-
.../transport/WalkRemoteObjectDatabase.java | 12 +-
.../jgit/treewalk/WorkingTreeIterator.java | 4 +-
.../jgit/treewalk/filter/AndTreeFilter.java | 5 +-
.../jgit/treewalk/filter/OrTreeFilter.java | 5 +-
.../jgit/treewalk/filter/PathFilter.java | 3 +-
.../jgit/treewalk/filter/PathFilterGroup.java | 5 +-
.../treewalk/filter/PathSuffixFilter.java | 3 +-
.../src/org/eclipse/jgit/util/Base64.java | 19 +-
.../org/eclipse/jgit/util/HttpSupport.java | 9 +-
.../src/org/eclipse/jgit/util/IO.java | 11 +-
.../jgit/util/RawSubStringPattern.java | 3 +-
.../org/eclipse/jgit/util/StringUtils.java | 8 +-
.../eclipse/jgit/util/TemporaryBuffer.java | 7 +-
.../jgit/util/io/DisabledOutputStream.java | 4 +-
.../eclipse/jgit/util/io/InterruptTimer.java | 8 +-
.../jgit/util/io/TimeoutInputStream.java | 7 +-
.../jgit/util/io/TimeoutOutputStream.java | 7 +-
234 files changed, 2766 insertions(+), 1007 deletions(-)
create mode 100644 org.eclipse.jgit.console/resources/org/eclipse/jgit/console/ConsoleText.properties
create mode 100644 org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java
create mode 100644 org.eclipse.jgit.http.server/resources/org/eclipse/jgit/http/server/HttpServerText.properties
create mode 100644 org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
create mode 100644 org.eclipse.jgit.iplog/resources/org/eclipse/jgit/iplog/IpLogText.properties
create mode 100644 org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java
create mode 100644 org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
create mode 100644 org.eclipse.jgit.ui/resources/org/eclipse/jgit/awtui/UIText.properties
create mode 100644 org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java
create mode 100644 org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
diff --git a/org.eclipse.jgit.console/.classpath b/org.eclipse.jgit.console/.classpath
index ad32c83a7..31db9a911 100644
--- a/org.eclipse.jgit.console/.classpath
+++ b/org.eclipse.jgit.console/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
index 7c97c5ab0..792a7cd6b 100644
--- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Version: 0.8.0.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.jgit.console;version="0.8.0"
-Import-Package: org.eclipse.jgit.transport;version="[0.8.0,0.9.0)",
+Import-Package: org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.transport;version="[0.8.0,0.9.0)",
org.eclipse.jgit.util;version="[0.8.0,0.9.0)"
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml
index b33c5724d..11ac7019a 100644
--- a/org.eclipse.jgit.console/pom.xml
+++ b/org.eclipse.jgit.console/pom.xml
@@ -84,6 +84,9 @@
<include>plugin.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit.console/resources/org/eclipse/jgit/console/ConsoleText.properties b/org.eclipse.jgit.console/resources/org/eclipse/jgit/console/ConsoleText.properties
new file mode 100644
index 000000000..9aaf2298d
--- /dev/null
+++ b/org.eclipse.jgit.console/resources/org/eclipse/jgit/console/ConsoleText.properties
@@ -0,0 +1,5 @@
+answerNo=n
+answerYes=y
+noSystemConsoleAvailable=No System.console available
+password=Password:
+usernameFor=Username for {0}:
diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java
index 84fd520f7..3df5e4433 100644
--- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java
+++ b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java
@@ -47,6 +47,7 @@
import java.io.Console;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
+import java.text.MessageFormat;
import org.eclipse.jgit.util.CachedAuthenticator;
@@ -56,7 +57,7 @@ public class ConsoleAuthenticator extends CachedAuthenticator {
public static void install() {
final ConsoleAuthenticator c = new ConsoleAuthenticator();
if (c.cons == null)
- throw new NoClassDefFoundError("No System.console available");
+ throw new NoClassDefFoundError(ConsoleText.get().noSystemConsoleAvailable);
Authenticator.setDefault(c);
}
@@ -65,11 +66,11 @@ public static void install() {
@Override
protected PasswordAuthentication promptPasswordAuthentication() {
final String realm = formatRealm();
- String username = cons.readLine("Username for %s: ", realm);
+ String username = cons.readLine(MessageFormat.format(ConsoleText.get().usernameFor + " ", realm));
if (username == null || username.isEmpty()) {
return null;
}
- char[] password = cons.readPassword("Password: ");
+ char[] password = cons.readPassword(ConsoleText.get().password + " ");
if (password == null) {
password = new char[0];
}
diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleSshSessionFactory.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleSshSessionFactory.java
index 7d36dded4..b11078dea 100644
--- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleSshSessionFactory.java
+++ b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleSshSessionFactory.java
@@ -70,7 +70,7 @@ public class ConsoleSshSessionFactory extends SshConfigSessionFactory {
public static void install() {
final ConsoleSshSessionFactory c = new ConsoleSshSessionFactory();
if (c.cons == null)
- throw new NoClassDefFoundError("No System.console available");
+ throw new NoClassDefFoundError(ConsoleText.get().noSystemConsoleAvailable);
SshSessionFactory.setInstance(c);
}
@@ -93,8 +93,8 @@ public void showMessage(final String msg) {
}
public boolean promptYesNo(final String msg) {
- String r = cons.readLine("%s [y/n]? ", msg);
- return "y".equalsIgnoreCase(r);
+ String r = cons.readLine("%s [%s/%s]? ", msg, ConsoleText.get().answerYes, ConsoleText.get().answerNo);
+ return ConsoleText.get().answerYes.equalsIgnoreCase(r);
}
public boolean promptPassword(final String msg) {
diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java
new file mode 100644
index 000000000..3f1734b01
--- /dev/null
+++ b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.console;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit console
+ */
+public class ConsoleText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static ConsoleText get() {
+ return NLS.getBundleFor(ConsoleText.class);
+ }
+
+ /***/ public String answerNo;
+ /***/ public String answerYes;
+ /***/ public String noSystemConsoleAvailable;
+ /***/ public String password;
+ /***/ public String usernameFor;
+}
diff --git a/org.eclipse.jgit.http.server/.classpath b/org.eclipse.jgit.http.server/.classpath
index 304e86186..d7edf529a 100644
--- a/org.eclipse.jgit.http.server/.classpath
+++ b/org.eclipse.jgit.http.server/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 3bde0dc42..c772f5db0 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
javax.servlet.http;version="[2.5.0,3.0.0)",
org.eclipse.jgit.errors;version="[0.8.0,0.9.0)",
org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.transport;version="[0.8.0,0.9.0)",
org.eclipse.jgit.util;version="[0.8.0,0.9.0)",
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 5fba55cbc..08489ac16 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -90,6 +90,9 @@
<include>plugin.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit.http.server/resources/org/eclipse/jgit/http/server/HttpServerText.properties b/org.eclipse.jgit.http.server/resources/org/eclipse/jgit/http/server/HttpServerText.properties
new file mode 100644
index 000000000..8e36aab28
--- /dev/null
+++ b/org.eclipse.jgit.http.server/resources/org/eclipse/jgit/http/server/HttpServerText.properties
@@ -0,0 +1,21 @@
+alreadyInitializedByContainer=Already initialized by container
+cannotGetLengthOf=Cannot get length of {0}
+encodingNotSupportedByThisLibrary={0} "{1}": not supported by this library.
+expectedRepositoryAttribute=Expected Repository attribute
+filterMustNotBeNull=filter must not be null
+internalErrorDuringReceivePack=Internal error during receive-pack
+internalErrorDuringUploadPack=Internal error during upload-pack
+internalServerErrorRequestAttributeWasAlreadySet=Internal server error, request attribute {0} was already set when {1} was invoked.
+invalidBoolean=Invalid boolean {0} = {1}
+invalidIndex=Invalid index: {0}
+invalidRegexGroup=Invalid regex group {0}
+noResolverAvailable=No resolver available
+parameterNotSet=Parameter {0} not set
+pathForParamNotFound={0} (for {1}) not found
+pathNotSupported={0} not supported
+serviceNotEnabled=Service not enabled
+serviceNotPermitted=Service not permitted
+servletAlreadyInitialized=Servlet already initialized
+servletMustNotBeNull=servlet must not be null
+servletWasAlreadyBound=servlet was already bound
+unexpectedeOFOn=Unexpected EOF on {0}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java
index 280450d01..6b746e319 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/FileSender.java
@@ -57,6 +57,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.RandomAccessFile;
+import java.text.MessageFormat;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
@@ -100,7 +101,7 @@ final class FileSender {
}
final FileNotFoundException r;
- r = new FileNotFoundException("Cannot get length of " + path);
+ r = new FileNotFoundException(MessageFormat.format(HttpServerText.get().cannotGetLengthOf, path));
r.initCause(e);
throw r;
}
@@ -143,7 +144,7 @@ void serve(final HttpServletRequest req, final HttpServletResponse rsp,
final int r = (int) Math.min(buf.length, end - pos);
final int n = source.read(buf, 0, r);
if (n < 0) {
- throw new EOFException("Unexpected EOF on " + path);
+ throw new EOFException(MessageFormat.format(HttpServerText.get().unexpectedeOFOn, path));
}
out.write(buf, 0, n);
pos += n;
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java
index dced779c9..cc4cf6a80 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitServlet.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.http.server;
import java.io.File;
+import java.text.MessageFormat;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -169,7 +170,7 @@ public void setReceivePackFactory(ReceivePackFactory f) {
private void assertNotInitialized() {
if (initialized)
- throw new IllegalStateException("Already initialized by container");
+ throw new IllegalStateException(HttpServerText.get().alreadyInitializedByContainer);
}
@Override
@@ -259,11 +260,11 @@ public void init(final ServletConfig config) throws ServletException {
private File getFile(final String param) throws ServletException {
String n = getInitParameter(param);
if (n == null || "".equals(n))
- throw new ServletException("Parameter " + param + " not set");
+ throw new ServletException(MessageFormat.format(HttpServerText.get().parameterNotSet, param));
File path = new File(n);
if (!path.exists())
- throw new ServletException(path + " (for " + param + ") not found");
+ throw new ServletException(MessageFormat.format(HttpServerText.get().pathForParamNotFound, path, param));
return path;
}
@@ -274,14 +275,14 @@ private boolean getBoolean(String param) throws ServletException {
try {
return StringUtils.toBoolean(n);
} catch (IllegalArgumentException err) {
- throw new ServletException("Invalid boolean " + param + " = " + n);
+ throw new ServletException(MessageFormat.format(HttpServerText.get().invalidBoolean, param, n));
}
}
@Override
protected ServletBinder register(ServletBinder binder) {
if (resolver == null)
- throw new IllegalStateException("No resolver available");
+ throw new IllegalStateException(HttpServerText.get().noResolverAvailable);
binder = binder.through(new NoCacheFilter());
binder = binder.through(new RepositoryFilter(resolver));
return binder;
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
new file mode 100644
index 000000000..8ad0eb049
--- /dev/null
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.http.server;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit http server
+ */
+public class HttpServerText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static HttpServerText get() {
+ return NLS.getBundleFor(HttpServerText.class);
+ }
+
+ /***/ public String alreadyInitializedByContainer;
+ /***/ public String cannotGetLengthOf;
+ /***/ public String encodingNotSupportedByThisLibrary;
+ /***/ public String expectedRepositoryAttribute;
+ /***/ public String filterMustNotBeNull;
+ /***/ public String internalErrorDuringReceivePack;
+ /***/ public String internalErrorDuringUploadPack;
+ /***/ public String internalServerErrorRequestAttributeWasAlreadySet;
+ /***/ public String invalidBoolean;
+ /***/ public String invalidIndex;
+ /***/ public String invalidRegexGroup;
+ /***/ public String noResolverAvailable;
+ /***/ public String parameterNotSet;
+ /***/ public String pathForParamNotFound;
+ /***/ public String pathNotSupported;
+ /***/ public String serviceNotEnabled;
+ /***/ public String serviceNotPermitted;
+ /***/ public String servletAlreadyInitialized;
+ /***/ public String servletMustNotBeNull;
+ /***/ public String servletWasAlreadyBound;
+ /***/ public String unexpectedeOFOn;
+}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java
index ba8b8ab66..49fd535a7 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java
@@ -120,7 +120,7 @@ public void doPost(final HttpServletRequest req,
return;
} catch (IOException e) {
- getServletContext().log("Internal error during receive-pack", e);
+ getServletContext().log(HttpServerText.get().internalErrorDuringReceivePack, e);
rsp.sendError(SC_INTERNAL_SERVER_ERROR);
return;
}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java
index a212f0d7b..7975809e8 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/RepositoryFilter.java
@@ -50,6 +50,7 @@
import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_REPOSITORY;
import java.io.IOException;
+import java.text.MessageFormat;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -109,9 +110,9 @@ public void doFilter(final ServletRequest request,
final ServletResponse rsp, final FilterChain chain)
throws IOException, ServletException {
if (request.getAttribute(ATTRIBUTE_REPOSITORY) != null) {
- context.log("Internal server error, request attribute "
- + ATTRIBUTE_REPOSITORY + " was already set when "
- + getClass().getName() + " was invoked.");
+ context.log(MessageFormat.format(HttpServerText.get().internalServerErrorRequestAttributeWasAlreadySet
+ , ATTRIBUTE_REPOSITORY
+ , getClass().getName()));
((HttpServletResponse) rsp).sendError(SC_INTERNAL_SERVER_ERROR);
return;
}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java
index 7514d7c7e..28dabe4cc 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java
@@ -54,6 +54,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -85,7 +86,7 @@ public final class ServletUtils {
public static Repository getRepository(final ServletRequest req) {
Repository db = (Repository) req.getAttribute(ATTRIBUTE_REPOSITORY);
if (db == null)
- throw new IllegalStateException("Expected Repository attribute");
+ throw new IllegalStateException(HttpServerText.get().expectedRepositoryAttribute);
return db;
}
@@ -109,8 +110,8 @@ public static InputStream getInputStream(final HttpServletRequest req)
if (ENCODING_GZIP.equals(enc) || "x-gzip".equals(enc)) //$NON-NLS-1$
in = new GZIPInputStream(in);
else if (enc != null)
- throw new IOException(HDR_CONTENT_ENCODING + " \"" + enc + "\""
- + ": not supported by this library.");
+ throw new IOException(MessageFormat.format(HttpServerText.get().encodingNotSupportedByThisLibrary
+ , HDR_CONTENT_ENCODING, enc));
return in;
}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java
index 8de5f0678..92d41a0ca 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java
@@ -122,7 +122,7 @@ public void doPost(final HttpServletRequest req,
return;
} catch (IOException e) {
- getServletContext().log("Internal error during upload-pack", e);
+ getServletContext().log(HttpServerText.get().internalErrorDuringUploadPack, e);
rsp.reset();
rsp.sendError(SC_INTERNAL_SERVER_ERROR);
return;
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java
index d289743ba..7764a90c1 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java
@@ -46,6 +46,7 @@
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.IdentityHashMap;
@@ -59,6 +60,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jgit.http.server.HttpServerText;
+
/**
* Generic container servlet to manage routing to different pipelines.
* <p>
@@ -95,7 +98,7 @@ public MetaServlet() {
public ServletBinder serve(String path) {
if (path.startsWith("*"))
return register(new SuffixPipeline.Binder(path.substring(1)));
- throw new IllegalArgumentException("\"" + path + "\" not supported");
+ throw new IllegalArgumentException(MessageFormat.format(HttpServerText.get().pathNotSupported, path));
}
/**
@@ -164,7 +167,7 @@ private UrlPipeline find(final HttpServletRequest req)
private ServletBinder register(ServletBinderImpl b) {
synchronized (bindings) {
if (pipelines != null)
- throw new IllegalStateException("Servlet already initialized");
+ throw new IllegalStateException(HttpServerText.get().servletAlreadyInitialized);
bindings.add(b);
}
return register((ServletBinder) b);
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
index ed7b1cf69..5c7b965ff 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.http.server.glue;
import java.io.IOException;
+import java.text.MessageFormat;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -52,6 +53,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.eclipse.jgit.http.server.HttpServerText;
+
/**
* Switch servlet path and path info to use another regex match group.
* <p>
@@ -69,7 +72,7 @@ public class RegexGroupFilter implements Filter {
*/
public RegexGroupFilter(final int groupIdx) {
if (groupIdx < 1)
- throw new IllegalArgumentException("Invalid index: " + groupIdx);
+ throw new IllegalArgumentException(MessageFormat.format(HttpServerText.get().invalidIndex, groupIdx));
this.groupIdx = groupIdx - 1;
}
@@ -88,7 +91,7 @@ public void doFilter(final ServletRequest request,
if (groupIdx < g.length)
chain.doFilter(g[groupIdx], rsp);
else
- throw new ServletException("Invalid regex group " + (groupIdx + 1));
+ throw new ServletException(MessageFormat.format(HttpServerText.get().invalidRegexGroup, (groupIdx + 1)));
}
private static WrappedRequest[] groupsFor(final ServletRequest r) {
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
index d4cd445a1..e96fc59dc 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
@@ -50,6 +50,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jgit.http.server.HttpServerText;
+
abstract class ServletBinderImpl implements ServletBinder {
private final List<Filter> filters;
@@ -61,16 +63,16 @@ abstract class ServletBinderImpl implements ServletBinder {
public ServletBinder through(Filter filter) {
if (filter == null)
- throw new NullPointerException("filter must not be null");
+ throw new NullPointerException(HttpServerText.get().filterMustNotBeNull);
filters.add(filter);
return this;
}
public void with(HttpServlet servlet) {
if (servlet == null)
- throw new NullPointerException("servlet must not be null");
+ throw new NullPointerException(HttpServerText.get().servletMustNotBeNull);
if (httpServlet != null)
- throw new IllegalStateException("servlet was already bound");
+ throw new IllegalStateException(HttpServerText.get().servletWasAlreadyBound);
httpServlet = servlet;
}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotAuthorizedException.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotAuthorizedException.java
index fca044a10..6c9bf693d 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotAuthorizedException.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotAuthorizedException.java
@@ -43,12 +43,14 @@
package org.eclipse.jgit.http.server.resolver;
+import org.eclipse.jgit.http.server.HttpServerText;
+
/** Indicates the request service is not authorized for current user. */
public class ServiceNotAuthorizedException extends Exception {
private static final long serialVersionUID = 1L;
/** Indicates the request service is not available. */
public ServiceNotAuthorizedException() {
- super("Service not permitted");
+ super(HttpServerText.get().serviceNotPermitted);
}
}
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotEnabledException.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotEnabledException.java
index dedc0d482..adc132df3 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotEnabledException.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/ServiceNotEnabledException.java
@@ -43,12 +43,14 @@
package org.eclipse.jgit.http.server.resolver;
+import org.eclipse.jgit.http.server.HttpServerText;
+
/** Indicates the request service is not enabled on a repository. */
public class ServiceNotEnabledException extends Exception {
private static final long serialVersionUID = 1L;
/** Indicates the request service is not available. */
public ServiceNotEnabledException() {
- super("Service not enabled");
+ super(HttpServerText.get().serviceNotEnabled);
}
}
diff --git a/org.eclipse.jgit.iplog/.classpath b/org.eclipse.jgit.iplog/.classpath
index 304e86186..d7edf529a 100644
--- a/org.eclipse.jgit.iplog/.classpath
+++ b/org.eclipse.jgit.iplog/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
index 1a0de54a8..a871ba981 100644
--- a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Import-Package: org.eclipse.jgit.diff;version="[0.8.0,0.9.0)",
org.eclipse.jgit.dircache;version="[0.8.0,0.9.0)",
org.eclipse.jgit.errors;version="[0.8.0,0.9.0)",
org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revplot;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk.filter;version="[0.8.0,0.9.0)",
diff --git a/org.eclipse.jgit.iplog/pom.xml b/org.eclipse.jgit.iplog/pom.xml
index b03e5ed75..64d1dc151 100644
--- a/org.eclipse.jgit.iplog/pom.xml
+++ b/org.eclipse.jgit.iplog/pom.xml
@@ -83,6 +83,9 @@
<include>plugin.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit.iplog/resources/org/eclipse/jgit/iplog/IpLogText.properties b/org.eclipse.jgit.iplog/resources/org/eclipse/jgit/iplog/IpLogText.properties
new file mode 100644
index 000000000..758620839
--- /dev/null
+++ b/org.eclipse.jgit.iplog/resources/org/eclipse/jgit/iplog/IpLogText.properties
@@ -0,0 +1,17 @@
+CQString=CQ {0}
+CSVParsingError=CSV parsing error: {0}
+cannotLock=Cannot lock {0}
+cannotSerializeXML=Cannot serialize XML
+cannotWrite=Cannot write {0}
+committerString=Committer {0} {1}
+configurationFileInCommitHasNoProjectsDeclared=Configuration file {0} in commit {1} has no projects declared.
+configurationFileInCommitIsInvalid=Configuration file {0} in commit {1} is invalid
+contributorString=Contributor {0}
+incorrectlyScanned=Incorrectly scanned {0}
+invalidDate=Invalid date: {0}
+invalidURIFormat=Invalid URI format: {0}
+loginFailed=Login as {0} to {1} failed: {2}
+pageTitleWas=page title was "{0}"
+projectString=Project {0} ({1})
+queryFailed=Query {0} failed: {1}
+responseNotHTMLAsExpected=Response not HTML as expected
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CQ.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CQ.java
index c2a4fe119..13781f48a 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CQ.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CQ.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.iplog;
+import java.text.MessageFormat;
import java.util.Comparator;
/**
@@ -156,6 +157,6 @@ public boolean equals(Object other) {
@Override
public String toString() {
- return "CQ " + getID();
+ return MessageFormat.format(IpLogText.get().CQString, getID());
}
}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CSV.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CSV.java
index 8c57edb00..3f80c7d1f 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CSV.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/CSV.java
@@ -45,6 +45,7 @@
import java.io.BufferedReader;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -108,7 +109,7 @@ private List<String> readLine() throws IOException {
}
}
if (p < line.length() && line.charAt(p) != ',')
- throw new IOException("CSV parsing error: " + line);
+ throw new IOException(MessageFormat.format(IpLogText.get().CSVParsingError, line));
row.add(b.toString());
p++; // skip the trailing comma (if present)
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Committer.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Committer.java
index fe84a08ec..905f99e0f 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Committer.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Committer.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.iplog;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -172,7 +173,7 @@ boolean inRange(Date when) {
@Override
public String toString() {
- return "Committer " + getFirstName() + " " + getLastName();
+ return MessageFormat.format(IpLogText.get().committerString, getFirstName(), getLastName());
}
/** Date period during which the committer was active. */
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Contributor.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Contributor.java
index cf1f7c101..9d3771bfb 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Contributor.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Contributor.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.iplog;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -93,6 +94,6 @@ void add(SingleContribution bug) {
@Override
public String toString() {
- return "Contributor " + getName();
+ return MessageFormat.format(IpLogText.get().contributorString, getName());
}
}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IPZillaQuery.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IPZillaQuery.java
index 7d9f9a64c..b8db84a89 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IPZillaQuery.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IPZillaQuery.java
@@ -59,6 +59,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLEncoder;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -135,8 +136,8 @@ private Set<CQ> queryOneProject(Project project) throws IOException {
HttpURLConnection conn = open(csv);
if (HttpSupport.response(conn) != HttpURLConnection.HTTP_OK) {
- throw new IOException("Query " + csv + " failed: "
- + conn.getResponseCode() + " " + conn.getResponseMessage());
+ throw new IOException(MessageFormat.format(IpLogText.get().queryFailed
+ , csv, conn.getResponseCode() + " " + conn.getResponseMessage()));
}
BufferedReader br = reader(conn);
@@ -185,23 +186,23 @@ private void login() throws MalformedURLException,
out.close();
if (HttpSupport.response(c) != HttpURLConnection.HTTP_OK) {
- throw new IOException("Login as " + username + " to " + login
- + " failed: " + c.getResponseCode() + " "
- + c.getResponseMessage());
+ throw new IOException(MessageFormat.format(IpLogText.get().loginFailed
+ , username, login, c.getResponseCode() + " " + c.getResponseMessage()));
}
String content = readFully(c);
Matcher matcher = Pattern.compile("<title>(.*)</title>",
Pattern.CASE_INSENSITIVE).matcher(content);
if (!matcher.find()) {
- throw new IOException("Login as " + username + " to " + login
- + " failed: Response not HTML as expected");
+ throw new IOException(MessageFormat.format(IpLogText.get().loginFailed
+ , username, login, IpLogText.get().responseNotHTMLAsExpected));
}
String title = matcher.group(1);
if (!"IPZilla Main Page".equals(title)) {
- throw new IOException("Login as " + username + " to " + login
- + " failed; page title was \"" + title + "\"");
+ throw new IOException(MessageFormat.format(IpLogText.get().loginFailed
+ , username, login
+ , MessageFormat.format(IpLogText.get().pageTitleWas, title)));
}
}
@@ -246,7 +247,7 @@ private void setCookie(URL url, String name, String value)
try {
CookieHandler.getDefault().put(url.toURI(), cols);
} catch (URISyntaxException e) {
- IOException err = new IOException("Invalid URI format:" + url);
+ IOException err = new IOException(MessageFormat.format(IpLogText.get().invalidURIFormat, url));
err.initCause(e);
throw err;
}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogGenerator.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogGenerator.java
index d8956afe1..a9fdb8158 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogGenerator.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogGenerator.java
@@ -48,6 +48,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -209,15 +210,13 @@ private void loadEclipseIpLog(String version, RevCommit commit)
try {
meta.loadFrom(new BlobBasedConfig(null, db, log.getObjectId(0)));
} catch (ConfigInvalidException e) {
- throw new ConfigInvalidException("Configuration file "
- + log.getPathString() + " in commit " + commit.name()
- + " is invalid", e);
+ throw new ConfigInvalidException(MessageFormat.format(IpLogText.get().configurationFileInCommitIsInvalid
+ , log.getPathString(), commit.name()), e);
}
if (meta.getProjects().isEmpty()) {
- throw new ConfigInvalidException("Configuration file "
- + log.getPathString() + " in commit " + commit.name()
- + " has no projects declared.");
+ throw new ConfigInvalidException(MessageFormat.format(IpLogText.get().configurationFileInCommitHasNoProjectsDeclared
+ , log.getPathString(), commit.name()));
}
for (Project p : meta.getProjects()) {
@@ -274,7 +273,7 @@ private Date parseDate(SimpleDateFormat dt, String value)
try {
return dt.parse(value);
} catch (ParseException e) {
- IOException err = new IOException("Invalid date: " + value);
+ IOException err = new IOException(MessageFormat.format(IpLogText.get().invalidDate, value));
err.initCause(e);
throw err;
}
@@ -411,7 +410,7 @@ private void scanProjectCommits(Project proj, RevCommit start)
}
if (addedLines < 0)
- throw new IOException("Incorrectly scanned " + commit.name());
+ throw new IOException(MessageFormat.format(IpLogText.get().incorrectlyScanned, commit.name()));
if (1 == addedLines)
item.setSize("+1 line");
else
@@ -447,17 +446,17 @@ public void writeTo(OutputStream out) throws IOException {
s.setOutputProperty(INDENT, "2");
s.transform(new DOMSource(toXML()), new StreamResult(out));
} catch (ParserConfigurationException e) {
- IOException err = new IOException("Cannot serialize XML");
+ IOException err = new IOException(IpLogText.get().cannotSerializeXML);
err.initCause(e);
throw err;
} catch (TransformerConfigurationException e) {
- IOException err = new IOException("Cannot serialize XML");
+ IOException err = new IOException(IpLogText.get().cannotSerializeXML);
err.initCause(e);
throw err;
} catch (TransformerException e) {
- IOException err = new IOException("Cannot serialize XML");
+ IOException err = new IOException(IpLogText.get().cannotSerializeXML);
err.initCause(e);
throw err;
}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogMeta.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogMeta.java
index d0a5279ab..8d73b02fd 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogMeta.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogMeta.java
@@ -46,6 +46,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -155,7 +156,7 @@ public void syncCQs(File file, URL base, String username, String password)
LockFile lf = new LockFile(file);
if (!lf.lock())
- throw new IOException("Cannot lock " + file);
+ throw new IOException(MessageFormat.format(IpLogText.get().cannotLock, file));
try {
FileBasedConfig cfg = new FileBasedConfig(file);
cfg.load();
@@ -181,7 +182,7 @@ public void syncCQs(File file, URL base, String username, String password)
lf.write(Constants.encode(cfg.toText()));
if (!lf.commit())
- throw new IOException("Cannot write " + file);
+ throw new IOException(MessageFormat.format(IpLogText.get().cannotWrite, file));
} finally {
lf.unlock();
}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java
new file mode 100644
index 000000000..2067c5f63
--- /dev/null
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.iplog;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit IP Log
+ */
+public class IpLogText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static IpLogText get() {
+ return NLS.getBundleFor(IpLogText.class);
+ }
+
+ /***/ public String CQString;
+ /***/ public String CSVParsingError;
+ /***/ public String cannotLock;
+ /***/ public String cannotSerializeXML;
+ /***/ public String cannotWrite;
+ /***/ public String committerString;
+ /***/ public String configurationFileInCommitHasNoProjectsDeclared;
+ /***/ public String configurationFileInCommitIsInvalid;
+ /***/ public String contributorString;
+ /***/ public String incorrectlyScanned;
+ /***/ public String invalidDate;
+ /***/ public String invalidURIFormat;
+ /***/ public String loginFailed;
+ /***/ public String pageTitleWas;
+ /***/ public String projectString;
+ /***/ public String queryFailed;
+ /***/ public String responseNotHTMLAsExpected;
+}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java
index 15b79cede..efa1fed79 100644
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java
+++ b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.iplog;
+import java.text.MessageFormat;
import java.util.Collections;
import java.util.Comparator;
import java.util.Set;
@@ -128,6 +129,6 @@ void setVersion(String v) {
@Override
public String toString() {
- return "Project " + getID() + " (" + getName() + ")";
+ return MessageFormat.format(IpLogText.get().projectString, getID(), getName());
}
}
diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath
index c2f8fa7c8..2f7278b3c 100644
--- a/org.eclipse.jgit.pgm/.classpath
+++ b/org.eclipse.jgit.pgm/.classpath
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry excluding="*" including="META-INF/" kind="src" path=""/>
+ <classpathentry excluding="*|resources/|resources/" including="META-INF/" kind="src" path=""/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index cedc4e8fd..ad9964d55 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -11,7 +11,9 @@ Import-Package: org.eclipse.jgit.api;version="[0.8.0,0.9.0)",
org.eclipse.jgit.diff;version="[0.8.0,0.9.0)",
org.eclipse.jgit.dircache;version="[0.8.0,0.9.0)",
org.eclipse.jgit.errors;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.iplog;version="[0.8.0,0.9.0)",
org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revplot;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk.filter;version="[0.8.0,0.9.0)",
@@ -19,10 +21,17 @@ Import-Package: org.eclipse.jgit.api;version="[0.8.0,0.9.0)",
org.eclipse.jgit.treewalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.treewalk.filter;version="[0.8.0,0.9.0)",
org.eclipse.jgit.util;version="[0.8.0,0.9.0)",
- org.eclipse.jgit.iplog;version="[0.8.0,0.9.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)",
org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.pgm
+Export-Package: org.eclipse.jgit.pgm;version="0.8.0";
+ uses:="org.eclipse.jgit.lib,
+ org.eclipse.jgit.nls,
+ org.eclipse.jgit.treewalk,
+ org.eclipse.jgit.revwalk,
+ javax.swing,
+ org.eclipse.jgit.pgm.opt,
+ org.eclipse.jgit.awtui,
+ org.eclipse.jgit.transport"
Main-Class: org.eclipse.jgit.pgm.Main
Implementation-Title: JGit Command Line Interface
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index a42e4e722..1b085e463 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -111,6 +111,9 @@
<include>META-INF/services/org.eclipse.jgit.pgm.TextBuiltin</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
new file mode 100644
index 000000000..edf31e97b
--- /dev/null
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -0,0 +1,174 @@
+# default meta variable defined in the org.kohsuke.args4j.spi.StringOptionHandler
+VAL=VAL
+# default meta variable defined in the org.kohsuke.args4j.spi.StopOptionHandler
+ARGUMENTS=ARGUMENTS
+# default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler
+N=N
+
+IPZillaPasswordPrompt=IPZilla Password
+authorInfo=Author: {0} <{1}>
+averageMSPerRead=average {0} ms/read
+branchAlreadyExists=branch {0} already exists
+branchCreatedFrom =branch: Created from {0}
+branchIsNotAnAncestorOfYourCurrentHEAD=The branch '{0}' is not an ancestor of your current HEAD.\nIf you are sure you want to delete it, run 'jgit branch -D {0}'.
+branchNotFound=branch '{0}' not found.
+cacheTreePathInfo="{0}": {1} entries, {2} children
+cannotBeRenamed={0} cannot be renamed
+cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote
+cannotCreateCommand=Cannot create command {0}
+cannotCreateOutputStream=cannot create output stream
+cannotDeatchHEAD=Cannot deatch HEAD
+cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch '{0}' which you are currently on.
+cannotGuessLocalNameFrom=cannot guess local name from {0}
+cannotLock=Cannot lock {0}
+cannotReadBecause=cannot read {0}: {1}
+cannotReadPackageInformation=Cannot read package information.
+cannotRenameDetachedHEAD=Cannot rename detached HEAD
+cannotResolve=Cannot resolve {0}
+cannotSetupConsole=Cannot setup console
+cannotUseObjectsWithGlog=Cannot use --objects with glog
+cannotWrite=Cannot write {0}
+cantFindGitDirectory=error: can't find git directory
+cantWrite=Can't write {0}
+commitLabel=commit
+conflictingUsageOf_git_dir_andArguments=conflicting usage of --git-dir and arguments
+couldNotCreateBranch=Could not create branch {0}: {1}
+dateInfo=Date: {0}
+deletedBranch=Deleted branch {0}
+deletedRemoteBranch=Deleted remote branch {0}
+doesNotExist={0} does not exist
+everythingUpToDate=Everything up-to-date
+expectedNumberOfbytes=Expected {0} bytes.
+exporting=Exporting {0}
+failedToCommitIndex=failed to commit index
+failedToLockIndex=failed to lock index
+fatalError=fatal: {0}
+fatalErrorTagExists=fatal: tag '{0}' exists
+fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal:
+forcedUpdate=forced update
+fromURI=From {0}
+initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0}
+invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported.
+jgitVersion=jgit version {0}
+listeningOn=Listening on {0}
+metaVar_DAG=DAG
+metaVar_KEY=KEY
+metaVar_arg=ARG
+metaVar_base=base
+metaVar_bucket=BUCKET
+metaVar_command=command
+metaVar_commitOrTag=COMMIT|TAG
+metaVar_commitish=commit-ish
+metaVar_connProp=conn.prop
+metaVar_directory=DIRECTORY
+metaVar_file=FILE
+metaVar_gitDir=GIT_DIR
+metaVar_hostName=HOSTNAME
+metaVar_message=message
+metaVar_name=name
+metaVar_object=object
+metaVar_op=OP
+metaVar_pass=PASS
+metaVar_path=path
+metaVar_paths=path ...
+metaVar_port=PORT
+metaVar_refs=REFS
+metaVar_refspec=refspec
+metaVar_remoteName=name
+metaVar_seconds=SECONDS
+metaVar_service=SERVICE
+metaVar_treeish=tree-ish
+metaVar_uriish=uri-ish
+metaVar_url=URL
+metaVar_user=USER
+metaVar_version=VERSION
+mostCommonlyUsedCommandsAre=The most commonly used commands are:
+needApprovalToDestroyCurrentRepository=Need approval to destroy current repository
+noGitRepositoryConfigured=No Git repository configured.
+noSuchFile=no such file: {0}
+noTREESectionInIndex=no 'TREE' section in index
+nonFastForward=non-fast forward
+notABranch={0} is not a branch
+notACommit={0} is not a commit
+notAGitRepository='{0}' not a git repository
+notAJgitCommand={0} is not a jgit command
+notARevision=Not a revision: {0}
+notATagVersionIsRequired={0} is not a tag, --version is required
+notATree={0} is not a tree
+notAValidRefName={0} is not a valid ref name
+notAnIndexFile={0} is not an index file
+notAnObject={0} is not an object
+notFound=!! NOT FOUND !!
+onlyOneMetaVarExpectedIn=Only one {0} expected in {1}.
+pushTo=To {0}
+remoteMessage=remote: {0}
+remoteRefObjectChangedIsNotExpectedOne=remote ref object changed - is not expected one {0}
+remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs
+repaint=Repaint
+serviceNotSupported=Service '{0}' not supported
+skippingObject=skipping {0} {1}
+timeInMilliSeconds={0} ms
+tooManyRefsGiven=Too many refs given
+unsupportedOperation=Unsupported operation: {0}
+usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service
+usage_CreateABareRepository=Create a bare repository
+usage_CreateATag=Create a tag
+usage_CreateAnEmptyGitRepository=Create an empty git repository
+usage_DisplayTheVersionOfJgit=Display the version of jgit
+usage_IPZillaPassword=IPZilla Password
+usage_IPZillaURL=IPZilla URL
+usage_IPZillausername=IPZilla Username
+usage_RepositoryToReadFrom=Repository to read from
+usage_RepositoryToReceiveInto=Repository to receive into
+usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch'
+usage_ServerSideBackendForJgitPush=Server side backend for 'jgit push'
+usage_ShowDiffs=Show diffs
+usage_StopTrackingAFile=Stop tracking a file
+usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs
+usage_abortConnectionIfNoActivity=abort connection if no activity
+usage_actOnRemoteTrackingBranches=act on remote-tracking branches
+usage_alterTheDetailShown=alter the detail shown
+usage_approveDestructionOfRepository=approve destruction of repository
+usage_beMoreVerbose=be more verbose
+usage_beVerbose=be verbose
+usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory
+usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename
+usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged)
+usage_deleteFullyMergedBranch=delete fully merged branch
+usage_directoriesToExport=directories to export
+usage_disableTheServiceInAllRepositories=disable the service in all repositories
+usage_displayAListOfAllRegisteredJgitCommands=Display a list of all registered jgit commands
+usage_displayAllPossibleMergeBases=display all possible merge bases
+usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions
+usage_displayThisHelpText=display this help text
+usage_enableTheServiceInAllRepositories=enable the service in all repositories
+usage_exportRepositoriesOverGit=Export repositories over git://
+usage_exportWithoutGitDaemonExportOk=export without git-daemon-export-ok
+usage_fetchThinPack=fetch thin pack
+usage_fixAThinPackToBeComplete=fix a thin pack to be complete
+usage_forEachRefOutput=for-each-ref output
+usage_forceCreateBranchEvenExists=force create branch even exists
+usage_forceReplacingAnExistingTag=force replacing an existing tag
+usage_hostnameOrIpToListenOn=hostname (or ip) to listen on
+usage_indexFileFormatToCreate=index file format to create
+usage_inputOutputFile=Input/output file
+usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches
+usage_listCreateOrDeleteBranches=List, create, or delete branches
+usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output
+usage_moveRenameABranch=move/rename a branch
+usage_outputFile=Output file
+usage_path=path
+usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive
+usage_portNumberToListenOn=port number to listen on
+usage_produceAnEclipseIPLog=Produce an Eclipse IP log
+usage_pruneStaleTrackingRefs=prune stale tracking refs
+usage_recurseIntoSubtrees=recurse into subtrees
+usage_setTheGitRepositoryToOperateOn=set the git repository to operate on
+usage_showRefNamesMatchingCommits=Show ref names matching commits
+usage_symbolicVersionForTheProject=Symbolic version for the project
+usage_synchronizeIPZillaData=Synchronize IPZilla data
+usage_tagMessage=tag message
+usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository
+usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream
+usage_viewCommitHistory=View commit history
+warningNoCommitGivenOnCommandLine=warning: No commit given on command line, assuming {0}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
index 1e0356750..b572e0092 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
@@ -3,6 +3,7 @@
* Copyright (C) 2008-2010, Google Inc.
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
@@ -46,6 +47,8 @@
package org.eclipse.jgit.pgm;
+import java.io.PrintWriter;
+
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@@ -55,7 +58,7 @@
import org.eclipse.jgit.transport.Transport;
abstract class AbstractFetchCommand extends TextBuiltin {
- @Option(name = "--verbose", aliases = { "-v" }, usage = "be more verbose")
+ @Option(name = "--verbose", aliases = { "-v" }, usage = "usage_beMoreVerbose")
private boolean verbose;
protected void showFetchResult(final Transport tn, final FetchResult r) {
@@ -70,8 +73,7 @@ protected void showFetchResult(final Transport tn, final FetchResult r) {
final String dst = abbreviateRef(u.getLocalName(), true);
if (!shownURI) {
- out.print("From ");
- out.print(tn.getURI());
+ out.format(CLIText.get().fromURI, tn.getURI());
out.println();
shownURI = true;
}
@@ -84,6 +86,7 @@ protected void showFetchResult(final Transport tn, final FetchResult r) {
}
static void showRemoteMessages(String pkt) {
+ PrintWriter writer = new PrintWriter(System.err);
while (0 < pkt.length()) {
final int lf = pkt.indexOf('\n');
final int cr = pkt.indexOf('\r');
@@ -95,18 +98,22 @@ else if (0 <= lf)
else if (0 <= cr)
s = cr;
else {
- System.err.println("remote: " + pkt);
+ writer.format(CLIText.get().remoteMessage, pkt);
+ writer.println();
break;
}
- if (pkt.charAt(s) == '\r')
- System.err.print("remote: " + pkt.substring(0, s) + "\r");
- else
- System.err.println("remote: " + pkt.substring(0, s));
+ if (pkt.charAt(s) == '\r') {
+ writer.format(CLIText.get().remoteMessage, pkt.substring(0, s));
+ writer.print('\r');
+ } else {
+ writer.format(CLIText.get().remoteMessage, pkt.substring(0, s));
+ writer.println();
+ }
pkt = pkt.substring(s + 1);
}
- System.err.flush();
+ writer.flush();
}
private String longTypeOf(final TrackingRefUpdate u) {
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
index 179a32bdb..cad4b6331 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
@@ -52,23 +52,24 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLConnection;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jgit.transport.AmazonS3;
import org.kohsuke.args4j.Argument;
-@Command(name = "amazon-s3-client", common = false, usage = "Command line client for Amazon's S3 service")
+@Command(name = "amazon-s3-client", common = false, usage = "usage_CommandLineClientForamazonsS3Service")
class AmazonS3Client extends TextBuiltin {
- @Argument(index = 0, metaVar = "conn.prop", required = true)
+ @Argument(index = 0, metaVar = "metaVar_connProp", required = true)
private File propertyFile;
- @Argument(index = 1, metaVar = "OP", required = true)
+ @Argument(index = 1, metaVar = "metaVar_op", required = true)
private String op;
- @Argument(index = 2, metaVar = "BUCKET", required = true)
+ @Argument(index = 2, metaVar = "metaVar_bucket", required = true)
private String bucket;
- @Argument(index = 3, metaVar = "KEY", required = true)
+ @Argument(index = 3, metaVar = "metaVar_KEY", required = true)
private String key;
@Override
@@ -89,7 +90,7 @@ protected void run() throws Exception {
while (len > 0) {
final int n = in.read(tmp);
if (n < 0)
- throw new EOFException("Expected " + len + " bytes.");
+ throw new EOFException(MessageFormat.format(CLIText.get().expectedNumberOfbytes, len));
System.out.write(tmp, 0, n);
len -= n;
}
@@ -113,7 +114,7 @@ protected void run() throws Exception {
os.close();
} else {
- throw die("Unsupported operation: " + op);
+ throw die(MessageFormat.format(CLIText.get().unsupportedOperation, op));
}
}
@@ -128,9 +129,9 @@ private Properties properties() {
in.close();
}
} catch (FileNotFoundException e) {
- throw die("no such file: " + propertyFile, e);
+ throw die(MessageFormat.format(CLIText.get().noSuchFile, propertyFile), e);
} catch (IOException e) {
- throw die("cannot read " + propertyFile, e);
+ throw die(MessageFormat.format(CLIText.get().cannotReadBecause, propertyFile, e.getMessage()), e);
}
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java
index 7a1dd1604..0274219b7 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.pgm;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -64,28 +65,28 @@
import org.kohsuke.args4j.ExampleMode;
import org.kohsuke.args4j.Option;
-@Command(common = true, usage = "List, create, or delete branches")
+@Command(common = true, usage = "usage_listCreateOrDeleteBranches")
class Branch extends TextBuiltin {
- @Option(name = "--remote", aliases = { "-r" }, usage = "act on remote-tracking branches")
+ @Option(name = "--remote", aliases = { "-r" }, usage = "usage_actOnRemoteTrackingBranches")
private boolean remote = false;
- @Option(name = "--all", aliases = { "-a" }, usage = "list both remote-tracking and local branches")
+ @Option(name = "--all", aliases = { "-a" }, usage = "usage_listBothRemoteTrackingAndLocalBranches")
private boolean all = false;
- @Option(name = "--delete", aliases = { "-d" }, usage = "delete fully merged branch")
+ @Option(name = "--delete", aliases = { "-d" }, usage = "usage_deleteFullyMergedBranch")
private boolean delete = false;
- @Option(name = "--delete-force", aliases = { "-D" }, usage = "delete branch (even if not merged)")
+ @Option(name = "--delete-force", aliases = { "-D" }, usage = "usage_deleteBranchEvenIfNotMerged")
private boolean deleteForce = false;
- @Option(name = "--create-force", aliases = { "-f" }, usage = "force create branch even exists")
+ @Option(name = "--create-force", aliases = { "-f" }, usage = "usage_forceCreateBranchEvenExists")
private boolean createForce = false;
- @Option(name = "-m", usage = "move/rename a branch")
+ @Option(name = "-m", usage = "usage_moveRenameABranch")
private boolean rename = false;
- @Option(name = "--verbose", aliases = { "-v" }, usage = "be verbose")
+ @Option(name = "--verbose", aliases = { "-v" }, usage = "usage_beVerbose")
private boolean verbose = false;
@Argument
@@ -104,7 +105,7 @@ protected void run() throws Exception {
delete(deleteForce);
else {
if (branches.size() > 2)
- throw die("Too many refs given\n" + new CmdLineParser(this).printExample(ExampleMode.ALL));
+ throw die(CLIText.get().tooManyRefsGiven + new CmdLineParser(this).printExample(ExampleMode.ALL));
if (rename) {
String src, dst;
@@ -113,15 +114,15 @@ protected void run() throws Exception {
if (head != null && head.isSymbolic())
src = head.getLeaf().getName();
else
- throw die("Cannot rename detached HEAD");
+ throw die(CLIText.get().cannotRenameDetachedHEAD);
dst = branches.get(0);
} else {
src = branches.get(0);
final Ref old = db.getRef(src);
if (old == null)
- throw die(String.format("%s does not exist", src));
+ throw die(MessageFormat.format(CLIText.get().doesNotExist, src));
if (!old.getName().startsWith(Constants.R_HEADS))
- throw die(String.format("%s is not a branch", src));
+ throw die(MessageFormat.format(CLIText.get().notABranch, src));
src = old.getName();
dst = branches.get(1);
}
@@ -129,11 +130,11 @@ protected void run() throws Exception {
if (!dst.startsWith(Constants.R_HEADS))
dst = Constants.R_HEADS + dst;
if (!Repository.isValidRefName(dst))
- throw die(String.format("%s is not a valid ref name", dst));
+ throw die(MessageFormat.format(CLIText.get().notAValidRefName, dst));
RefRename r = db.renameRef(src, dst);
if (r.rename() != Result.RENAMED)
- throw die(String.format("%s cannot be renamed", src));
+ throw die(MessageFormat.format(CLIText.get().cannotBeRenamed, src));
} else if (branches.size() > 0) {
String newHead = branches.get(0);
@@ -153,16 +154,16 @@ protected void run() throws Exception {
if (!newRefName.startsWith(Constants.R_HEADS))
newRefName = Constants.R_HEADS + newRefName;
if (!Repository.isValidRefName(newRefName))
- throw die(String.format("%s is not a valid ref name", newRefName));
+ throw die(MessageFormat.format(CLIText.get().notAValidRefName, newRefName));
if (!createForce && db.resolve(newRefName) != null)
- throw die(String.format("branch %s already exists", newHead));
+ throw die(MessageFormat.format(CLIText.get().branchAlreadyExists, newHead));
RefUpdate updateRef = db.updateRef(newRefName);
updateRef.setNewObjectId(startAt);
updateRef.setForceUpdate(createForce);
- updateRef.setRefLogMessage("branch: Created from " + startBranch, false);
+ updateRef.setRefLogMessage(MessageFormat.format(CLIText.get().branchCreatedFrom, startBranch), false);
Result update = updateRef.update();
if (update == Result.REJECTED)
- throw die(String.format("Could not create branch %s: %s", newHead, update.toString()));
+ throw die(MessageFormat.format(CLIText.get().couldNotCreateBranch, newHead, update.toString()));
} else {
if (verbose)
rw = new RevWalk(db);
@@ -211,7 +212,7 @@ private void printHead(final String ref, final boolean isCurrent,
out.print(ref);
if (verbose) {
final int spaces = maxNameLength - ref.length() + 1;
- out.print(String.format("%" + spaces + "s", ""));
+ out.format("%" + spaces + "s", "");
final ObjectId objectId = refObj.getObjectId();
out.print(objectId.abbreviate(db).name());
out.print(' ');
@@ -225,8 +226,7 @@ private void delete(boolean force) throws IOException {
ObjectId head = db.resolve(Constants.HEAD);
for (String branch : branches) {
if (current.equals(branch)) {
- String err = "Cannot delete the branch '%s' which you are currently on.";
- throw die(String.format(err, branch));
+ throw die(MessageFormat.format(CLIText.get().cannotDeleteTheBranchWhichYouAreCurrentlyOn, branch));
}
RefUpdate update = db.updateRef((remote ? Constants.R_REMOTES
: Constants.R_HEADS)
@@ -235,15 +235,13 @@ private void delete(boolean force) throws IOException {
update.setForceUpdate(force || remote);
Result result = update.delete();
if (result == Result.REJECTED) {
- String err = "The branch '%s' is not an ancestor of your current HEAD.\n"
- + "If you are sure you want to delete it, run 'jgit branch -D %1$s'.";
- throw die(String.format(err, branch));
+ throw die(MessageFormat.format(CLIText.get().branchIsNotAnAncestorOfYourCurrentHEAD, branch));
} else if (result == Result.NEW)
- throw die(String.format("branch '%s' not found.", branch));
+ throw die(MessageFormat.format(CLIText.get().branchNotFound, branch));
if (remote)
- out.println(String.format("Deleted remote branch %s", branch));
+ out.println(MessageFormat.format(CLIText.get().deletedRemoteBranch, branch));
else if (verbose)
- out.println(String.format("Deleted branch %s", branch));
+ out.println(MessageFormat.format(CLIText.get().deletedBranch, branch));
}
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
new file mode 100644
index 000000000..8c811d4ef
--- /dev/null
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.pgm;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit command line interface
+ */
+public class CLIText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static CLIText get() {
+ return NLS.getBundleFor(CLIText.class);
+ }
+
+ /***/ public String IPZillaPasswordPrompt;
+ /***/ public String authorInfo;
+ /***/ public String averageMSPerRead;
+ /***/ public String branchAlreadyExists;
+ /***/ public String branchCreatedFrom;
+ /***/ public String branchIsNotAnAncestorOfYourCurrentHEAD;
+ /***/ public String branchNotFound;
+ /***/ public String cacheTreePathInfo;
+ /***/ public String cannotBeRenamed;
+ /***/ public String cannotChekoutNoHeadsAdvertisedByRemote;
+ /***/ public String cannotCreateCommand;
+ /***/ public String cannotCreateOutputStream;
+ /***/ public String cannotDeatchHEAD;
+ /***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn;
+ /***/ public String cannotGuessLocalNameFrom;
+ /***/ public String cannotLock;
+ /***/ public String cannotReadBecause;
+ /***/ public String cannotReadPackageInformation;
+ /***/ public String cannotRenameDetachedHEAD;
+ /***/ public String cannotResolve;
+ /***/ public String cannotSetupConsole;
+ /***/ public String cannotUseObjectsWithGlog;
+ /***/ public String cannotWrite;
+ /***/ public String cantFindGitDirectory;
+ /***/ public String cantWrite;
+ /***/ public String commitLabel;
+ /***/ public String conflictingUsageOf_git_dir_andArguments;
+ /***/ public String couldNotCreateBranch;
+ /***/ public String dateInfo;
+ /***/ public String deletedBranch;
+ /***/ public String deletedRemoteBranch;
+ /***/ public String doesNotExist;
+ /***/ public String everythingUpToDate;
+ /***/ public String expectedNumberOfbytes;
+ /***/ public String exporting;
+ /***/ public String failedToCommitIndex;
+ /***/ public String failedToLockIndex;
+ /***/ public String fatalError;
+ /***/ public String fatalErrorTagExists;
+ /***/ public String fatalThisProgramWillDestroyTheRepository;
+ /***/ public String forcedUpdate;
+ /***/ public String fromURI;
+ /***/ public String initializedEmptyGitRepositoryIn;
+ /***/ public String invalidHttpProxyOnlyHttpSupported;
+ /***/ public String jgitVersion;
+ /***/ public String listeningOn;
+ /***/ public String metaVar_command;
+ /***/ public String metaVar_commitish;
+ /***/ public String metaVar_object;
+ /***/ public String metaVar_paths;
+ /***/ public String metaVar_refspec;
+ /***/ public String metaVar_treeish;
+ /***/ public String mostCommonlyUsedCommandsAre;
+ /***/ public String needApprovalToDestroyCurrentRepository;
+ /***/ public String noGitRepositoryConfigured;
+ /***/ public String noSuchFile;
+ /***/ public String noTREESectionInIndex;
+ /***/ public String nonFastForward;
+ /***/ public String notABranch;
+ /***/ public String notACommit;
+ /***/ public String notAGitRepository;
+ /***/ public String notAJgitCommand;
+ /***/ public String notARevision;
+ /***/ public String notATagVersionIsRequired;
+ /***/ public String notATree;
+ /***/ public String notAValidRefName;
+ /***/ public String notAnIndexFile;
+ /***/ public String notAnObject;
+ /***/ public String notFound;
+ /***/ public String onlyOneMetaVarExpectedIn;
+ /***/ public String pushTo;
+ /***/ public String remoteMessage;
+ /***/ public String remoteRefObjectChangedIsNotExpectedOne;
+ /***/ public String remoteSideDoesNotSupportDeletingRefs;
+ /***/ public String repaint;
+ /***/ public String serviceNotSupported;
+ /***/ public String skippingObject;
+ /***/ public String timeInMilliSeconds;
+ /***/ public String tooManyRefsGiven;
+ /***/ public String unsupportedOperation;
+ /***/ public String warningNoCommitGivenOnCommandLine;
+}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
index a6c50ff19..b0f51ec58 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
@@ -46,6 +46,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -70,15 +71,15 @@
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
-@Command(common = true, usage = "Clone a repository into a new directory")
+@Command(common = true, usage = "usage_cloneRepositoryIntoNewDir")
class Clone extends AbstractFetchCommand {
- @Option(name = "--origin", aliases = { "-o" }, metaVar = "name", usage = "use <name> instead of 'origin' to track upstream")
+ @Option(name = "--origin", aliases = { "-o" }, metaVar = "metaVar_remoteName", usage = "usage_useNameInsteadOfOriginToTrackUpstream")
private String remoteName = Constants.DEFAULT_REMOTE_NAME;
- @Argument(index = 0, required = true, metaVar = "uri-ish")
+ @Argument(index = 0, required = true, metaVar = "metaVar_uriish")
private String sourceUri;
- @Argument(index = 1, metaVar = "directory")
+ @Argument(index = 1, metaVar = "metaVar_directory")
private String localName;
@Override
@@ -89,14 +90,14 @@ protected final boolean requiresRepository() {
@Override
protected void run() throws Exception {
if (localName != null && gitdir != null)
- throw die("conflicting usage of --git-dir and arguments");
+ throw die(CLIText.get().conflictingUsageOf_git_dir_andArguments);
final URIish uri = new URIish(sourceUri);
if (localName == null) {
try {
localName = uri.getHumanishName();
} catch (IllegalArgumentException e) {
- throw die("cannot guess local name from " + sourceUri);
+ throw die(MessageFormat.format(CLIText.get().cannotGuessLocalNameFrom, sourceUri));
}
}
if (gitdir == null)
@@ -107,8 +108,8 @@ protected void run() throws Exception {
db.getConfig().setBoolean("core", null, "bare", false);
db.getConfig().save();
- out.println("Initialized empty Git repository in "
- + gitdir.getAbsolutePath());
+ out.format(CLIText.get().initializedEmptyGitRepositoryIn, gitdir.getAbsolutePath());
+ out.println();
out.flush();
saveRemote(uri);
@@ -163,7 +164,7 @@ private Ref guessHEAD(final FetchResult result) {
private void doCheckout(final Ref branch) throws IOException {
if (branch == null)
- throw die("cannot checkout; no HEAD advertised by remote");
+ throw die(CLIText.get().cannotChekoutNoHeadsAdvertisedByRemote);
if (!Constants.HEAD.equals(branch.getName())) {
RefUpdate u = db.updateRef(Constants.HEAD);
u.disableRefLog();
@@ -183,4 +184,4 @@ private void doCheckout(final Ref branch) throws IOException {
co.checkout();
index.write();
}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java
index eb68ada9b..eace2e1f2 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java
@@ -45,6 +45,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
/**
* Description of a command (a {@link TextBuiltin} subclass.
@@ -140,9 +141,9 @@ public TextBuiltin create() {
try {
c = impl.getDeclaredConstructor();
} catch (SecurityException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (NoSuchMethodException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
}
c.setAccessible(true);
@@ -150,13 +151,13 @@ public TextBuiltin create() {
try {
r = c.newInstance();
} catch (InstantiationException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (IllegalAccessException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (IllegalArgumentException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (InvocationTargetException e) {
- throw new RuntimeException("Cannot create command " + getName(), e);
+ throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
}
r.setCommandName(getName());
return r;
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
index 88219bdd9..f015a9e7b 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
@@ -45,6 +45,7 @@
import java.io.File;
import java.net.InetSocketAddress;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -52,33 +53,33 @@
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.transport.DaemonService;
-@Command(common = true, usage = "Export repositories over git://")
+@Command(common = true, usage = "usage_exportRepositoriesOverGit")
class Daemon extends TextBuiltin {
- @Option(name = "--port", metaVar = "PORT", usage = "port number to listen on")
+ @Option(name = "--port", metaVar = "metaVar_port", usage = "usage_portNumberToListenOn")
int port = org.eclipse.jgit.transport.Daemon.DEFAULT_PORT;
- @Option(name = "--listen", metaVar = "HOSTNAME", usage = "hostname (or ip) to listen on")
+ @Option(name = "--listen", metaVar = "metaVar_hostName", usage = "usage_hostnameOrIpToListenOn")
String host;
- @Option(name = "--timeout", metaVar = "SECONDS", usage = "abort connection if no activity")
+ @Option(name = "--timeout", metaVar = "metaVar_seconds", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
- @Option(name = "--enable", metaVar = "SERVICE", usage = "enable the service in all repositories", multiValued = true)
+ @Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories", multiValued = true)
final List<String> enable = new ArrayList<String>();
- @Option(name = "--disable", metaVar = "SERVICE", usage = "disable the service in all repositories", multiValued = true)
+ @Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories", multiValued = true)
final List<String> disable = new ArrayList<String>();
- @Option(name = "--allow-override", metaVar = "SERVICE", usage = "configure the service in daemon.servicename", multiValued = true)
+ @Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename", multiValued = true)
final List<String> canOverride = new ArrayList<String>();
- @Option(name = "--forbid-override", metaVar = "SERVICE", usage = "configure the service in daemon.servicename", multiValued = true)
+ @Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename", multiValued = true)
final List<String> forbidOverride = new ArrayList<String>();
- @Option(name = "--export-all", usage = "export without git-daemon-export-ok")
+ @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
boolean exportAll;
- @Argument(required = true, metaVar = "DIRECTORY", usage = "directories to export")
+ @Argument(required = true, metaVar = "metaVar_directory", usage = "usage_directoriesToExport")
final List<File> directory = new ArrayList<File>();
@Override
@@ -108,18 +109,18 @@ protected void run() throws Exception {
service(d, n).setOverridable(false);
for (final File f : directory) {
- out.println("Exporting " + f.getAbsolutePath());
+ out.println(MessageFormat.format(CLIText.get().exporting, f.getAbsolutePath()));
d.exportDirectory(f);
}
d.start();
- out.println("Listening on " + d.getAddress());
+ out.println(MessageFormat.format(CLIText.get().listeningOn, d.getAddress()));
}
private DaemonService service(final org.eclipse.jgit.transport.Daemon d,
final String n) {
final DaemonService svc = d.getService(n);
if (svc == null)
- throw die("Service '" + n + "' not supported");
+ throw die(MessageFormat.format(CLIText.get().serviceNotSupported, n));
return svc;
}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
index 24bcdcc61..a5db45368 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
@@ -64,17 +64,17 @@
import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
-@Command(common = true, usage = "Show diffs")
+@Command(common = true, usage = "usage_ShowDiffs")
class Diff extends TextBuiltin {
- @Argument(index = 0, metaVar = "tree-ish", required = true)
+ @Argument(index = 0, metaVar = "metaVar_treeish", required = true)
void tree_0(final AbstractTreeIterator c) {
trees.add(c);
}
- @Argument(index = 1, metaVar = "tree-ish", required = true)
+ @Argument(index = 1, metaVar = "metaVar_treeish", required = true)
private final List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>();
- @Option(name = "--", metaVar = "path", multiValued = true, handler = PathTreeFilterHandler.class)
+ @Option(name = "--", metaVar = "metaVar_port", multiValued = true, handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL;
private DiffFormatter fmt = new DiffFormatter();
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java
index 13b1c780f..a7c40acdb 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java
@@ -57,18 +57,18 @@
import org.eclipse.jgit.treewalk.filter.TreeFilter;
class DiffTree extends TextBuiltin {
- @Option(name = "--recursive", usage = "recurse into subtrees", aliases = { "-r" })
+ @Option(name = "--recursive", usage = "usage_recurseIntoSubtrees", aliases = { "-r" })
private boolean recursive;
- @Argument(index = 0, metaVar = "tree-ish", required = true)
+ @Argument(index = 0, metaVar = "metaVar_treeish", required = true)
void tree_0(final AbstractTreeIterator c) {
trees.add(c);
}
- @Argument(index = 1, metaVar = "tree-ish", required = true)
+ @Argument(index = 1, metaVar = "metaVar_treeish", required = true)
private final List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>();
- @Option(name = "--", metaVar = "path", multiValued = true, handler = PathTreeFilterHandler.class)
+ @Option(name = "--", metaVar = "metaVar_path", multiValued = true, handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL;
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
index 6ed468510..a68145bf7 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
@@ -55,12 +55,12 @@
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.Transport;
-@Command(common = true, usage = "Update remote refs from another repository")
+@Command(common = true, usage = "usage_updateRemoteRefsFromAnotherRepository")
class Fetch extends AbstractFetchCommand {
- @Option(name = "--timeout", metaVar = "SECONDS", usage = "abort connection if no activity")
+ @Option(name = "--timeout", metaVar = "metaVar_seconds", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
- @Option(name = "--fsck", usage = "perform fsck style checks on receive")
+ @Option(name = "--fsck", usage = "usage_performFsckStyleChecksOnReceive")
private Boolean fsck;
@Option(name = "--no-fsck")
@@ -68,13 +68,13 @@ void nofsck(final boolean ignored) {
fsck = Boolean.FALSE;
}
- @Option(name = "--prune", usage = "prune stale tracking refs")
+ @Option(name = "--prune", usage = "usage_pruneStaleTrackingRefs")
private Boolean prune;
@Option(name = "--dry-run")
private boolean dryRun;
- @Option(name = "--thin", usage = "fetch thin pack")
+ @Option(name = "--thin", usage = "usage_fetchThinPack")
private Boolean thin;
@Option(name = "--no-thin")
@@ -82,10 +82,10 @@ void nothin(final boolean ignored) {
thin = Boolean.FALSE;
}
- @Argument(index = 0, metaVar = "uri-ish")
+ @Argument(index = 0, metaVar = "metaVar_uriish")
private String remote = Constants.DEFAULT_REMOTE_NAME;
- @Argument(index = 1, metaVar = "refspec")
+ @Argument(index = 1, metaVar = "metaVar_refspec")
private List<RefSpec> toget;
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java
index caf4f30e3..3dfd8ff62 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java
@@ -84,7 +84,7 @@ public void windowClosing(final WindowEvent e) {
final JPanel buttons = new JPanel(new FlowLayout());
final JButton repaint = new JButton();
- repaint.setText("Repaint");
+ repaint.setText(CLIText.get().repaint);
repaint.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
graphPane.repaint();
@@ -118,7 +118,7 @@ protected void show(final RevCommit c) throws Exception {
@Override
protected RevWalk createWalk() {
if (objects)
- throw die("Cannot use --objects with glog");
+ throw die(CLIText.get().cannotUseObjectsWithGlog);
final PlotWalk w = new PlotWalk(db);
w.sort(RevSort.BOUNDARY, true);
return w;
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java
index eb65e680f..35fd2a597 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java
@@ -52,13 +52,13 @@
import org.eclipse.jgit.lib.TextProgressMonitor;
class IndexPack extends TextBuiltin {
- @Option(name = "--fix-thin", usage = "fix a thin pack to be complete")
+ @Option(name = "--fix-thin", usage = "usage_fixAThinPackToBeComplete")
private boolean fixThin;
- @Option(name = "--index-version", usage = "index file format to create")
+ @Option(name = "--index-version", usage = "usage_indexFileFormatToCreate")
private int indexVersion = -1;
- @Argument(index = 0, required = true, metaVar = "base")
+ @Argument(index = 0, required = true, metaVar = "metaVar_base")
private File base;
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java
index a8fe7d8a5..d8c7bdfb4 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java
@@ -46,14 +46,15 @@
package org.eclipse.jgit.pgm;
import java.io.File;
+import java.text.MessageFormat;
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
-@Command(common = true, usage = "Create an empty git repository")
+@Command(common = true, usage = "usage_CreateAnEmptyGitRepository")
class Init extends TextBuiltin {
- @Option(name = "--bare", usage = "Create a bare repository")
+ @Option(name = "--bare", usage = "usage_CreateABareRepository")
private boolean bare;
@Override
@@ -67,7 +68,6 @@ protected void run() throws Exception {
gitdir = new File(bare ? "." : Constants.DOT_GIT);
db = new Repository(gitdir);
db.create(bare);
- out.println("Initialized empty Git repository in "
- + gitdir.getAbsolutePath());
+ out.println(MessageFormat.format(CLIText.get().initializedEmptyGitRepositoryIn, gitdir.getAbsolutePath()));
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
index 4b5975669..9aa197e4a 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
@@ -46,6 +46,7 @@
package org.eclipse.jgit.pgm;
import java.text.DateFormat;
+import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Iterator;
@@ -61,7 +62,7 @@
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-@Command(common = true, usage = "View commit history")
+@Command(common = true, usage = "usage_viewCommitHistory")
class Log extends RevWalkTextBuiltin {
private final TimeZone myTZ = TimeZone.getDefault();
@@ -69,7 +70,7 @@ class Log extends RevWalkTextBuiltin {
private Map<AnyObjectId, Set<Ref>> allRefsByPeeledObjectId;
- @Option(name="--decorate", usage="Show ref names matching commits")
+ @Option(name="--decorate", usage="usage_showRefNamesMatchingCommits")
private boolean decorate;
Log() {
@@ -86,7 +87,8 @@ protected RevWalk createWalk() {
@Override
protected void show(final RevCommit c) throws Exception {
- out.print("commit ");
+ out.print(CLIText.get().commitLabel);
+ out.print(" ");
c.getId().copyTo(outbuffer, out);
if (decorate) {
Collection<Ref> list = allRefsByPeeledObjectId.get(c.copy());
@@ -103,18 +105,11 @@ protected void show(final RevCommit c) throws Exception {
out.println();
final PersonIdent author = c.getAuthorIdent();
- out.print("Author: ");
- out.print(author.getName());
- out.print(" <");
- out.print(author.getEmailAddress());
- out.print(">");
- out.println();
+ out.println(MessageFormat.format(CLIText.get().authorInfo, author.getName(), author.getEmailAddress()));
final TimeZone authorTZ = author.getTimeZone();
fmt.setTimeZone(authorTZ != null ? authorTZ : myTZ);
- out.print("Date: ");
- out.print(fmt.format(author.getWhen()));
- out.println();
+ out.println(MessageFormat.format(CLIText.get().dateInfo, fmt.format(author.getWhen())));
out.println();
final String[] lines = c.getFullMessage().split("\n");
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java
index 44d1e754f..e750e2dea 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsRemote.java
@@ -53,10 +53,10 @@
import org.eclipse.jgit.transport.Transport;
class LsRemote extends TextBuiltin {
- @Option(name = "--timeout", metaVar = "SECONDS", usage = "abort connection if no activity")
+ @Option(name = "--timeout", metaVar = "metaVar_service", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
- @Argument(index = 0, metaVar = "uri-ish", required = true)
+ @Argument(index = 0, metaVar = "metaVar_uriish", required = true)
private String remote;
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
index 1a28a9a48..4b63edeb0 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
@@ -53,10 +53,10 @@
import org.eclipse.jgit.treewalk.TreeWalk;
class LsTree extends TextBuiltin {
- @Option(name = "--recursive", usage = "recurse into subtrees", aliases = { "-r" })
+ @Option(name = "--recursive", usage = "usage_recurseIntoSubtrees", aliases = { "-r" })
private boolean recursive;
- @Argument(index = 0, required = true, metaVar = "tree-ish")
+ @Argument(index = 0, required = true, metaVar = "metaVar_treeish")
private AbstractTreeIterator tree;
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
index f1191a459..306ac816d 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
@@ -45,9 +45,11 @@
package org.eclipse.jgit.pgm;
import java.io.File;
+import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -70,19 +72,19 @@
/** Command line entry point. */
public class Main {
- @Option(name = "--help", usage = "display this help text", aliases = { "-h" })
+ @Option(name = "--help", usage = "usage_displayThisHelpText", aliases = { "-h" })
private boolean help;
- @Option(name = "--show-stack-trace", usage = "display the Java stack trace on exceptions")
+ @Option(name = "--show-stack-trace", usage = "usage_displayThejavaStackTraceOnExceptions")
private boolean showStackTrace;
- @Option(name = "--git-dir", metaVar = "GIT_DIR", usage = "set the git repository to operate on")
+ @Option(name = "--git-dir", metaVar = "metaVar_gitDir", usage = "usage_setTheGitRepositoryToOperateOn")
private File gitdir;
- @Argument(index = 0, metaVar = "command", required = true, handler = SubcommandHandler.class)
+ @Argument(index = 0, metaVar = "metaVar_command", required = true, handler = SubcommandHandler.class)
private TextBuiltin subcommand;
- @Argument(index = 1, metaVar = "ARG")
+ @Argument(index = 1, metaVar = "metaVar_arg")
private List<String> arguments = new ArrayList<String>();
/**
@@ -101,17 +103,17 @@ public static void main(final String[] argv) {
configureHttpProxy();
me.execute(argv);
} catch (Die err) {
- System.err.println("fatal: " + err.getMessage());
+ System.err.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
if (me.showStackTrace)
err.printStackTrace();
System.exit(128);
} catch (Exception err) {
if (!me.showStackTrace && err.getCause() != null
&& err instanceof TransportException)
- System.err.println("fatal: " + err.getCause().getMessage());
+ System.err.println(MessageFormat.format(CLIText.get().fatalError, err.getCause().getMessage()));
if (err.getClass().getName().startsWith("org.eclipse.jgit.errors.")) {
- System.err.println("fatal: " + err.getMessage());
+ System.err.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
if (me.showStackTrace)
err.printStackTrace();
System.exit(128);
@@ -123,25 +125,27 @@ public static void main(final String[] argv) {
private void execute(final String[] argv) throws Exception {
final CmdLineParser clp = new CmdLineParser(this);
+ PrintWriter writer = new PrintWriter(System.err);
try {
clp.parseArgument(argv);
} catch (CmdLineException err) {
if (argv.length > 0 && !help) {
- System.err.println("fatal: " + err.getMessage());
+ writer.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
+ writer.flush();
System.exit(1);
}
}
if (argv.length == 0 || help) {
- final String ex = clp.printExample(ExampleMode.ALL);
- System.err.println("jgit" + ex + " command [ARG ...]");
+ final String ex = clp.printExample(ExampleMode.ALL, CLIText.get().resourceBundle());
+ writer.println("jgit" + ex + " command [ARG ...]");
if (help) {
- System.err.println();
- clp.printUsage(System.err);
- System.err.println();
+ writer.println();
+ clp.printUsage(writer, CLIText.get().resourceBundle());
+ writer.println();
} else if (subcommand == null) {
- System.err.println();
- System.err.println("The most commonly used commands are:");
+ writer.println();
+ writer.println(CLIText.get().mostCommonlyUsedCommandsAre);
final CommandRef[] common = CommandCatalog.common();
int width = 0;
for (final CommandRef c : common)
@@ -149,15 +153,16 @@ private void execute(final String[] argv) throws Exception {
width += 2;
for (final CommandRef c : common) {
- System.err.print(' ');
- System.err.print(c.getName());
+ writer.print(' ');
+ writer.print(c.getName());
for (int i = c.getName().length(); i < width; i++)
- System.err.print(' ');
- System.err.print(c.getUsage());
- System.err.println();
+ writer.print(' ');
+ writer.print(CLIText.get().resourceBundle().getString(c.getUsage()));
+ writer.println();
}
- System.err.println();
+ writer.println();
}
+ writer.flush();
System.exit(1);
}
@@ -203,7 +208,8 @@ private void execute(final String[] argv) throws Exception {
altobjectdirs = null;
if (gitdir == null || !gitdir.isDirectory()) {
- System.err.println("error: can't find git directory");
+ writer.println(CLIText.get().cantFindGitDirectory);
+ writer.flush();
System.exit(1);
}
cmd.init(new Repository(gitdir, gitworktree, objectdir, altobjectdirs, indexfile), gitdir);
@@ -252,15 +258,15 @@ private static boolean installConsole() {
return false;
} catch (IllegalArgumentException e) {
- throw new RuntimeException("Cannot setup console", e);
+ throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (SecurityException e) {
- throw new RuntimeException("Cannot setup console", e);
+ throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (IllegalAccessException e) {
- throw new RuntimeException("Cannot setup console", e);
+ throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (InvocationTargetException e) {
- throw new RuntimeException("Cannot setup console", e);
+ throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (NoSuchMethodException e) {
- throw new RuntimeException("Cannot setup console", e);
+ throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
}
}
@@ -297,8 +303,7 @@ private static void configureHttpProxy() throws MalformedURLException {
final URL u = new URL((s.indexOf("://") == -1) ? "http://" + s : s);
if (!"http".equals(u.getProtocol()))
- throw new MalformedURLException("Invalid http_proxy: " + s
- + ": Only http supported.");
+ throw new MalformedURLException(MessageFormat.format(CLIText.get().invalidHttpProxyOnlyHttpSupported, s));
final String proxyHost = u.getHost();
final int proxyPort = u.getPort();
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
index 91fd7443b..f59fd4315 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
@@ -53,15 +53,15 @@
import org.eclipse.jgit.revwalk.filter.RevFilter;
class MergeBase extends TextBuiltin {
- @Option(name = "--all", usage = "display all possible merge bases")
+ @Option(name = "--all", usage = "usage_displayAllPossibleMergeBases")
private boolean all;
- @Argument(index = 0, metaVar = "commit-ish", required = true)
+ @Argument(index = 0, metaVar = "metaVar_commitish", required = true)
void commit_0(final RevCommit c) {
commits.add(c);
}
- @Argument(index = 1, metaVar = "commit-ish", required = true)
+ @Argument(index = 1, metaVar = "metaVar_commitish", required = true)
private final List<RevCommit> commits = new ArrayList<RevCommit>();
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
index 2c0254563..22fd7e38f 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.pgm;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -59,15 +60,15 @@
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.RemoteRefUpdate.Status;
-@Command(common = true, usage = "Update remote repository from local refs")
+@Command(common = true, usage = "usage_UpdateRemoteRepositoryFromLocalRefs")
class Push extends TextBuiltin {
- @Option(name = "--timeout", metaVar = "SECONDS", usage = "abort connection if no activity")
+ @Option(name = "--timeout", metaVar = "metaVar_seconds", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
- @Argument(index = 0, metaVar = "uri-ish")
+ @Argument(index = 0, metaVar = "metaVar_uriish")
private String remote = Constants.DEFAULT_REMOTE_NAME;
- @Argument(index = 1, metaVar = "refspec")
+ @Argument(index = 1, metaVar = "metaVar_refspec")
private final List<RefSpec> refSpecs = new ArrayList<RefSpec>();
@Option(name = "--all")
@@ -94,7 +95,7 @@ void nothin(final boolean ignored) {
@Option(name = "--force", aliases = { "-f" })
private boolean force;
- @Option(name = "--receive-pack", metaVar = "path")
+ @Option(name = "--receive-pack", metaVar = "metaVar_path")
private String receivePack;
@Option(name = "--dry-run")
@@ -164,14 +165,14 @@ private void printPushResult(final URIish uri,
AbstractFetchCommand.showRemoteMessages(result.getMessages());
if (everythingUpToDate)
- out.println("Everything up-to-date");
+ out.println(CLIText.get().everythingUpToDate);
}
private void printRefUpdateResult(final URIish uri,
final PushResult result, final RemoteRefUpdate rru) {
if (!shownURI) {
shownURI = true;
- out.format("To %s\n", uri);
+ out.println(MessageFormat.format(CLIText.get().pushTo, uri));
}
final String remoteName = rru.getRemoteName();
@@ -197,7 +198,7 @@ private void printRefUpdateResult(final URIish uri,
.name()
+ (fastForward ? ".." : "...")
+ rru.getNewObjectId().abbreviate(db).name();
- final String message = fastForward ? null : "forced update";
+ final String message = fastForward ? null : CLIText.get().forcedUpdate;
printUpdateLine(flag, summary, srcRef, remoteName, message);
}
}
@@ -209,17 +210,18 @@ private void printRefUpdateResult(final URIish uri,
case REJECTED_NODELETE:
printUpdateLine('!', "[rejected]", null, remoteName,
- "remote side does not support deleting refs");
+ CLIText.get().remoteSideDoesNotSupportDeletingRefs);
break;
case REJECTED_NONFASTFORWARD:
printUpdateLine('!', "[rejected]", srcRef, remoteName,
- "non-fast forward");
+ CLIText.get().nonFastForward);
break;
case REJECTED_REMOTE_CHANGED:
- final String message = "remote ref object changed - is not expected one "
- + rru.getExpectedOldObjectId().abbreviate(db).name();
+ final String message = MessageFormat.format(
+ CLIText.get().remoteRefObjectChangedIsNotExpectedOne
+ , rru.getExpectedOldObjectId().abbreviate(db).name());
printUpdateLine('!', "[rejected]", srcRef, remoteName, message);
break;
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java
index f43a2793e..09a9f2b58 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java
@@ -45,14 +45,15 @@
package org.eclipse.jgit.pgm;
import java.io.File;
+import java.text.MessageFormat;
import org.kohsuke.args4j.Argument;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
-@Command(common = false, usage = "Server side backend for 'jgit push'")
+@Command(common = false, usage = "usage_ServerSideBackendForJgitPush")
class ReceivePack extends TextBuiltin {
- @Argument(index = 0, required = true, metaVar = "DIRECTORY", usage = "Repository to receive into")
+ @Argument(index = 0, required = true, metaVar = "metaVar_directory", usage = "usage_RepositoryToReceiveInto")
File dstGitdir;
@Override
@@ -68,7 +69,7 @@ protected void run() throws Exception {
dstGitdir = new File(dstGitdir, Constants.DOT_GIT);
db = new Repository(dstGitdir);
if (!db.getObjectsDirectory().isDirectory())
- throw die("'" + dstGitdir.getPath() + "' not a git repository");
+ throw die(MessageFormat.format(CLIText.get().notAGitRepository, dstGitdir.getPath()));
rp = new org.eclipse.jgit.transport.ReceivePack(db);
rp.receive(System.in, System.out, System.err);
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
index cb0cd6d0f..ea6eeb102 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
@@ -43,6 +43,7 @@
package org.eclipse.jgit.pgm;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
@@ -109,10 +110,10 @@ void enableBoundary(final boolean on) {
enableRevSort(RevSort.BOUNDARY, on);
}
- @Argument(index = 0, metaVar = "commit-ish")
+ @Argument(index = 0, metaVar = "metaVar_commitish")
private final List<RevCommit> commits = new ArrayList<RevCommit>();
- @Option(name = "--", metaVar = "path", multiValued = true, handler = PathTreeFilterHandler.class)
+ @Option(name = "--", metaVar = "metaVar_path", multiValued = true, handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL;
private final List<RevFilter> revLimiter = new ArrayList<RevFilter>();
@@ -150,7 +151,7 @@ else if (revLimiter.size() > 1)
if (commits.isEmpty()) {
final ObjectId head = db.resolve(Constants.HEAD);
if (head == null)
- throw die("Cannot resolve " + Constants.HEAD);
+ throw die(MessageFormat.format(CLIText.get().cannotResolve, Constants.HEAD));
commits.add(walk.parseCommit(head));
}
for (final RevCommit c : commits) {
@@ -167,9 +168,8 @@ else if (revLimiter.size() > 1)
final long end = System.currentTimeMillis();
System.err.print(n);
System.err.print(' ');
- System.err.print(end - start);
- System.err.print(" ms");
- System.err.println();
+ System.err.println(MessageFormat.format(
+ CLIText.get().timeInMilliSeconds, end - start));
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java
index 63e6e1712..1b8711dc9 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java
@@ -57,9 +57,9 @@
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
-@Command(usage = "Stop tracking a file", common = true)
+@Command(usage = "usage_StopTrackingAFile", common = true)
class Rm extends TextBuiltin {
- @Argument(metaVar = "path", usage = "path", multiValued = true, required = true, handler = PathTreeFilterHandler.class)
+ @Argument(metaVar = "metaVar_path", usage = "usage_path", multiValued = true, required = true, handler = PathTreeFilterHandler.class)
@Option(name = "--", handler = StopOptionHandler.class)
private TreeFilter paths;
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
index 703b10baf..63d26eaca 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java
@@ -47,6 +47,8 @@
package org.eclipse.jgit.pgm;
+import java.text.MessageFormat;
+
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -55,18 +57,18 @@
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.PersonIdent;
-@Command(common = true, usage = "Create a tag")
+@Command(common = true, usage = "usage_CreateATag")
class Tag extends TextBuiltin {
- @Option(name = "-f", usage = "force replacing an existing tag")
+ @Option(name = "-f", usage = "usage_forceReplacingAnExistingTag")
private boolean force;
- @Option(name = "-m", metaVar = "message", usage = "tag message")
+ @Option(name = "-m", metaVar = "metaVar_message", usage = "usage_tagMessage")
private String message = "";
- @Argument(index = 0, required = true, metaVar = "name")
+ @Argument(index = 0, required = true, metaVar = "metaVar_name")
private String tagName;
- @Argument(index = 1, metaVar = "object")
+ @Argument(index = 1, metaVar = "metaVar_object")
private ObjectId object;
@Override
@@ -74,15 +76,14 @@ protected void run() throws Exception {
if (object == null) {
object = db.resolve(Constants.HEAD);
if (object == null)
- throw die("Cannot resolve " + Constants.HEAD);
+ throw die(MessageFormat.format(CLIText.get().cannotResolve, Constants.HEAD));
}
if (!tagName.startsWith(Constants.R_TAGS))
tagName = Constants.R_TAGS + tagName;
if (!force && db.resolve(tagName) != null) {
- throw die("fatal: tag '"
- + tagName.substring(Constants.R_TAGS.length())
- + "' exists");
+ throw die(MessageFormat.format(CLIText.get().fatalErrorTagExists
+ , tagName.substring(Constants.R_TAGS.length())));
}
final ObjectLoader ldr = db.openObject(object);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
index 13b45e242..b6f12a1ab 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java
@@ -53,6 +53,8 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.Option;
@@ -75,7 +77,7 @@
public abstract class TextBuiltin {
private String commandName;
- @Option(name = "--help", usage = "display this help text", aliases = { "-h" })
+ @Option(name = "--help", usage = "usage_displayThisHelpText", aliases = { "-h" })
private boolean help;
/** Stream to output to, typically this is standard output. */
@@ -110,7 +112,7 @@ void init(final Repository repo, final File gd) {
out = new PrintWriter(new BufferedWriter(
new OutputStreamWriter(System.out)));
} catch (IOException e) {
- throw die("cannot create output stream");
+ throw die(CLIText.get().cannotCreateOutputStream);
}
if (repo != null) {
@@ -153,7 +155,7 @@ protected void parseArguments(final String[] args) {
clp.parseArgument(args);
} catch (CmdLineException err) {
if (!help) {
- System.err.println("fatal: " + err.getMessage());
+ System.err.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
System.exit(1);
}
}
@@ -181,19 +183,29 @@ public void printUsageAndExit(final CmdLineParser clp) {
* @param clp
*/
public void printUsageAndExit(final String message, final CmdLineParser clp) {
- System.err.println(message);
- System.err.print("jgit ");
- System.err.print(commandName);
- clp.printSingleLineUsage(System.err);
- System.err.println();
+ PrintWriter writer = new PrintWriter(System.err);
+ writer.println(message);
+ writer.print("jgit ");
+ writer.print(commandName);
+ clp.printSingleLineUsage(writer, getResourceBundle());
+ writer.println();
- System.err.println();
- clp.printUsage(System.err);
- System.err.println();
+ writer.println();
+ clp.printUsage(writer, getResourceBundle());
+ writer.println();
+ writer.flush();
System.exit(1);
}
+ /**
+ * @return the resource bundle that will be passed to args4j for purpose
+ * of string localization
+ */
+ protected ResourceBundle getResourceBundle() {
+ return CLIText.get().resourceBundle();
+ }
+
/**
* Perform the actions of this command.
* <p>
@@ -216,7 +228,7 @@ public Repository getRepository() {
ObjectId resolve(final String s) throws IOException {
final ObjectId r = db.resolve(s);
if (r == null)
- throw die("Not a revision: " + s);
+ throw die(MessageFormat.format(CLIText.get().notARevision, s));
return r;
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java
index ea30899dc..52d2488f7 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java
@@ -45,18 +45,19 @@
package org.eclipse.jgit.pgm;
import java.io.File;
+import java.text.MessageFormat;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
-@Command(common = false, usage = "Server side backend for 'jgit fetch'")
+@Command(common = false, usage = "usage_ServerSideBackendForJgitFetch")
class UploadPack extends TextBuiltin {
- @Option(name = "--timeout", metaVar = "SECONDS", usage = "abort connection if no activity")
+ @Option(name = "--timeout", metaVar = "metaVar_seconds", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
- @Argument(index = 0, required = true, metaVar = "DIRECTORY", usage = "Repository to read from")
+ @Argument(index = 0, required = true, metaVar = "metaVar_directory", usage = "usage_RepositoryToReadFrom")
File srcGitdir;
@Override
@@ -72,7 +73,7 @@ protected void run() throws Exception {
srcGitdir = new File(srcGitdir, Constants.DOT_GIT);
db = new Repository(srcGitdir);
if (!db.getObjectsDirectory().isDirectory())
- throw die("'" + srcGitdir.getPath() + "' not a git repository");
+ throw die(MessageFormat.format(CLIText.get().notAGitRepository, srcGitdir.getPath()));
rp = new org.eclipse.jgit.transport.UploadPack(db);
if (0 <= timeout)
rp.setTimeout(timeout);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java
index 11b6e8352..5bad4ef98 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java
@@ -43,16 +43,16 @@
package org.eclipse.jgit.pgm;
-@Command(common = true, usage = "Display the version of jgit")
+import java.text.MessageFormat;
+
+@Command(common = true, usage = "usage_DisplayTheVersionOfJgit")
class Version extends TextBuiltin {
@Override
protected void run() throws Exception {
final Package pkg = getClass().getPackage();
if (pkg == null || pkg.getImplementationVersion() == null)
- throw die("Cannot read package information.");
+ throw die(CLIText.get().cannotReadPackageInformation);
- out.print("jgit version ");
- out.print(pkg.getImplementationVersion());
- out.println();
+ out.println(MessageFormat.format(CLIText.get().jgitVersion, pkg.getImplementationVersion()));
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
index 8949cbce6..d772ffe23 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
@@ -44,8 +44,11 @@
package org.eclipse.jgit.pgm.debug;
+import java.text.MessageFormat;
+
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheTree;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
class MakeCacheTree extends TextBuiltin {
@@ -57,16 +60,8 @@ protected void run() throws Exception {
}
private void show(final DirCacheTree tree) {
- out.print("\"");
- out.print(tree.getPathString());
- out.print("\"");
- out.print(": ");
- out.print(tree.getEntrySpan());
- out.print(" entries");
- out.print(", ");
- out.print(tree.getChildCount());
- out.print(" children");
- out.println();
+ out.println(MessageFormat.format(CLIText.get().cacheTreePathInfo
+ , tree.getPathString(), tree.getEntrySpan(), tree.getChildCount()));
for (int i = 0; i < tree.getChildCount(); i++)
show(tree.getChild(i));
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
index b0c1c77fd..2a1079b31 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
@@ -44,7 +44,10 @@
package org.eclipse.jgit.pgm.debug;
+import java.text.MessageFormat;
+
import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
class ReadDirCache extends TextBuiltin {
@@ -55,6 +58,7 @@ protected void run() throws Exception {
for (int i = 0; i < cnt; i++)
DirCache.read(db);
final long end = System.currentTimeMillis();
- out.println(" average " + ((end - start) / cnt) + " ms/read");
+ out.print(" ");
+ out.println(MessageFormat.format(CLIText.get().averageMSPerRead, (end - start) / cnt));
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java
index 0a5f2a0c9..38df04101 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java
@@ -48,6 +48,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -72,6 +73,7 @@
import org.eclipse.jgit.lib.RefWriter;
import org.eclipse.jgit.lib.TextProgressMonitor;
import org.eclipse.jgit.lib.Tree;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -96,13 +98,13 @@
class RebuildCommitGraph extends TextBuiltin {
private final String REALLY = "--destroy-this-repository";
- @Option(name = REALLY, usage = "approve destruction of repository")
+ @Option(name = REALLY, usage = "usage_approveDestructionOfRepository")
boolean really;
- @Argument(index = 0, required = true, metaVar = "REFS", usage = "for-each-ref output")
+ @Argument(index = 0, required = true, metaVar = "metaVar_refs", usage = "usage_forEachRefOutput")
File refList;
- @Argument(index = 1, required = true, metaVar = "DAG", usage = "log --all '--pretty=format:%H %ct %P' output")
+ @Argument(index = 1, required = true, metaVar = "metaVar_refs", usage = "usage_logAllPretty")
File graph;
private final ProgressMonitor pm = new TextProgressMonitor();
@@ -112,28 +114,15 @@ class RebuildCommitGraph extends TextBuiltin {
@Override
protected void run() throws Exception {
if (!really && !db.getAllRefs().isEmpty()) {
- final StringBuilder m = new StringBuilder();
- m.append("fatal: ");
- m.append("This program will destroy the repository:");
- m.append("\n");
- m.append("fatal:\n");
- m.append("fatal: ");
- m.append(db.getDirectory().getAbsolutePath());
- m.append("\n");
- m.append("fatal:\n");
- m.append("fatal: ");
- m.append("To continue, add ");
- m.append(REALLY);
- m.append(" to the command line");
- m.append("\n");
- m.append("fatal:");
- System.err.println(m);
- throw die("Need approval to destroy current repository");
+ System.err.println(
+ MessageFormat.format(CLIText.get().fatalThisProgramWillDestroyTheRepository
+ , db.getDirectory().getAbsolutePath(), REALLY));
+ throw die(CLIText.get().needApprovalToDestroyCurrentRepository);
}
if (!refList.isFile())
- throw die("no such file: " + refList.getPath());
+ throw die(MessageFormat.format(CLIText.get().noSuchFile, refList.getPath()));
if (!graph.isFile())
- throw die("no such file: " + graph.getPath());
+ throw die(MessageFormat.format(CLIText.get().noSuchFile, graph.getPath()));
recreateCommitGraph();
detachHead();
@@ -240,10 +229,10 @@ private void detachHead() throws IOException {
final LockFile lf;
lf = new LockFile(new File(db.getDirectory(), Constants.HEAD));
if (!lf.lock())
- throw new IOException("Cannot lock HEAD");
+ throw new IOException(MessageFormat.format(CLIText.get().cannotLock, Constants.HEAD));
lf.write(id);
if (!lf.commit())
- throw new IOException("Cannot deatch HEAD");
+ throw new IOException(CLIText.get().cannotDeatchHEAD);
}
}
@@ -267,14 +256,14 @@ protected void writeFile(final String name, final byte[] content)
final File file = new File(db.getDirectory(), name);
final LockFile lck = new LockFile(file);
if (!lck.lock())
- throw new ObjectWritingException("Can't write " + file);
+ throw new ObjectWritingException(MessageFormat.format(CLIText.get().cantWrite, file));
try {
lck.write(content);
} catch (IOException ioe) {
- throw new ObjectWritingException("Can't write " + file);
+ throw new ObjectWritingException(MessageFormat.format(CLIText.get().cantWrite, file));
}
if (!lck.commit())
- throw new ObjectWritingException("Can't write " + file);
+ throw new ObjectWritingException(MessageFormat.format(CLIText.get().cantWrite, file));
}
}.writePackedRefs();
}
@@ -299,7 +288,7 @@ private Map<String, Ref> computeNewRefs() throws IOException {
rw.parseAny(id);
} catch (MissingObjectException mue) {
if (!Constants.TYPE_COMMIT.equals(type)) {
- System.err.println("skipping " + type + " " + name);
+ System.err.println(MessageFormat.format(CLIText.get().skippingObject, type, name));
continue;
}
throw new MissingObjectException(id, type);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
index 29cdc98a8..09796edb3 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
@@ -44,8 +44,11 @@
package org.eclipse.jgit.pgm.debug;
+import java.text.MessageFormat;
+
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheTree;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
class ShowCacheTree extends TextBuiltin {
@@ -54,21 +57,13 @@ protected void run() throws Exception {
final DirCache cache = DirCache.read(db);
final DirCacheTree tree = cache.getCacheTree(false);
if (tree == null)
- throw die("no 'TREE' section in index");
+ throw die(CLIText.get().noTREESectionInIndex);
show(tree);
}
private void show(final DirCacheTree tree) {
- out.print("\"");
- out.print(tree.getPathString());
- out.print("\"");
- out.print(": ");
- out.print(tree.getEntrySpan());
- out.print(" entries");
- out.print(", ");
- out.print(tree.getChildCount());
- out.print(" children");
- out.println();
+ out.println(MessageFormat.format(CLIText.get().cacheTreePathInfo
+ , tree.getPathString(), tree.getEntrySpan(), tree.getChildCount()));
for (int i = 0; i < tree.getChildCount(); i++)
show(tree.getChild(i));
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
index 063cab5ac..78fc1453d 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
@@ -46,14 +46,15 @@
import java.net.URL;
import org.kohsuke.args4j.Option;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.Command;
import org.eclipse.jgit.pgm.CommandCatalog;
import org.eclipse.jgit.pgm.CommandRef;
import org.eclipse.jgit.pgm.TextBuiltin;
-@Command(usage = "Display a list of all registered jgit commands")
+@Command(usage = "usage_displayAListOfAllRegisteredJgitCommands")
class ShowCommands extends TextBuiltin {
- @Option(name = "--pretty", usage = "alter the detail shown")
+ @Option(name = "--pretty", usage = "usage_alterTheDetailShown")
private Format pretty = Format.USAGE;
@Override
@@ -83,7 +84,9 @@ static enum Format {
/** */
USAGE {
void print(final CommandRef c) {
- System.err.print(c.getUsage());
+ String usage = c.getUsage();
+ if (usage != null && usage.length() > 0)
+ System.err.print(CLIText.get().resourceBundle().getString(usage));
}
},
@@ -104,7 +107,7 @@ void print(final CommandRef c) {
final URL url = ldr.getResource(cn);
if (url == null) {
- System.err.print("!! NOT FOUND !!");
+ System.err.print(CLIText.get().notFound);
return;
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java
index 54301dd04..cee5966a0 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java
@@ -45,6 +45,7 @@
package org.eclipse.jgit.pgm.debug;
import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
class WriteDirCache extends TextBuiltin {
@@ -52,10 +53,10 @@ class WriteDirCache extends TextBuiltin {
protected void run() throws Exception {
final DirCache cache = DirCache.read(db);
if (!cache.lock())
- throw die("failed to lock index");
+ throw die(CLIText.get().failedToLockIndex);
cache.read();
cache.write();
if (!cache.commit())
- throw die("failed to commit index");
+ throw die(CLIText.get().failedToCommitIndex);
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java
index bb51f5607..e13bb1f13 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java
@@ -46,12 +46,14 @@
import java.io.File;
import java.io.OutputStream;
import java.net.CookieHandler;
+import java.text.MessageFormat;
import org.eclipse.jgit.iplog.IpLogGenerator;
import org.eclipse.jgit.iplog.SimpleCookieManager;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.LockFile;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.Command;
import org.eclipse.jgit.pgm.TextBuiltin;
import org.eclipse.jgit.revwalk.RevObject;
@@ -60,15 +62,15 @@
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
-@Command(name = "eclipse-iplog", common = false, usage = "Produce an Eclipse IP log")
+@Command(name = "eclipse-iplog", common = false, usage = "usage_produceAnEclipseIPLog")
class Iplog extends TextBuiltin {
- @Option(name = "--version", aliases = { "-r" }, metaVar = "VERSION", usage = "Symbolic version for the project")
+ @Option(name = "--version", aliases = { "-r" }, metaVar = "metaVar_version", usage = "usage_symbolicVersionForTheProject")
private String version;
- @Option(name = "--output", aliases = { "-o" }, metaVar = "FILE", usage = "Output file")
+ @Option(name = "--output", aliases = { "-o" }, metaVar = "metaVar_file", usage = "usage_outputFile")
private File output;
- @Argument(index = 0, metaVar = "COMMIT|TAG")
+ @Argument(index = 0, metaVar = "metaVar_commitOrTag")
private ObjectId commitId;
@Override
@@ -79,8 +81,8 @@ protected void run() throws Exception {
final IpLogGenerator log = new IpLogGenerator();
if (commitId == null) {
- System.err.println("warning: No commit given on command line,"
- + " assuming " + Constants.HEAD);
+ System.err.println(MessageFormat.format(
+ CLIText.get().warningNoCommitGivenOnCommandLine, Constants.HEAD));
commitId = db.resolve(Constants.HEAD);
}
@@ -89,7 +91,7 @@ protected void run() throws Exception {
if (version == null && start instanceof RevTag)
version = ((RevTag) start).getTagName();
else if (version == null)
- throw die(start.name() + " is not a tag, --version is required");
+ throw die(MessageFormat.format(CLIText.get().notATagVersionIsRequired, start.name()));
log.scan(db, rw.parseCommit(start), version);
@@ -98,7 +100,7 @@ else if (version == null)
output.getParentFile().mkdirs();
LockFile lf = new LockFile(output);
if (!lf.lock())
- throw die("Cannot lock " + output);
+ throw die(MessageFormat.format(CLIText.get().cannotLock, output));
try {
OutputStream os = lf.getOutputStream();
try {
@@ -107,7 +109,7 @@ else if (version == null)
os.close();
}
if (!lf.commit())
- throw die("Cannot write " + output);
+ throw die(MessageFormat.format(CLIText.get().cannotWrite, output));
} finally {
lf.unlock();
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java
index 616ca420c..4f0e338e8 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java
@@ -51,22 +51,23 @@
import org.eclipse.jgit.iplog.IpLogMeta;
import org.eclipse.jgit.iplog.SimpleCookieManager;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.Command;
import org.eclipse.jgit.pgm.TextBuiltin;
import org.kohsuke.args4j.Option;
-@Command(name = "eclipse-ipzilla", common = false, usage = "Synchronize IPZilla data")
+@Command(name = "eclipse-ipzilla", common = false, usage = "usage_synchronizeIPZillaData")
class Ipzilla extends TextBuiltin {
- @Option(name = "--url", metaVar = "URL", usage = "IPZilla URL")
+ @Option(name = "--url", metaVar = "metaVar_url", usage = "usage_IPZillaURL")
private String url = "https://dev.eclipse.org/ipzilla/";
- @Option(name = "--username", metaVar = "USER", usage = "IPZilla Username")
+ @Option(name = "--username", metaVar = "metaVar_user", usage = "usage_IPZillaUsername")
private String username;
- @Option(name = "--password", metaVar = "PASS", usage = "IPZilla Password")
+ @Option(name = "--password", metaVar = "metaVar_pass", usage = "usage_IPZillaPassword")
private String password;
- @Option(name = "--file", aliases = { "-f" }, metaVar = "FILE", usage = "Input/output file")
+ @Option(name = "--file", aliases = { "-f" }, metaVar = "metaVar_file", usage = "usage_inputOutputFile")
private File output;
@Override
@@ -81,7 +82,7 @@ protected void run() throws Exception {
null, //
ipzilla.getPort(), //
ipzilla.getProtocol(), //
- "IPZilla Password", //
+ CLIText.get().IPZillaPasswordPrompt, //
ipzilla.getProtocol(), //
ipzilla, //
Authenticator.RequestorType.SERVER);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java
index c31676d72..0bc9ee112 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java
@@ -46,6 +46,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.MessageFormat;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -59,6 +60,7 @@
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.WindowCursor;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.treewalk.AbstractTreeIterator;
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.treewalk.FileTreeIterator;
@@ -102,7 +104,7 @@ public int parseArguments(final Parameters params) throws CmdLineException {
try {
dirc = DirCache.read(new File(name));
} catch (IOException e) {
- throw new CmdLineException(name + " is not an index file", e);
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notAnIndexFile, name), e);
}
setter.addValue(new DirCacheIterator(dirc));
return 1;
@@ -115,19 +117,18 @@ public int parseArguments(final Parameters params) throws CmdLineException {
throw new CmdLineException(e.getMessage());
}
if (id == null)
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
final CanonicalTreeParser p = new CanonicalTreeParser();
final WindowCursor curs = new WindowCursor();
try {
p.reset(clp.getRepository(), clp.getRevWalk().parseTree(id), curs);
} catch (MissingObjectException e) {
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IncorrectObjectTypeException e) {
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IOException e) {
- throw new CmdLineException("cannot read " + name + ": "
- + e.getMessage());
+ throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
} finally {
curs.release();
}
@@ -138,6 +139,6 @@ public int parseArguments(final Parameters params) throws CmdLineException {
@Override
public String getDefaultMetaVariable() {
- return "tree-ish";
+ return CLIText.get().metaVar_treeish;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
index a126fb1d8..7e61fb041 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
@@ -51,6 +51,7 @@
import org.kohsuke.args4j.Option;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.TextBuiltin;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
@@ -149,7 +150,7 @@ public void parseArgument(final String... args) throws CmdLineException {
*/
public Repository getRepository() {
if (db == null)
- throw new IllegalStateException("No Git repository configured.");
+ throw new IllegalStateException(CLIText.get().noGitRepositoryConfigured);
return db;
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java
index d3f460c89..f6550a5d8 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java
@@ -45,6 +45,7 @@
package org.eclipse.jgit.pgm.opt;
import java.io.IOException;
+import java.text.MessageFormat;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -53,6 +54,7 @@
import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.pgm.CLIText;
/**
* Custom argument handler {@link ObjectId} from string values.
@@ -91,11 +93,11 @@ public int parseArguments(final Parameters params) throws CmdLineException {
return 1;
}
- throw new CmdLineException(name + " is not an object");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notAnObject, name));
}
@Override
public String getDefaultMetaVariable() {
- return "object";
+ return CLIText.get().metaVar_object;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
index bebf3d9a7..50ff02aca 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java
@@ -53,6 +53,7 @@
import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
@@ -103,6 +104,6 @@ public int parseArguments(final Parameters params) throws CmdLineException {
@Override
public String getDefaultMetaVariable() {
- return "path ...";
+ return CLIText.get().metaVar_paths;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java
index 133c5f8db..43b727ac0 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java
@@ -49,6 +49,7 @@
import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.transport.RefSpec;
/**
@@ -79,6 +80,6 @@ public int parseArguments(final Parameters params) throws CmdLineException {
@Override
public String getDefaultMetaVariable() {
- return "refspec";
+ return CLIText.get().metaVar_refspec;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java
index 01caaf201..bf1753634 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java
@@ -45,6 +45,7 @@
package org.eclipse.jgit.pgm.opt;
import java.io.IOException;
+import java.text.MessageFormat;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -55,6 +56,7 @@
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevFlag;
@@ -94,8 +96,8 @@ public int parseArguments(final Parameters params) throws CmdLineException {
final int dot2 = name.indexOf("..");
if (dot2 != -1) {
if (!option.isMultiValued())
- throw new CmdLineException("Only one " + option.metaVar()
- + " expected in " + name + "." + "");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().onlyOneMetaVarExpectedIn
+ , option.metaVar(), name));
final String left = name.substring(0, dot2);
final String right = name.substring(dot2 + 2);
@@ -117,18 +119,17 @@ private void addOne(final String name, final boolean interesting)
throw new CmdLineException(e.getMessage());
}
if (id == null)
- throw new CmdLineException(name + " is not a commit");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
final RevCommit c;
try {
c = clp.getRevWalk().parseCommit(id);
} catch (MissingObjectException e) {
- throw new CmdLineException(name + " is not a commit");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
} catch (IncorrectObjectTypeException e) {
- throw new CmdLineException(name + " is not a commit");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
} catch (IOException e) {
- throw new CmdLineException("cannot read " + name + ": "
- + e.getMessage());
+ throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
}
if (interesting)
@@ -141,6 +142,6 @@ private void addOne(final String name, final boolean interesting)
@Override
public String getDefaultMetaVariable() {
- return "commit-ish";
+ return CLIText.get().metaVar_commitish;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java
index c564b9b01..0b607ee06 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java
@@ -45,6 +45,7 @@
package org.eclipse.jgit.pgm.opt;
import java.io.IOException;
+import java.text.MessageFormat;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -55,6 +56,7 @@
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.revwalk.RevTree;
/**
@@ -90,18 +92,17 @@ public int parseArguments(final Parameters params) throws CmdLineException {
throw new CmdLineException(e.getMessage());
}
if (id == null)
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
final RevTree c;
try {
c = clp.getRevWalk().parseTree(id);
} catch (MissingObjectException e) {
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IncorrectObjectTypeException e) {
- throw new CmdLineException(name + " is not a tree");
+ throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IOException e) {
- throw new CmdLineException("cannot read " + name + ": "
- + e.getMessage());
+ throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
}
setter.addValue(c);
return 1;
@@ -109,6 +110,6 @@ public int parseArguments(final Parameters params) throws CmdLineException {
@Override
public String getDefaultMetaVariable() {
- return "tree-ish";
+ return CLIText.get().metaVar_treeish;
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java
index 3378f38c1..35ed22bd3 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java
@@ -51,6 +51,7 @@
import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
+import org.eclipse.jgit.pgm.CLIText;
import org.eclipse.jgit.pgm.CommandCatalog;
import org.eclipse.jgit.pgm.CommandRef;
import org.eclipse.jgit.pgm.TextBuiltin;
@@ -82,7 +83,7 @@ public int parseArguments(final Parameters params) throws CmdLineException {
final CommandRef cr = CommandCatalog.get(name);
if (cr == null)
throw new CmdLineException(MessageFormat.format(
- "{0} is not a jgit command", name));
+ CLIText.get().notAJgitCommand, name));
// Force option parsing to stop. Everything after us should
// be arguments known only to this command and must not be
@@ -95,6 +96,6 @@ public int parseArguments(final Parameters params) throws CmdLineException {
@Override
public String getDefaultMetaVariable() {
- return "command";
+ return CLIText.get().metaVar_command;
}
}
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index d5eccecb0..b3799fb51 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -10,15 +10,21 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: junit.framework;version="[3.8.2,4.0.0)",
junit.textui;version="[3.8.2,4.0.0)",
org.eclipse.jgit.api;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.awtui;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.console;version="[0.8.0,0.9.0)",
org.eclipse.jgit.diff;version="[0.8.0,0.9.0)",
org.eclipse.jgit.dircache;version="[0.8.0,0.9.0)",
org.eclipse.jgit.errors;version="[0.8.0,0.9.0)",
org.eclipse.jgit.fnmatch;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.http.server;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.iplog;version="[0.8.0,0.9.0)",
org.eclipse.jgit.junit;version="[0.8.0,0.9.0)",
org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
org.eclipse.jgit.merge;version="[0.8.0,0.9.0)",
org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
org.eclipse.jgit.patch;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.pgm;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revplot;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk.filter;version="[0.8.0,0.9.0)",
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
index 2e470b386..387a38189 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
@@ -44,8 +44,11 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
+
import junit.framework.TestCase;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
public class ObjectCheckerTest extends TestCase {
@@ -62,7 +65,7 @@ public void testInvalidType() {
fail("Did not throw CorruptObjectException");
} catch (CorruptObjectException e) {
final String m = e.getMessage();
- assertEquals("Invalid object type: " + Constants.OBJ_BAD, m);
+ assertEquals(MessageFormat.format(JGitText.get().corruptObjectInvalidType2, Constants.OBJ_BAD), m);
}
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java
index a01ed4e92..8b02f2f5e 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestNLS.java
@@ -55,23 +55,23 @@ public class TestNLS extends TestCase {
public void testNLSLocale() {
NLS.setLocale(NLS.ROOT_LOCALE);
GermanTranslatedBundle bundle = GermanTranslatedBundle.get();
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
NLS.setLocale(Locale.GERMAN);
bundle = GermanTranslatedBundle.get();
- assertEquals(Locale.GERMAN, bundle.getEffectiveLocale());
+ assertEquals(Locale.GERMAN, bundle.effectiveLocale());
}
public void testJVMDefaultLocale() {
Locale.setDefault(NLS.ROOT_LOCALE);
NLS.useJVMDefaultLocale();
GermanTranslatedBundle bundle = GermanTranslatedBundle.get();
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
Locale.setDefault(Locale.GERMAN);
NLS.useJVMDefaultLocale();
bundle = GermanTranslatedBundle.get();
- assertEquals(Locale.GERMAN, bundle.getEffectiveLocale());
+ assertEquals(Locale.GERMAN, bundle.effectiveLocale());
}
public void testThreadTranslationBundleInheritance() throws InterruptedException {
@@ -135,7 +135,7 @@ public void run() {
assertNull("t1 was interrupted or barrier was broken", t1.e);
assertNull("t2 was interrupted or barrier was broken", t2.e);
- assertEquals(NLS.ROOT_LOCALE, t1.bundle.getEffectiveLocale());
- assertEquals(Locale.GERMAN, t2.bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, t1.bundle.effectiveLocale());
+ assertEquals(Locale.GERMAN, t2.bundle.effectiveLocale());
}
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java
index 7d713f2c1..0b21bdbe0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/TestTranslationBundle.java
@@ -79,15 +79,15 @@ public void testNonTranslatedBundle() {
NonTranslatedBundle bundle = new NonTranslatedBundle();
bundle.load(NLS.ROOT_LOCALE);
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.ENGLISH);
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.GERMAN);
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning);
}
@@ -95,11 +95,11 @@ public void testGermanTranslation() {
GermanTranslatedBundle bundle = new GermanTranslatedBundle();
bundle.load(NLS.ROOT_LOCALE);
- assertEquals(NLS.ROOT_LOCALE, bundle.getEffectiveLocale());
+ assertEquals(NLS.ROOT_LOCALE, bundle.effectiveLocale());
assertEquals("Good morning {0}", bundle.goodMorning);
bundle.load(Locale.GERMAN);
- assertEquals(Locale.GERMAN, bundle.getEffectiveLocale());
+ assertEquals(Locale.GERMAN, bundle.effectiveLocale());
assertEquals("Guten Morgen {0}", bundle.goodMorning);
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchCcErrorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchCcErrorTest.java
index f2bae6eb1..87bd9d386 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchCcErrorTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchCcErrorTest.java
@@ -45,6 +45,9 @@
import java.io.IOException;
import java.io.InputStream;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import junit.framework.TestCase;
@@ -57,7 +60,7 @@ public void testError_CcTruncatedOld() throws IOException {
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals(
- "Truncated hunk, at least 1 lines is missing for ancestor 1",
+ MessageFormat.format(JGitText.get().truncatedHunkLinesMissingForAncestor, 1, 1),
e.getMessage());
assertEquals(346, e.getOffset());
assertTrue(e.getLineText().startsWith(
@@ -67,7 +70,7 @@ public void testError_CcTruncatedOld() throws IOException {
final FormatError e = p.getErrors().get(1);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals(
- "Truncated hunk, at least 2 lines is missing for ancestor 2",
+ MessageFormat.format(JGitText.get().truncatedHunkLinesMissingForAncestor, 2, 2),
e.getMessage());
assertEquals(346, e.getOffset());
assertTrue(e.getLineText().startsWith(
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/SideBandOutputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/SideBandOutputStreamTest.java
index 61c894e41..156e4d023 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/SideBandOutputStreamTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/SideBandOutputStreamTest.java
@@ -53,9 +53,11 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
import junit.framework.TestCase;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
// Note, test vectors created with:
@@ -221,8 +223,7 @@ public void testConstructor_RejectsBadBufferSize() {
new SideBandOutputStream(CH_DATA, Integer.MAX_VALUE, rawOut);
fail("Accepted " + Integer.MAX_VALUE + " for buffer size");
} catch (IllegalArgumentException e) {
- assertEquals("packet size " + Integer.MAX_VALUE
- + " must be <= 65520", e.getMessage());
+ assertEquals(MessageFormat.format(JGitText.get().packetSizeMustBeAtMost, Integer.MAX_VALUE, 65520), e.getMessage());
}
}
diff --git a/org.eclipse.jgit.ui/.classpath b/org.eclipse.jgit.ui/.classpath
index 64c5e31b7..b3d21cc66 100644
--- a/org.eclipse.jgit.ui/.classpath
+++ b/org.eclipse.jgit.ui/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index b496cd08d..fe2f476b2 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.jgit.awtui;version="0.8.0"
Import-Package: org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
+ org.eclipse.jgit.nls;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revplot;version="[0.8.0,0.9.0)",
org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)",
org.eclipse.jgit.transport;version="[0.8.0,0.9.0)",
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 8c452b0a9..3d96fd111 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -84,6 +84,9 @@
<include>plugin.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit.ui/resources/org/eclipse/jgit/awtui/UIText.properties b/org.eclipse.jgit.ui/resources/org/eclipse/jgit/awtui/UIText.properties
new file mode 100644
index 000000000..0bc5a7acb
--- /dev/null
+++ b/org.eclipse.jgit.ui/resources/org/eclipse/jgit/awtui/UIText.properties
@@ -0,0 +1,8 @@
+authenticationRequired=Authentication Required
+author=Author
+date=Date
+enterUsernameAndPasswordFor=Enter username and password for
+mustBeSpecialTableModel=Must be special table model.
+password=Password:
+username=Username:
+warning=Warning
diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtAuthenticator.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtAuthenticator.java
index 1d2f9d765..6728d616d 100644
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtAuthenticator.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtAuthenticator.java
@@ -74,7 +74,8 @@ protected PasswordAuthentication promptPasswordAuthentication() {
panel.setLayout(new GridBagLayout());
final StringBuilder instruction = new StringBuilder();
- instruction.append("Enter username and password for ");
+ instruction.append(UIText.get().enterUsernameAndPasswordFor);
+ instruction.append(" ");
if (getRequestorType() == RequestorType.PROXY) {
instruction.append(getRequestorType());
instruction.append(" ");
@@ -101,7 +102,7 @@ protected PasswordAuthentication promptPasswordAuthentication() {
gbc.fill = GridBagConstraints.NONE;
gbc.gridx = 0;
gbc.weightx = 1;
- panel.add(new JLabel("Username:"), gbc);
+ panel.add(new JLabel(UIText.get().username), gbc);
gbc.gridx = 1;
gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -116,7 +117,7 @@ protected PasswordAuthentication promptPasswordAuthentication() {
gbc.fill = GridBagConstraints.NONE;
gbc.gridx = 0;
gbc.weightx = 1;
- panel.add(new JLabel("Password:"), gbc);
+ panel.add(new JLabel(UIText.get().password), gbc);
gbc.gridx = 1;
gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -126,7 +127,7 @@ protected PasswordAuthentication promptPasswordAuthentication() {
gbc.gridy++;
if (JOptionPane.showConfirmDialog(null, panel,
- "Authentication Required", JOptionPane.OK_CANCEL_OPTION,
+ UIText.get().authenticationRequired, JOptionPane.OK_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
return new PasswordAuthentication(username.getText(), password
.getPassword());
diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtSshSessionFactory.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtSshSessionFactory.java
index f6710854b..f0de7ceb7 100644
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtSshSessionFactory.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtSshSessionFactory.java
@@ -96,7 +96,7 @@ public void showMessage(final String msg) {
}
public boolean promptYesNo(final String msg) {
- return JOptionPane.showConfirmDialog(null, msg, "Warning",
+ return JOptionPane.showConfirmDialog(null, msg, UIText.get().warning,
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
}
diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
index da68c8195..effe6e575 100644
--- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/CommitGraphPane.java
@@ -112,7 +112,7 @@ public PlotCommitList getCommitList() {
@Override
public void setModel(final TableModel dataModel) {
if (dataModel != null && !(dataModel instanceof CommitTableModel))
- throw new ClassCastException("Must be special table model.");
+ throw new ClassCastException(UIText.get().mustBeSpecialTableModel);
super.setModel(dataModel);
}
@@ -130,8 +130,8 @@ private void configureHeader() {
final TableColumn date = cols.getColumn(2);
graph.setHeaderValue("");
- author.setHeaderValue("Author");
- date.setHeaderValue("Date");
+ author.setHeaderValue(UIText.get().author);
+ date.setHeaderValue(UIText.get().date);
graph.setCellRenderer(new GraphCellRender());
author.setCellRenderer(new NameCellRender());
diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java
new file mode 100644
index 000000000..e1acbcd16
--- /dev/null
+++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/UIText.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.awtui;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit UI
+ */
+public class UIText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static UIText get() {
+ return NLS.getBundleFor(UIText.class);
+ }
+
+ /***/ public String authenticationRequired;
+ /***/ public String author;
+ /***/ public String date;
+ /***/ public String enterUsernameAndPasswordFor;
+ /***/ public String mustBeSpecialTableModel;
+ /***/ public String password;
+ /***/ public String username;
+ /***/ public String warning;
+}
diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath
index 304e86186..d7edf529a 100644
--- a/org.eclipse.jgit/.classpath
+++ b/org.eclipse.jgit/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 7c04302d8..a5a317b70 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.jgit
Bundle-Version: 0.8.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.api;version="0.8.0",
+Export-Package: org.eclipse.jgit;version="0.8.0",
+ org.eclipse.jgit.api;version="0.8.0",
org.eclipse.jgit.diff;version="0.8.0",
org.eclipse.jgit.dircache;version="0.8.0",
org.eclipse.jgit.errors;version="0.8.0",
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index e39f1faed..abb24d14c 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -84,6 +84,9 @@
<include>plugin.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>resources/</directory>
+ </resource>
</resources>
<plugins>
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
new file mode 100644
index 000000000..4cdf91416
--- /dev/null
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -0,0 +1,360 @@
+DIRCChecksumMismatch=DIRC checksum mismatch
+DIRCExtensionIsTooLargeAt=DIRC extension {0} is too large at {1} bytes.
+DIRCExtensionNotSupportedByThisVersion=DIRC extension {0} not supported by this version.
+DIRCHasTooManyEntries=DIRC has too many entries.
+JRELacksMD5Implementation=JRE lacks MD5 implementation
+URINotSupported=URI not supported: {0}
+URLNotFound={0} not found
+aNewObjectIdIsRequired=A NewObjectId is required.
+advertisementCameBefore=advertisement of {0}^{} came before {1}
+advertisementOfCameBefore=advertisement of {0}^{} came before {1}
+amazonS3ActionFailed={0} of '{1}' failed: {2} {3}
+amazonS3ActionFailedGivingUp={0} of '{1}' failed: Giving up after {2} attempts.
+anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD
+anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created
+atLeastOnePathIsRequired=At least one path is required.
+atLeastTwoFiltersNeeded=At least two filters needed.
+badBase64InputCharacterAt=Bad Base64 input character at {0} : {1} (decimal)
+badEntryDelimiter=Bad entry delimiter
+badEntryName=Bad entry name: {0}
+badEscape=Bad escape: {0}
+badGroupHeader=Bad group header
+badObjectType=Bad object type: {0}
+badSectionEntry=Bad section entry: {0}
+base64InputNotProperlyPadded=Base64 input not properly padded.
+baseLengthIncorrect=base length incorrect
+blobNotFound=Blob not found: {0}
+blobNotFoundForPath=Blob not found: {0} for path: {1}
+cannotBeCombined=Cannot be combined.
+cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RefFilter {1}.
+cannotCommitWriteTo=Cannot commit write to {0}
+cannotConnectPipes=cannot connect pipes
+cannotConvertScriptToText=Cannot convert script to text
+cannotCreateConfig=cannot create config
+cannotCreateDirectory=Cannot create directory {0}
+cannotCreateHEAD=cannot create HEAD
+cannotDeleteFile=Cannot delete file: {0}
+cannotDeleteStaleTrackingRef2=Cannot delete stale tracking ref {0}: {1}
+cannotDeleteStaleTrackingRef=Cannot delete stale tracking ref {0}
+cannotDetermineProxyFor=Cannot determine proxy for {0}
+cannotDownload=Cannot download {0}
+cannotExecute=cannot execute: {0}
+cannotGet=Cannot get {0}
+cannotListRefs=cannot list refs
+cannotLock=Cannot lock {0}
+cannotLockFile=Cannot lock file {0}
+cannotLockPackIn=Cannot lock pack in {0}
+cannotMatchOnEmptyString=Cannot match on empty string.
+cannotMoveIndexTo=Cannot move index to {0}
+cannotMovePackTo=Cannot move pack to {0}
+cannotOpenService=cannot open {0}
+cannotParseGitURIish=Cannot parse Git URI-ish
+cannotRead=Cannot read {0}
+cannotReadBlob=Cannot read blob {0}
+cannotReadCommit=Cannot read commit {0}
+cannotReadFile=Cannot read file {0}
+cannotReadHEAD=cannot read HEAD: {0} {1}
+cannotReadObject=Cannot read object
+cannotReadTree=Cannot read tree {0}
+cannotResolveLocalTrackingRefForUpdating=Cannot resolve local tracking ref {0} for updating.
+cannotStoreObjects=cannot store objects
+cannotUnloadAModifiedTree=Cannot unload a modified tree.
+cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index.
+cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can't find object in (reverse) pack index for the specified offset {0}
+cantPassMeATree=Can't pass me a tree!
+channelMustBeInRange0_255=channel {0} must be in range [0, 255]
+characterClassIsNotSupported=The character class {0} is not supported.
+checkoutConflictWithFile=Checkout conflict with file: {0}
+checkoutConflictWithFiles=Checkout conflict with files: {0}
+classCastNotA=Not a {0}
+collisionOn=Collision on {0}
+commandWasCalledInTheWrongState=Command {0} was called in the wrong state
+commitAlreadyExists=exists {0}
+commitMessageNotSpecified=commit message not specified
+commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported
+compressingObjects=Compressing objects
+connectionFailed=connection failed
+connectionTimeOut=Connection time out: {0}
+contextMustBeNonNegative=context must be >= 0
+corruptObjectBadStream=bad stream
+corruptObjectBadStreamCorruptHeader=bad stream, corrupt header
+corruptObjectGarbageAfterSize=garbage after size
+corruptObjectIncorrectLength=incorrect length
+corruptObjectInvalidEntryMode=invalid entry mode
+corruptObjectInvalidMode2=invalid mode {0}
+corruptObjectInvalidMode3=invalid mode {0} for {1} '{2}' in {3}.
+corruptObjectInvalidMode=invalid mode
+corruptObjectInvalidType2=invalid type {0}
+corruptObjectInvalidType=invalid type
+corruptObjectMalformedHeader=malformed header: {0}
+corruptObjectNegativeSize=negative size
+corruptObjectNoAuthor=no author
+corruptObjectNoCommitter=no committer
+corruptObjectNoHeader=no header
+corruptObjectNoObject=no object
+corruptObjectNoTagName=no tag name
+corruptObjectNoTaggerBadHeader=no tagger/bad header
+corruptObjectNoTaggerHeader=no tagger header
+corruptObjectNoType=no type
+corruptObjectNotree=no tree
+corruptObjectPackfileChecksumIncorrect=Packfile checksum incorrect.
+corruptionDetectedReReadingAt=Corruption detected re-reading at {0}
+couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
+couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen
+couldNotLockHEAD=Could not lock HEAD
+couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read
+couldNotRenameDeleteOldIndex=Could not rename delete old index
+couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to index
+couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
+couldNotWriteFile=Could not write file {0}
+countingObjects=Counting objects
+creatingDeltasIsNotImplemented=creating deltas is not implemented
+daemonAlreadyRunning=Daemon already running
+deletingNotSupported=Deleting {0} not supported.
+destinationIsNotAWildcard=Destination is not a wildcard.
+dirCacheDoesNotHaveABackingFile=DirCache does not have a backing file
+dirCacheFileIsNotLocked=DirCache {0} not locked
+dirCacheIsNotLocked=DirCache is not locked
+doesNotHandleMode=Does not handle mode {0} ({1})
+downloadCancelled=Download cancelled
+downloadCancelledDuringIndexing=Download cancelled during indexing
+duplicateAdvertisementsOf=duplicate advertisements of {0}
+duplicateRef=Duplicate ref: {0}
+duplicateRemoteRefUpdateIsIllegal=Duplicate remote ref update is illegal. Affected remote name: {0}
+duplicateStagesNotAllowed=Duplicate stages not allowed
+eitherGIT_DIRorGIT_WORK_TREEmustBePassed=Either GIT_DIR or GIT_WORK_TREE must be passed to Repository constructor
+emptyPathNotPermitted=Empty path not permitted.
+encryptionError=Encryption error: {0}
+endOfFileInEscape=End of file in escape
+entryNotFoundByPath=Entry not found by path: {0}
+errorDecodingFromFile=Error decoding from file {0}
+errorEncodingFromFile=Error encoding from file {0}
+errorInBase64CodeReadingStream=Error in Base64 code reading stream.
+errorInPackedRefs=error in packed-refs
+errorInvalidProtocolWantedOldNewRef=error: invalid protocol: wanted 'old new ref'
+errorListing=Error listing {0}
+errorOccurredDuringUnpackingOnTheRemoteEnd=error occurred during unpacking on the remote end: {0}
+errorReadingInfoRefs=error reading info/refs
+exceptionCaughtDuringExecutionOfCommitCommand=Exception caught during execution of commit command
+exceptionOccuredDuringAddingOfOptionToALogCommand=Exception occured during adding of {0} as option to a Log command
+expectedACKNAKFoundEOF=Expected ACK/NAK, found EOF
+expectedACKNAKGot=Expected ACK/NAK, got: {0}
+expectedBooleanStringValue=Expected boolean string value
+expectedCharacterEncodingGuesses=Expected {0} character encoding guesses
+expectedEOFReceived=expected EOF; received '{0}' instead
+expectedGot=expected '{0}', got '{1}'
+expectedPktLineWithService=expected pkt-line with '# service=-', got '{0}'
+expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1}
+expectedReportForRefNotReceived={0}: expected report for ref {1} not received
+failedUpdatingRefs=failed updating refs
+failureDueToOneOfTheFollowing=Failure due to one of the following:
+failureUpdatingFETCH_HEAD=Failure updating FETCH_HEAD: {0}
+failureUpdatingTrackingRef=Failure updating tracking ref {0}: {1}
+fileCannotBeDeleted=File cannot be deleted: {0}
+fileIsTooBigForThisConvenienceMethod=File is too big for this convenience method ({0} bytes).
+fileIsTooLarge=File is too large: {0}
+fileModeNotSetForPath=FileMode not set for path {0}
+flagIsDisposed={0} is disposed.
+flagNotFromThis={0} not from this.
+flagsAlreadyCreated={0} flags already created.
+funnyRefname=funny refname
+hugeIndexesAreNotSupportedByJgitYet=Huge indexes are not supported by jgit, yet
+hunkBelongsToAnotherFile=Hunk belongs to another file
+hunkDisconnectedFromFile=Hunk disconnected from file
+hunkHeaderDoesNotMatchBodyLineCountOf=Hunk header {0} does not match body line count of {1}
+illegalArgumentNotA=Not {0}
+illegalStateExists=exists {0}
+improperlyPaddedBase64Input=Improperly padded Base64 input.
+inMemoryBufferLimitExceeded=In-memory buffer limit exceeded
+incorrectHashFor=Incorrect hash for {0}; computed {1} as a {2} from {3} bytes.
+incorrectOBJECT_ID_LENGTH=Incorrect OBJECT_ID_LENGTH.
+incorrectObjectType_COMMITnorTREEnorBLOBnorTAG=COMMIT nor TREE nor BLOB nor TAG
+indexFileIsInUse=Index file is in use
+indexFileIsTooLargeForJgit=Index file is too large for jgit
+indexSignatureIsInvalid=Index signature is invalid: {0}
+integerValueOutOfRange=Integer value {0}.{1} out of range
+internalRevisionError=internal revision error
+interruptedWriting=Interrupted writing {0}
+invalidAdvertisementOf=invalid advertisement of {0}
+invalidAncestryLength=Invalid ancestry length
+invalidBooleanValue=Invalid boolean value: {0}.{1}={2}
+invalidChannel=Invalid channel {0}
+invalidCharacterInBase64Data=Invalid character in Base64 data.
+invalidCommitParentNumber=Invalid commit parent number
+invalidEncryption=Invalid encryption
+invalidGitType=invalid git type: {0}
+invalidId=Invalid id {0}
+invalidIdLength=Invalid id length {0}; should be {1}
+invalidIntegerValue=Invalid integer value: {0}.{1}={2}
+invalidKey=Invalid key: {0}
+invalidLineInConfigFile=Invalid line in config file
+invalidModeFor=Invalid mode {0} for {1} {2} in {3}.
+invalidModeForPath=Invalid mode {0} for path {1}
+invalidObject=Invalid {0} {1}:{2}
+invalidOldIdSent=invalid old id sent
+invalidPacketLineHeader=Invalid packet line header: {0}
+invalidPath=Invalid path: {0}
+invalidRefName=Invalid ref name: {0}
+invalidStageForPath=Invalid stage {0} for path {1}
+invalidTagOption=Invalid tag option: {0}
+invalidTimeout=Invalid timeout: {0}
+invalidURL=Invalid URL {0}
+invalidWildcards=Invalid wildcards {0}
+invalidWindowSize=Invalid window size
+isAStaticFlagAndHasNorevWalkInstance={0} is a static flag and has no RevWalk instance
+kNotInRange=k {0} not in {1} - {2}
+lengthExceedsMaximumArraySize=Length exceeds maximum array size
+listingAlternates=Listing alternates
+localObjectsIncomplete=Local objects incomplete.
+localRefIsMissingObjects=Local ref {0} is missing object(s).
+lockCountMustBeGreaterOrEqual1=lockCount must be >= 1
+lockError=lock error: {0}
+lockOnNotClosed=Lock on {0} not closed.
+lockOnNotHeld=Lock on {0} not held.
+malformedpersonIdentString=Malformed PersonIdent string (no < was found): {0}
+mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a default strategy
+missingAccesskey=Missing accesskey.
+missingForwardImageInGITBinaryPatch=Missing forward-image in GIT binary patch
+missingObject=Missing {0} {1}
+missingPrerequisiteCommits=missing prerequisite commits:
+missingSecretkey=Missing secretkey.
+mixedStagesNotAllowed=Mixed stages not allowed
+multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3}
+need2Arguments=Need 2 arguments
+needPackOut=need packOut
+needsAtLeastOneEntry=Needs at least one entry
+needsWorkdir=Needs workdir
+newlineInQuotesNotAllowed=Newline in quotes not allowed
+noApplyInDelete=No apply in delete
+noClosingBracket=No closing {0} found for {1} at index {2}.
+noHEADExistsAndNoExplicitStartingRevisionWasSpecified=No HEAD exists and no explicit starting revision was specified
+noHMACsupport=No {0} support: {1}
+noSuchRef=no such ref
+noXMLParserAvailable=No XML parser available.
+notABoolean=Not a boolean: {0}
+notABundle=not a bundle
+notADIRCFile=Not a DIRC file.
+notAGitDirectory=not a git directory
+notAPACKFile=Not a PACK file.
+notARef=Not a ref: {0}: {1}
+notASCIIString=Not ASCII string: {0}
+notAValidPack=Not a valid pack {0}
+notFound=not found.
+notValid={0} not valid
+nothingToFetch=Nothing to fetch.
+nothingToPush=Nothing to push.
+objectAtHasBadZlibStream=Object at {0} in {1} has bad zlib stream
+objectAtPathDoesNotHaveId=Object at path "{0}" does not have an id assigned. All object ids must be assigned prior to writing a tree.
+objectIsCorrupt=Object {0} is corrupt: {1}
+objectIsNotA=Object {0} is not a {1}.
+objectNotFoundIn=Object {0} not found in {1}.
+offsetWrittenDeltaBaseForObjectNotFoundInAPack=Offset-written delta base for object not found in a pack
+onlyOneFetchSupported=Only one fetch supported
+onlyOneOperationCallPerConnectionIsSupported=Only one operation call per connection is supported.
+openFilesMustBeAtLeast1=Open files must be >= 1
+openingConnection=Opening connection
+outputHasAlreadyBeenStarted=Output has already been started.
+packChecksumMismatch=Pack checksum mismatch
+packCorruptedWhileWritingToFilesystem=Pack corrupted while writing to filesystem
+packDoesNotMatchIndex=Pack {0} does not match index
+packFileInvalid=Pack file invalid: {0}
+packHasUnresolvedDeltas=pack has unresolved deltas
+packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2}
+packTooLargeForIndexVersion1=Pack too large for index version 1
+packetSizeMustBeAtLeast=packet size {0} must be >= {1}
+packetSizeMustBeAtMost=packet size {0} must be <= {1}
+packfileCorruptionDetected=Packfile corruption detected: {0}
+packfileIsTruncated=Packfile is truncated.
+packingCancelledDuringObjectsWriting=Packing cancelled during objects writing
+pathIsNotInWorkingDir=Path is not in working dir
+peeledLineBeforeRef=Peeled line before ref.
+peeledLineBeforeRef=Peeled line before ref.
+peerDidNotSupplyACompleteObjectGraph=peer did not supply a complete object graph
+prefixRemote=remote:
+problemWithResolvingPushRefSpecsLocally=Problem with resolving push ref specs locally: {0}
+progressMonUploading=Uploading {0}
+propertyIsAlreadyNonNull=Property is already non null
+pushCancelled=push cancelled
+pushIsNotSupportedForBundleTransport=Push is not supported for bundle transport
+pushNotPermitted=push not permitted
+rawLogMessageDoesNotParseAsLogEntry=Raw log message does not parse as log entry
+readTimedOut=Read timed out
+readingObjectsFromLocalRepositoryFailed=reading objects from local repository failed: {0}
+receivingObjects=Receiving objects
+refUpdateReturnCodeWas=RefUpdate return code was: {0}
+reflogsNotYetSupportedByRevisionParser=reflogs not yet supported by revision parser
+remoteConfigHasNoURIAssociated=Remote config "{0}" has no URIs associated
+remoteDoesNotHaveSpec=Remote does not have {0} available for fetch.
+remoteDoesNotSupportSmartHTTPPush=remote does not support smart HTTP push
+remoteHungUpUnexpectedly=remote hung up unexpectedly
+remoteNameCantBeNull=Remote name can't be null.
+repositoryAlreadyExists=Repository already exists: {0}
+repositoryNotFound=repository not found: {0}
+requiredHashFunctionNotAvailable=Required hash function {0} not available.
+resolvingDeltas=Resolving deltas
+serviceNotPermitted={0} not permitted
+shortCompressedStreamAt=Short compressed stream at {0}
+shortReadOfBlock=Short read of block.
+shortReadOfOptionalDIRCExtensionExpectedAnotherBytes=Short read of optional DIRC extension {0}; expected another {1} bytes within the section.
+shortSkipOfBlock=Short skip of block.
+smartHTTPPushDisabled=smart HTTP push disabled
+sourceDestinationMustMatch=Source/Destination must match.
+sourceIsNotAWildcard=Source is not a wildcard.
+sourceRefDoesntResolveToAnyObject=Source ref {0} doesn't resolve to any object.
+sourceRefNotSpecifiedForRefspec=Source ref not specified for refspec: {0}
+staleRevFlagsOn=Stale RevFlags on {0}
+startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported
+statelessRPCRequiresOptionToBeEnabled=stateless RPC requires {0} to be enabled
+symlinkCannotBeWrittenAsTheLinkTarget=Symlink "{0}" cannot be written as the link target cannot be read from within Java.
+tSizeMustBeGreaterOrEqual1=tSize must be >= 1
+theFactoryMustNotBeNull=The factory must not be null
+timerAlreadyTerminated=Timer already terminated
+topologicalSortRequired=Topological sort required.
+transportExceptionBadRef=Empty ref: {0}: {1}
+transportExceptionEmptyRef=Empty ref: {0}
+transportExceptionInvalid=Invalid {0} {1}:{2}
+transportExceptionMissingAssumed=Missing assumed {0}
+transportExceptionReadRef=read {0}
+treeEntryAlreadyExists=Tree entry "{0}" already exists.
+treeIteratorDoesNotSupportRemove=TreeIterator does not support remove()
+truncatedHunkLinesMissingForAncestor=Truncated hunk, at least {0} lines missing for ancestor {1}
+truncatedHunkNewLinesMissing=Truncated hunk, at least {0} new lines is missing
+truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
+unableToCheckConnectivity=Unable to check connectivity.
+unableToLockTag=Unable to lock tag {0}
+unableToStore=Unable to store {0}.
+unableToWrite=Unable to write {0}
+unencodeableFile=Unencodeable file: {0}
+unexpectedEndOfConfigFile=Unexpected end of config file
+unexpectedHunkTrailer=Unexpected hunk trailer
+unexpectedOddResult=odd: {0} + {1} - {2}
+unexpectedRefReport={0}: unexpected ref report: {1}
+unexpectedReportLine2={0} unexpected report line: {1}
+unexpectedReportLine=unexpected report line: {0}
+unknownDIRCVersion=Unknown DIRC version {0}
+unknownHost=unknown host
+unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}
+unknownObjectType=Unknown object type {0}.
+unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0".
+unknownRepositoryFormat=Unknown repository format
+unmergedPath=Unmerged path: {0}
+unpackError=unpack error {0}
+unreadablePackIndex=Unreadable pack index: {0}
+unrecognizedRef=Unrecognized ref: {0}
+unsupportedCommand0=unsupported command 0
+unsupportedEncryptionAlgorithm=Unsupported encryption algorithm: {0}
+unsupportedEncryptionVersion=Unsupported encryption version: {0}
+unsupportedOperationNotAddAtEnd=Not add-at-end: {0}
+unsupportedPackIndexVersion=Unsupported pack index version {0}
+unsupportedPackVersion=Unsupported pack version {0}.
+updatingRefFailed=Updating the ref {0} to {1} failed. ReturnCode from RefUpdate.update() was {2}
+userConfigFileInvalid=User config file {0} invalid {1}
+walkFailure=Walk failure.
+windowSizeMustBeLesserThanLimit=Window size must be < limit
+windowSizeMustBePowerOf2=Window size must be power of 2
+writeTimedOut=Write timed out
+writerAlreadyInitialized=Writer already initialized
+writingNotPermitted=Writing not permitted
+writingNotSupported=Writing {0} not supported.
+writingObjects=Writing objects
+wrongDecompressedLength=wrong decompressed length
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
new file mode 100644
index 000000000..fbc17aad8
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit;
+
+import org.eclipse.jgit.nls.NLS;
+import org.eclipse.jgit.nls.TranslationBundle;
+
+/**
+ * Translation bundle for JGit core
+ */
+public class JGitText extends TranslationBundle {
+
+ /**
+ * @return an instance of this translation bundle
+ */
+ public static JGitText get() {
+ return NLS.getBundleFor(JGitText.class);
+ }
+
+ /***/ public String DIRCChecksumMismatch;
+ /***/ public String DIRCExtensionIsTooLargeAt;
+ /***/ public String DIRCExtensionNotSupportedByThisVersion;
+ /***/ public String DIRCHasTooManyEntries;
+ /***/ public String JRELacksMD5Implementation;
+ /***/ public String URINotSupported;
+ /***/ public String URLNotFound;
+ /***/ public String aNewObjectIdIsRequired;
+ /***/ public String advertisementCameBefore;
+ /***/ public String advertisementOfCameBefore;
+ /***/ public String amazonS3ActionFailed;
+ /***/ public String amazonS3ActionFailedGivingUp;
+ /***/ public String anExceptionOccurredWhileTryingToAddTheIdOfHEAD;
+ /***/ public String anSSHSessionHasBeenAlreadyCreated;
+ /***/ public String atLeastOnePathIsRequired;
+ /***/ public String atLeastTwoFiltersNeeded;
+ /***/ public String badBase64InputCharacterAt;
+ /***/ public String badEntryDelimiter;
+ /***/ public String badEntryName;
+ /***/ public String badEscape;
+ /***/ public String badGroupHeader;
+ /***/ public String badObjectType;
+ /***/ public String badSectionEntry;
+ /***/ public String base64InputNotProperlyPadded;
+ /***/ public String baseLengthIncorrect;
+ /***/ public String blobNotFound;
+ /***/ public String blobNotFoundForPath;
+ /***/ public String cannotBeCombined;
+ /***/ public String cannotCombineTreeFilterWithRevFilter;
+ /***/ public String cannotCommitWriteTo;
+ /***/ public String cannotConnectPipes;
+ /***/ public String cannotConvertScriptToText;
+ /***/ public String cannotCreateConfig;
+ /***/ public String cannotCreateDirectory;
+ /***/ public String cannotCreateHEAD;
+ /***/ public String cannotDeleteFile;
+ /***/ public String cannotDeleteStaleTrackingRef2;
+ /***/ public String cannotDeleteStaleTrackingRef;
+ /***/ public String cannotDetermineProxyFor;
+ /***/ public String cannotDownload;
+ /***/ public String cannotExecute;
+ /***/ public String cannotGet;
+ /***/ public String cannotListRefs;
+ /***/ public String cannotLock;
+ /***/ public String cannotLockFile;
+ /***/ public String cannotLockPackIn;
+ /***/ public String cannotMatchOnEmptyString;
+ /***/ public String cannotMoveIndexTo;
+ /***/ public String cannotMovePackTo;
+ /***/ public String cannotOpenService;
+ /***/ public String cannotParseGitURIish;
+ /***/ public String cannotRead;
+ /***/ public String cannotReadBlob;
+ /***/ public String cannotReadCommit;
+ /***/ public String cannotReadFile;
+ /***/ public String cannotReadHEAD;
+ /***/ public String cannotReadObject;
+ /***/ public String cannotReadTree;
+ /***/ public String cannotResolveLocalTrackingRefForUpdating;
+ /***/ public String cannotStoreObjects;
+ /***/ public String cannotUnloadAModifiedTree;
+ /***/ public String cannotWorkWithOtherStagesThanZeroRightNow;
+ /***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
+ /***/ public String cantPassMeATree;
+ /***/ public String channelMustBeInRange0_255;
+ /***/ public String characterClassIsNotSupported;
+ /***/ public String checkoutConflictWithFile;
+ /***/ public String checkoutConflictWithFiles;
+ /***/ public String classCastNotA;
+ /***/ public String collisionOn;
+ /***/ public String commandWasCalledInTheWrongState;
+ /***/ public String commitAlreadyExists;
+ /***/ public String commitMessageNotSpecified;
+ /***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
+ /***/ public String compressingObjects;
+ /***/ public String connectionFailed;
+ /***/ public String connectionTimeOut;
+ /***/ public String contextMustBeNonNegative;
+ /***/ public String corruptObjectBadStream;
+ /***/ public String corruptObjectBadStreamCorruptHeader;
+ /***/ public String corruptObjectGarbageAfterSize;
+ /***/ public String corruptObjectIncorrectLength;
+ /***/ public String corruptObjectInvalidEntryMode;
+ /***/ public String corruptObjectInvalidMode2;
+ /***/ public String corruptObjectInvalidMode3;
+ /***/ public String corruptObjectInvalidMode;
+ /***/ public String corruptObjectInvalidType2;
+ /***/ public String corruptObjectInvalidType;
+ /***/ public String corruptObjectMalformedHeader;
+ /***/ public String corruptObjectNegativeSize;
+ /***/ public String corruptObjectNoAuthor;
+ /***/ public String corruptObjectNoCommitter;
+ /***/ public String corruptObjectNoHeader;
+ /***/ public String corruptObjectNoObject;
+ /***/ public String corruptObjectNoTagName;
+ /***/ public String corruptObjectNoTaggerBadHeader;
+ /***/ public String corruptObjectNoTaggerHeader;
+ /***/ public String corruptObjectNoType;
+ /***/ public String corruptObjectNotree;
+ /***/ public String corruptObjectPackfileChecksumIncorrect;
+ /***/ public String corruptionDetectedReReadingAt;
+ /***/ public String couldNotDeleteLockFileShouldNotHappen;
+ /***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
+ /***/ public String couldNotLockHEAD;
+ /***/ public String couldNotReadIndexInOneGo;
+ /***/ public String couldNotRenameDeleteOldIndex;
+ /***/ public String couldNotRenameTemporaryIndexFileToIndex;
+ /***/ public String couldNotURLEncodeToUTF8;
+ /***/ public String couldNotWriteFile;
+ /***/ public String countingObjects;
+ /***/ public String creatingDeltasIsNotImplemented;
+ /***/ public String daemonAlreadyRunning;
+ /***/ public String deletingNotSupported;
+ /***/ public String destinationIsNotAWildcard;
+ /***/ public String dirCacheDoesNotHaveABackingFile;
+ /***/ public String dirCacheFileIsNotLocked;
+ /***/ public String dirCacheIsNotLocked;
+ /***/ public String doesNotHandleMode;
+ /***/ public String downloadCancelled;
+ /***/ public String downloadCancelledDuringIndexing;
+ /***/ public String duplicateAdvertisementsOf;
+ /***/ public String duplicateRef;
+ /***/ public String duplicateRemoteRefUpdateIsIllegal;
+ /***/ public String duplicateStagesNotAllowed;
+ /***/ public String eitherGIT_DIRorGIT_WORK_TREEmustBePassed;
+ /***/ public String emptyPathNotPermitted;
+ /***/ public String encryptionError;
+ /***/ public String endOfFileInEscape;
+ /***/ public String entryNotFoundByPath;
+ /***/ public String errorDecodingFromFile;
+ /***/ public String errorEncodingFromFile;
+ /***/ public String errorInBase64CodeReadingStream;
+ /***/ public String errorInPackedRefs;
+ /***/ public String errorInvalidProtocolWantedOldNewRef;
+ /***/ public String errorListing;
+ /***/ public String errorOccurredDuringUnpackingOnTheRemoteEnd;
+ /***/ public String errorReadingInfoRefs;
+ /***/ public String exceptionCaughtDuringExecutionOfCommitCommand;
+ /***/ public String exceptionOccuredDuringAddingOfOptionToALogCommand;
+ /***/ public String expectedACKNAKFoundEOF;
+ /***/ public String expectedACKNAKGot;
+ /***/ public String expectedBooleanStringValue;
+ /***/ public String expectedCharacterEncodingGuesses;
+ /***/ public String expectedEOFReceived;
+ /***/ public String expectedGot;
+ /***/ public String expectedPktLineWithService;
+ /***/ public String expectedReceivedContentType;
+ /***/ public String expectedReportForRefNotReceived;
+ /***/ public String failedUpdatingRefs;
+ /***/ public String failureDueToOneOfTheFollowing;
+ /***/ public String failureUpdatingFETCH_HEAD;
+ /***/ public String failureUpdatingTrackingRef;
+ /***/ public String fileCannotBeDeleted;
+ /***/ public String fileIsTooBigForThisConvenienceMethod;
+ /***/ public String fileIsTooLarge;
+ /***/ public String fileModeNotSetForPath;
+ /***/ public String flagIsDisposed;
+ /***/ public String flagNotFromThis;
+ /***/ public String flagsAlreadyCreated;
+ /***/ public String funnyRefname;
+ /***/ public String hugeIndexesAreNotSupportedByJgitYet;
+ /***/ public String hunkBelongsToAnotherFile;
+ /***/ public String hunkDisconnectedFromFile;
+ /***/ public String hunkHeaderDoesNotMatchBodyLineCountOf;
+ /***/ public String illegalArgumentNotA;
+ /***/ public String illegalStateExists;
+ /***/ public String improperlyPaddedBase64Input;
+ /***/ public String inMemoryBufferLimitExceeded;
+ /***/ public String incorrectHashFor;
+ /***/ public String incorrectOBJECT_ID_LENGTH;
+ /***/ public String incorrectObjectType_COMMITnorTREEnorBLOBnorTAG;
+ /***/ public String indexFileIsInUse;
+ /***/ public String indexFileIsTooLargeForJgit;
+ /***/ public String indexSignatureIsInvalid;
+ /***/ public String integerValueOutOfRange;
+ /***/ public String internalRevisionError;
+ /***/ public String interruptedWriting;
+ /***/ public String invalidAdvertisementOf;
+ /***/ public String invalidAncestryLength;
+ /***/ public String invalidBooleanValue;
+ /***/ public String invalidChannel;
+ /***/ public String invalidCharacterInBase64Data;
+ /***/ public String invalidCommitParentNumber;
+ /***/ public String invalidEncryption;
+ /***/ public String invalidGitType;
+ /***/ public String invalidId;
+ /***/ public String invalidIdLength;
+ /***/ public String invalidIntegerValue;
+ /***/ public String invalidKey;
+ /***/ public String invalidLineInConfigFile;
+ /***/ public String invalidModeFor;
+ /***/ public String invalidModeForPath;
+ /***/ public String invalidObject;
+ /***/ public String invalidOldIdSent;
+ /***/ public String invalidPacketLineHeader;
+ /***/ public String invalidPath;
+ /***/ public String invalidRefName;
+ /***/ public String invalidStageForPath;
+ /***/ public String invalidTagOption;
+ /***/ public String invalidTimeout;
+ /***/ public String invalidURL;
+ /***/ public String invalidWildcards;
+ /***/ public String invalidWindowSize;
+ /***/ public String isAStaticFlagAndHasNorevWalkInstance;
+ /***/ public String kNotInRange;
+ /***/ public String lengthExceedsMaximumArraySize;
+ /***/ public String listingAlternates;
+ /***/ public String localObjectsIncomplete;
+ /***/ public String localRefIsMissingObjects;
+ /***/ public String lockCountMustBeGreaterOrEqual1;
+ /***/ public String lockError;
+ /***/ public String lockOnNotClosed;
+ /***/ public String lockOnNotHeld;
+ /***/ public String malformedpersonIdentString;
+ /***/ public String mergeStrategyAlreadyExistsAsDefault;
+ /***/ public String missingAccesskey;
+ /***/ public String missingForwardImageInGITBinaryPatch;
+ /***/ public String missingObject;
+ /***/ public String missingPrerequisiteCommits;
+ /***/ public String missingSecretkey;
+ /***/ public String mixedStagesNotAllowed;
+ /***/ public String multipleMergeBasesFor;
+ /***/ public String need2Arguments;
+ /***/ public String needPackOut;
+ /***/ public String needsAtLeastOneEntry;
+ /***/ public String needsWorkdir;
+ /***/ public String newlineInQuotesNotAllowed;
+ /***/ public String noApplyInDelete;
+ /***/ public String noClosingBracket;
+ /***/ public String noHEADExistsAndNoExplicitStartingRevisionWasSpecified;
+ /***/ public String noHMACsupport;
+ /***/ public String noSuchRef;
+ /***/ public String noXMLParserAvailable;
+ /***/ public String notABoolean;
+ /***/ public String notABundle;
+ /***/ public String notADIRCFile;
+ /***/ public String notAGitDirectory;
+ /***/ public String notAPACKFile;
+ /***/ public String notARef;
+ /***/ public String notASCIIString;
+ /***/ public String notAValidPack;
+ /***/ public String notFound;
+ /***/ public String notValid;
+ /***/ public String nothingToFetch;
+ /***/ public String nothingToPush;
+ /***/ public String objectAtHasBadZlibStream;
+ /***/ public String objectAtPathDoesNotHaveId;
+ /***/ public String objectIsCorrupt;
+ /***/ public String objectIsNotA;
+ /***/ public String objectNotFoundIn;
+ /***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack;
+ /***/ public String onlyOneFetchSupported;
+ /***/ public String onlyOneOperationCallPerConnectionIsSupported;
+ /***/ public String openFilesMustBeAtLeast1;
+ /***/ public String openingConnection;
+ /***/ public String outputHasAlreadyBeenStarted;
+ /***/ public String packChecksumMismatch;
+ /***/ public String packCorruptedWhileWritingToFilesystem;
+ /***/ public String packDoesNotMatchIndex;
+ /***/ public String packFileInvalid;
+ /***/ public String packHasUnresolvedDeltas;
+ /***/ public String packObjectCountMismatch;
+ /***/ public String packTooLargeForIndexVersion1;
+ /***/ public String packetSizeMustBeAtLeast;
+ /***/ public String packetSizeMustBeAtMost;
+ /***/ public String packfileCorruptionDetected;
+ /***/ public String packfileIsTruncated;
+ /***/ public String packingCancelledDuringObjectsWriting;
+ /***/ public String pathIsNotInWorkingDir;
+ /***/ public String peeledLineBeforeRef;
+ /***/ public String peerDidNotSupplyACompleteObjectGraph;
+ /***/ public String prefixRemote;
+ /***/ public String problemWithResolvingPushRefSpecsLocally;
+ /***/ public String progressMonUploading;
+ /***/ public String propertyIsAlreadyNonNull;
+ /***/ public String pushCancelled;
+ /***/ public String pushIsNotSupportedForBundleTransport;
+ /***/ public String pushNotPermitted;
+ /***/ public String rawLogMessageDoesNotParseAsLogEntry;
+ /***/ public String readTimedOut;
+ /***/ public String readingObjectsFromLocalRepositoryFailed;
+ /***/ public String receivingObjects;
+ /***/ public String refUpdateReturnCodeWas;
+ /***/ public String reflogsNotYetSupportedByRevisionParser;
+ /***/ public String remoteConfigHasNoURIAssociated;
+ /***/ public String remoteDoesNotHaveSpec;
+ /***/ public String remoteDoesNotSupportSmartHTTPPush;
+ /***/ public String remoteHungUpUnexpectedly;
+ /***/ public String remoteNameCantBeNull;
+ /***/ public String repositoryAlreadyExists;
+ /***/ public String repositoryNotFound;
+ /***/ public String requiredHashFunctionNotAvailable;
+ /***/ public String resolvingDeltas;
+ /***/ public String serviceNotPermitted;
+ /***/ public String shortCompressedStreamAt;
+ /***/ public String shortReadOfBlock;
+ /***/ public String shortReadOfOptionalDIRCExtensionExpectedAnotherBytes;
+ /***/ public String shortSkipOfBlock;
+ /***/ public String smartHTTPPushDisabled;
+ /***/ public String sourceDestinationMustMatch;
+ /***/ public String sourceIsNotAWildcard;
+ /***/ public String sourceRefDoesntResolveToAnyObject;
+ /***/ public String sourceRefNotSpecifiedForRefspec;
+ /***/ public String staleRevFlagsOn;
+ /***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;
+ /***/ public String statelessRPCRequiresOptionToBeEnabled;
+ /***/ public String symlinkCannotBeWrittenAsTheLinkTarget;
+ /***/ public String tSizeMustBeGreaterOrEqual1;
+ /***/ public String theFactoryMustNotBeNull;
+ /***/ public String timerAlreadyTerminated;
+ /***/ public String topologicalSortRequired;
+ /***/ public String transportExceptionBadRef;
+ /***/ public String transportExceptionEmptyRef;
+ /***/ public String transportExceptionInvalid;
+ /***/ public String transportExceptionMissingAssumed;
+ /***/ public String transportExceptionReadRef;
+ /***/ public String treeEntryAlreadyExists;
+ /***/ public String treeIteratorDoesNotSupportRemove;
+ /***/ public String truncatedHunkLinesMissingForAncestor;
+ /***/ public String truncatedHunkNewLinesMissing;
+ /***/ public String truncatedHunkOldLinesMissing;
+ /***/ public String unableToCheckConnectivity;
+ /***/ public String unableToLockTag;
+ /***/ public String unableToStore;
+ /***/ public String unableToWrite;
+ /***/ public String unencodeableFile;
+ /***/ public String unexpectedEndOfConfigFile;
+ /***/ public String unexpectedHunkTrailer;
+ /***/ public String unexpectedOddResult;
+ /***/ public String unexpectedRefReport;
+ /***/ public String unexpectedReportLine2;
+ /***/ public String unexpectedReportLine;
+ /***/ public String unknownDIRCVersion;
+ /***/ public String unknownHost;
+ /***/ public String unknownIndexVersionOrCorruptIndex;
+ /***/ public String unknownObjectType;
+ /***/ public String unknownRepositoryFormat2;
+ /***/ public String unknownRepositoryFormat;
+ /***/ public String unmergedPath;
+ /***/ public String unpackError;
+ /***/ public String unreadablePackIndex;
+ /***/ public String unrecognizedRef;
+ /***/ public String unsupportedCommand0;
+ /***/ public String unsupportedEncryptionAlgorithm;
+ /***/ public String unsupportedEncryptionVersion;
+ /***/ public String unsupportedOperationNotAddAtEnd;
+ /***/ public String unsupportedPackIndexVersion;
+ /***/ public String unsupportedPackVersion;
+ /***/ public String updatingRefFailed;
+ /***/ public String userConfigFileInvalid;
+ /***/ public String walkFailure;
+ /***/ public String windowSizeMustBeLesserThanLimit;
+ /***/ public String windowSizeMustBePowerOf2;
+ /***/ public String writeTimedOut;
+ /***/ public String writerAlreadyInitialized;
+ /***/ public String writingNotPermitted;
+ /***/ public String writingNotSupported;
+ /***/ public String writingObjects;
+ /***/ public String wrongDecompressedLength;
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
index 7501509d1..542c82145 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
@@ -43,7 +43,9 @@
package org.eclipse.jgit.api;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.errors.UnmergedPathException;
import org.eclipse.jgit.lib.Commit;
@@ -112,7 +114,7 @@ public RevCommit call() throws NoHeadException, NoMessageException,
Ref head = repo.getRef(Constants.HEAD);
if (head == null)
throw new NoHeadException(
- "Commit on repo without HEAD currently not supported");
+ JGitText.get().commitOnRepoWithoutHEADCurrentlyNotSupported);
// determine the current HEAD and the commit it is referring to
ObjectId parentID = repo.resolve(Constants.HEAD + "^{commit}");
@@ -153,15 +155,11 @@ public RevCommit call() throws NoHeadException, NoMessageException,
case REJECTED:
case LOCK_FAILURE:
throw new ConcurrentRefUpdateException(
- "Could lock HEAD during commit", ru.getRef(), rc);
+ JGitText.get().couldNotLockHEAD, ru.getRef(), rc);
default:
- throw new JGitInternalException(
- "Updating the ref "
- + Constants.HEAD
- + " to "
- + commitId.toString()
- + " failed. ReturnCode from RefUpdate.update() was "
- + rc);
+ throw new JGitInternalException(MessageFormat.format(
+ JGitText.get().updatingRefFailed
+ , Constants.HEAD, commitId.toString(), rc));
}
} finally {
index.unlock();
@@ -173,7 +171,7 @@ public RevCommit call() throws NoHeadException, NoMessageException,
throw e;
} catch (IOException e) {
throw new JGitInternalException(
- "Exception caught during execution of commit command", e);
+ JGitText.get().exceptionCaughtDuringExecutionOfCommitCommand, e);
}
}
@@ -188,7 +186,7 @@ private void processOptions() throws NoMessageException {
if (message == null)
// as long as we don't suppport -C option we have to have
// an explicit message
- throw new NoMessageException("commit message not specified");
+ throw new NoMessageException(JGitText.get().commitMessageNotSpecified);
if (committer == null)
committer = new PersonIdent(repo);
if (author == null)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java
index c5d9fe68d..02bb494f6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ConcurrentRefUpdateException.java
@@ -37,6 +37,9 @@
*/
package org.eclipse.jgit.api;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
@@ -53,16 +56,16 @@ public class ConcurrentRefUpdateException extends GitAPIException {
ConcurrentRefUpdateException(String message, Ref ref,
RefUpdate.Result rc, Throwable cause) {
- super((rc == null) ? message : message
- + ". RefUpdate return code was: " + rc, cause);
+ super((rc == null) ? message : message + ". "
+ + MessageFormat.format(JGitText.get().refUpdateReturnCodeWas, rc), cause);
this.rc = rc;
this.ref = ref;
}
ConcurrentRefUpdateException(String message, Ref ref,
RefUpdate.Result rc) {
- super((rc == null) ? message : message
- + ". RefUpdate return code was: " + rc);
+ super((rc == null) ? message : message + ". "
+ + MessageFormat.format(JGitText.get().refUpdateReturnCodeWas, rc));
this.rc = rc;
this.ref = ref;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/GitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/GitCommand.java
index 4df5b4437..ece467aa0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/GitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/GitCommand.java
@@ -37,8 +37,10 @@
*/
package org.eclipse.jgit.api;
+import java.text.MessageFormat;
import java.util.concurrent.Callable;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Repository;
/**
@@ -110,8 +112,8 @@ protected void setCallable(boolean callable) {
*/
protected void checkCallable() {
if (!callable)
- throw new IllegalStateException("Command "
- + this.getClass().getName()
- + " was called in the wrong state");
+ throw new IllegalStateException(MessageFormat.format(
+ JGitText.get().commandWasCalledInTheWrongState
+ , this.getClass().getName()));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
index 4ce57201d..414fac4f3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
@@ -43,7 +43,9 @@
package org.eclipse.jgit.api;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.AnyObjectId;
@@ -97,13 +99,13 @@ public Iterable<RevCommit> call() throws NoHeadException,
ObjectId headId = repo.resolve(Constants.HEAD);
if (headId == null)
throw new NoHeadException(
- "No HEAD exists and no explicit starting revision was specified");
+ JGitText.get().noHEADExistsAndNoExplicitStartingRevisionWasSpecified);
add(headId);
} catch (IOException e) {
// all exceptions thrown by add() shouldn't occur and represent
// severe low-level exception which are therefore wrapped
throw new JGitInternalException(
- "An exception occured while trying to add the Id of HEAD",
+ JGitText.get().anExceptionOccurredWhileTryingToAddTheIdOfHEAD,
e);
}
}
@@ -214,9 +216,9 @@ private LogCommand add(boolean include, AnyObjectId start)
} catch (IncorrectObjectTypeException e) {
throw e;
} catch (IOException e) {
- throw new JGitInternalException(
- "Exception occured during adding of " + start
- + " as option to a Log command", e);
+ throw new JGitInternalException(MessageFormat.format(
+ JGitText.get().exceptionOccuredDuringAddingOfOptionToALogCommand
+ , start), e);
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
index 115d9baff..2d552d40d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
@@ -50,6 +50,7 @@
import java.io.OutputStream;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.patch.FileHeader;
/**
@@ -75,7 +76,7 @@ public DiffFormatter() {
*/
public void setContext(final int lineCount) {
if (lineCount < 0)
- throw new IllegalArgumentException("context must be >= 0");
+ throw new IllegalArgumentException(JGitText.get().contextMustBeNonNegative);
context = lineCount;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/MyersDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/MyersDiff.java
index 055729961..6a4b44bff 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/MyersDiff.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/MyersDiff.java
@@ -44,6 +44,9 @@
package org.eclipse.jgit.diff;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.util.IntList;
import org.eclipse.jgit.util.LongList;
@@ -292,21 +295,21 @@ abstract class EditPaths {
final int getIndex(int d, int k) {
// TODO: remove
if (((d + k - middleK) % 2) == 1)
- throw new RuntimeException("odd: " + d + " + " + k + " - " + middleK);
+ throw new RuntimeException(MessageFormat.format(JGitText.get().unexpectedOddResult, d, k, middleK));
return (d + k - middleK) / 2;
}
final int getX(int d, int k) {
// TODO: remove
if (k < beginK || k > endK)
- throw new RuntimeException("k " + k + " not in " + beginK + " - " + endK);
+ throw new RuntimeException(MessageFormat.format(JGitText.get().kNotInRange, k, beginK, endK));
return x.get(getIndex(d, k));
}
final long getSnake(int d, int k) {
// TODO: remove
if (k < beginK || k > endK)
- throw new RuntimeException("k " + k + " not in " + beginK + " - " + endK);
+ throw new RuntimeException(MessageFormat.format(JGitText.get().kNotInRange, k, beginK, endK));
return snake.get(getIndex(d, k));
}
@@ -520,7 +523,7 @@ final boolean meets(int d, int k, int x, long snake) {
*/
public static void main(String[] args) {
if (args.length != 2) {
- System.err.println("Need 2 arguments");
+ System.err.println(JGitText.get().need2Arguments);
System.exit(1);
}
try {
@@ -532,4 +535,4 @@ public static void main(String[] args) {
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
index 3a8abc1a7..42fea4852 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
@@ -56,9 +56,11 @@
import java.io.UnsupportedEncodingException;
import java.security.DigestOutputStream;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Comparator;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.UnmergedPathException;
import org.eclipse.jgit.lib.Constants;
@@ -200,7 +202,7 @@ public static DirCache lock(final File indexLocation)
throws CorruptObjectException, IOException {
final DirCache c = new DirCache(indexLocation);
if (!c.lock())
- throw new IOException("Cannot lock " + indexLocation);
+ throw new IOException(MessageFormat.format(JGitText.get().cannotLock, indexLocation));
try {
c.read();
@@ -319,7 +321,7 @@ void replace(final DirCacheEntry[] e, final int cnt) {
*/
public void read() throws IOException, CorruptObjectException {
if (liveFile == null)
- throw new IOException("DirCache does not have a backing file");
+ throw new IOException(JGitText.get().dirCacheDoesNotHaveABackingFile);
if (!liveFile.exists())
clear();
else if (liveFile.lastModified() != lastModified) {
@@ -363,13 +365,13 @@ private void readFrom(final FileInputStream inStream) throws IOException,
IO.readFully(in, hdr, 0, 12);
md.update(hdr, 0, 12);
if (!is_DIRC(hdr))
- throw new CorruptObjectException("Not a DIRC file.");
+ throw new CorruptObjectException(JGitText.get().notADIRCFile);
final int ver = NB.decodeInt32(hdr, 4);
if (ver != 2)
- throw new CorruptObjectException("Unknown DIRC version " + ver);
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().unknownDIRCVersion, ver));
entryCnt = NB.decodeInt32(hdr, 8);
if (entryCnt < 0)
- throw new CorruptObjectException("DIRC has too many entries.");
+ throw new CorruptObjectException(JGitText.get().DIRCHasTooManyEntries);
// Load the individual file entries.
//
@@ -398,9 +400,8 @@ private void readFrom(final FileInputStream inStream) throws IOException,
switch (NB.decodeInt32(hdr, 0)) {
case EXT_TREE: {
if (Integer.MAX_VALUE < sz) {
- throw new CorruptObjectException("DIRC extension "
- + formatExtensionName(hdr) + " is too large at "
- + sz + " bytes.");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().DIRCExtensionIsTooLargeAt
+ , formatExtensionName(hdr), sz));
}
final byte[] raw = new byte[(int) sz];
IO.readFully(in, raw, 0, raw.length);
@@ -421,16 +422,15 @@ private void readFrom(final FileInputStream inStream) throws IOException,
// _required_ to understand this index format.
// Since we did not trap it above we must abort.
//
- throw new CorruptObjectException("DIRC extension "
- + formatExtensionName(hdr)
- + " not supported by this version.");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().DIRCExtensionNotSupportedByThisVersion
+ , formatExtensionName(hdr)));
}
}
}
final byte[] exp = md.digest();
if (!Arrays.equals(exp, hdr)) {
- throw new CorruptObjectException("DIRC checksum mismatch");
+ throw new CorruptObjectException(JGitText.get().DIRCChecksumMismatch);
}
}
@@ -441,9 +441,8 @@ private void skipOptionalExtension(final InputStream in,
while (0 < sz) {
int n = in.read(b, 0, (int) Math.min(b.length, sz));
if (n < 0) {
- throw new EOFException("Short read of optional DIRC extension "
- + formatExtensionName(hdr) + "; expected another " + sz
- + " bytes within the section.");
+ throw new EOFException(MessageFormat.format(JGitText.get().shortReadOfOptionalDIRCExtensionExpectedAnotherBytes
+ , formatExtensionName(hdr), sz));
}
md.update(b, 0, n);
sz -= n;
@@ -475,7 +474,7 @@ private static boolean is_DIRC(final byte[] hdr) {
*/
public boolean lock() throws IOException {
if (liveFile == null)
- throw new IOException("DirCache does not have a backing file");
+ throw new IOException(JGitText.get().dirCacheDoesNotHaveABackingFile);
final LockFile tmp = new LockFile(liveFile);
if (tmp.lock()) {
tmp.setNeedStatInformation(true);
@@ -585,10 +584,10 @@ public boolean commit() {
private void requireLocked(final LockFile tmp) {
if (liveFile == null)
- throw new IllegalStateException("DirCache is not locked");
+ throw new IllegalStateException(JGitText.get().dirCacheIsNotLocked);
if (tmp == null)
- throw new IllegalStateException("DirCache "
- + liveFile.getAbsolutePath() + " not locked.");
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().dirCacheFileIsNotLocked
+ , liveFile.getAbsolutePath()));
}
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuilder.java
index 69f5444c6..e6b619781 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuilder.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheBuilder.java
@@ -45,8 +45,10 @@
package org.eclipse.jgit.dircache;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.Arrays;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.WindowCursor;
@@ -101,8 +103,8 @@ protected DirCacheBuilder(final DirCache dc, final int ecnt) {
*/
public void add(final DirCacheEntry newEntry) {
if (newEntry.getRawMode() == 0)
- throw new IllegalArgumentException("FileMode not set for path "
- + newEntry.getPathString());
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().fileModeNotSetForPath
+ , newEntry.getPathString()));
beforeAdd(newEntry);
fastAdd(newEntry);
}
@@ -214,9 +216,9 @@ private void beforeAdd(final DirCacheEntry newEntry) {
final int peStage = lastEntry.getStage();
final int dceStage = newEntry.getStage();
if (peStage == dceStage)
- throw bad(newEntry, "Duplicate stages not allowed");
+ throw bad(newEntry, JGitText.get().duplicateStagesNotAllowed);
if (peStage == 0 || dceStage == 0)
- throw bad(newEntry, "Mixed stages not allowed");
+ throw bad(newEntry, JGitText.get().mixedStagesNotAllowed);
if (peStage > dceStage)
sorted = false;
}
@@ -237,9 +239,9 @@ private void resort() {
final int peStage = pe.getStage();
final int ceStage = ce.getStage();
if (peStage == ceStage)
- throw bad(ce, "Duplicate stages not allowed");
+ throw bad(ce, JGitText.get().duplicateStagesNotAllowed);
if (peStage == 0 || ceStage == 0)
- throw bad(ce, "Mixed stages not allowed");
+ throw bad(ce, JGitText.get().mixedStagesNotAllowed);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java
index 85ad8b4d7..77e9d51e0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEditor.java
@@ -45,11 +45,13 @@
package org.eclipse.jgit.dircache;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
/**
@@ -149,8 +151,8 @@ private void applyEdits() {
ent = new DirCacheEntry(e.path);
e.apply(ent);
if (ent.getRawMode() == 0)
- throw new IllegalArgumentException("FileMode not set"
- + " for path " + ent.getPathString());
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().fileModeNotSetForPath
+ , ent.getPathString()));
} else {
ent = cache.getEntry(eIdx);
e.apply(ent);
@@ -241,7 +243,7 @@ public DeletePath(final DirCacheEntry ent) {
}
public void apply(final DirCacheEntry ent) {
- throw new UnsupportedOperationException("No apply in delete");
+ throw new UnsupportedOperationException(JGitText.get().noApplyInDelete);
}
}
@@ -271,7 +273,7 @@ public DeleteTree(final String entryPath) {
}
public void apply(final DirCacheEntry ent) {
- throw new UnsupportedOperationException("No apply in delete");
+ throw new UnsupportedOperationException(JGitText.get().noApplyInDelete);
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
index 415de095b..afa6bef05 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
@@ -51,8 +51,10 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.Arrays;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
@@ -145,7 +147,7 @@ public class DirCacheEntry {
for (;;) {
final int c = in.read();
if (c < 0)
- throw new EOFException("Short read of block.");
+ throw new EOFException(JGitText.get().shortReadOfBlock);
if (c == 0)
break;
tmp.write(c);
@@ -229,11 +231,11 @@ public DirCacheEntry(final byte[] newPath) {
*/
public DirCacheEntry(final byte[] newPath, final int stage) {
if (!isValidPath(newPath))
- throw new IllegalArgumentException("Invalid path: "
- + toString(newPath));
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidPath
+ , toString(newPath)));
if (stage < 0 || 3 < stage)
- throw new IllegalArgumentException("Invalid stage " + stage
- + " for path " + toString(newPath));
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidStageForPath
+ , stage, toString(newPath)));
info = new byte[INFO_LEN];
infoOffset = 0;
@@ -397,8 +399,8 @@ public void setFileMode(final FileMode mode) {
switch (mode.getBits() & FileMode.TYPE_MASK) {
case FileMode.TYPE_MISSING:
case FileMode.TYPE_TREE:
- throw new IllegalArgumentException("Invalid mode " + mode
- + " for path " + getPathString());
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidModeForPath
+ , mode, getPathString()));
}
NB.encodeInt32(info, infoOffset + P_MODE, mode.getBits());
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
index b602033dc..7c6560a3e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
@@ -46,6 +46,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Exception thrown if a conflict occurs during a merge checkout.
@@ -59,7 +62,7 @@ public class CheckoutConflictException extends IOException {
* @param file
*/
public CheckoutConflictException(String file) {
- super("Checkout conflict with file: " + file);
+ super(MessageFormat.format(JGitText.get().checkoutConflictWithFile, file));
}
/**
@@ -68,7 +71,7 @@ public CheckoutConflictException(String file) {
* @param files
*/
public CheckoutConflictException(String[] files) {
- super("Checkout conflict with files: " + buildList(files));
+ super(MessageFormat.format(JGitText.get().checkoutConflictWithFiles, buildList(files)));
}
private static String buildList(String[] files) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java
index edee6084b..1c432a817 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CompoundException.java
@@ -48,13 +48,15 @@
import java.util.Collections;
import java.util.List;
+import org.eclipse.jgit.JGitText;
+
/** An exception detailing multiple reasons for failure. */
public class CompoundException extends Exception {
private static final long serialVersionUID = 1L;
private static String format(final Collection<Throwable> causes) {
final StringBuilder msg = new StringBuilder();
- msg.append("Failure due to one of the following:");
+ msg.append(JGitText.get().failureDueToOneOfTheFollowing);
for (final Throwable c : causes) {
msg.append(" ");
msg.append(c.getMessage());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java
index f42b0d7e1..939dc2160 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CorruptObjectException.java
@@ -47,7 +47,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
@@ -76,7 +78,7 @@ public CorruptObjectException(final AnyObjectId id, final String why) {
* @param why
*/
public CorruptObjectException(final ObjectId id, final String why) {
- super("Object " + id.name() + " is corrupt: " + why);
+ super(MessageFormat.format(JGitText.get().objectIsCorrupt, id.name(), why));
}
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/EntryExistsException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/EntryExistsException.java
index 893ee9ceb..d7e587e3d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/EntryExistsException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/EntryExistsException.java
@@ -45,6 +45,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Attempt to add an entry to a tree that already exists.
@@ -59,6 +62,6 @@ public class EntryExistsException extends IOException {
* @param name workdir relative file name
*/
public EntryExistsException(final String name) {
- super("Tree entry \"" + name + "\" already exists.");
+ super(MessageFormat.format(JGitText.get().treeEntryAlreadyExists, name));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/IncorrectObjectTypeException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/IncorrectObjectTypeException.java
index 7cf1de214..0dac326f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/IncorrectObjectTypeException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/IncorrectObjectTypeException.java
@@ -47,7 +47,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@@ -69,7 +71,7 @@ public class IncorrectObjectTypeException extends IOException {
* @param type object type
*/
public IncorrectObjectTypeException(final ObjectId id, final String type) {
- super("Object " + id.name() + " is not a " + type + ".");
+ super(MessageFormat.format(JGitText.get().objectIsNotA, id.name(), type));
}
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/InvalidObjectIdException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/InvalidObjectIdException.java
index e6577213e..96c75f555 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/InvalidObjectIdException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/InvalidObjectIdException.java
@@ -46,6 +46,9 @@
package org.eclipse.jgit.errors;
import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Thrown when an invalid object id is passed in as an argument.
@@ -61,7 +64,7 @@ public class InvalidObjectIdException extends IllegalArgumentException {
* @param length of the sequence of invalid bytes.
*/
public InvalidObjectIdException(byte[] bytes, int offset, int length) {
- super("Invalid id" + asAscii(bytes, offset, length));
+ super(MessageFormat.format(JGitText.get().invalidId, asAscii(bytes, offset, length)));
}
private static String asAscii(byte[] bytes, int offset, int length) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingBundlePrerequisiteException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingBundlePrerequisiteException.java
index 2d399543a..63b0e200c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingBundlePrerequisiteException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingBundlePrerequisiteException.java
@@ -46,6 +46,7 @@
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.transport.URIish;
@@ -57,7 +58,7 @@ public class MissingBundlePrerequisiteException extends TransportException {
private static String format(final Map<ObjectId, String> missingCommits) {
final StringBuilder r = new StringBuilder();
- r.append("missing prerequisite commits:");
+ r.append(JGitText.get().missingPrerequisiteCommits);
for (final Map.Entry<ObjectId, String> e : missingCommits.entrySet()) {
r.append("\n ");
r.append(e.getKey().name());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingObjectException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingObjectException.java
index 41cacb84a..1d193e18c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingObjectException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/MissingObjectException.java
@@ -47,7 +47,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@@ -65,7 +67,7 @@ public class MissingObjectException extends IOException {
* @param type object type
*/
public MissingObjectException(final ObjectId id, final String type) {
- super("Missing " + type + " " + id.name());
+ super(MessageFormat.format(JGitText.get().missingObject, type, id.name()));
}
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoClosingBracketException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoClosingBracketException.java
index 623dfa6ec..25cf800fa 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoClosingBracketException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoClosingBracketException.java
@@ -46,6 +46,10 @@
package org.eclipse.jgit.errors;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
+
/**
* Thrown when a pattern contains a character group which is open to the right
* side or a character class which is open to the right side.
@@ -72,7 +76,7 @@ public NoClosingBracketException(final int indexOfOpeningBracket,
private static String createMessage(final int indexOfOpeningBracket,
final String openingBracket, final String closingBracket) {
- return String.format("No closing %s found for %s at index %s.",
+ return MessageFormat.format(JGitText.get().noClosingBracket,
closingBracket, openingBracket,
Integer.valueOf(indexOfOpeningBracket));
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java
index a34b80db8..59354ddb7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java
@@ -45,6 +45,9 @@
import java.io.File;
import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/** Thrown when a PackFile previously failed and is known to be unusable */
public class PackInvalidException extends IOException {
@@ -57,6 +60,6 @@ public class PackInvalidException extends IOException {
* path of the invalid pack file.
*/
public PackInvalidException(final File path) {
- super("Pack file invalid: " + path.getAbsolutePath());
+ super(MessageFormat.format(JGitText.get().packFileInvalid, path.getAbsolutePath()));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RepositoryNotFoundException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RepositoryNotFoundException.java
index c745e7326..d00a76688 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RepositoryNotFoundException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RepositoryNotFoundException.java
@@ -44,6 +44,9 @@
package org.eclipse.jgit.errors;
import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/** Indicates a local repository does not exist. */
public class RepositoryNotFoundException extends TransportException {
@@ -94,6 +97,6 @@ public RepositoryNotFoundException(String location, Throwable why) {
}
private static String message(final String location) {
- return "repository not found: " + location;
+ return MessageFormat.format(JGitText.get().repositoryNotFound, location);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevWalkException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevWalkException.java
index 0ad41ed17..7b9c70736 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevWalkException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevWalkException.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.errors;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.revwalk.RevWalk;
/**
@@ -65,6 +66,6 @@ public class RevWalkException extends RuntimeException {
* the checked exception that describes why the walk failed.
*/
public RevWalkException(final Throwable cause) {
- super("Walk failure.", cause);
+ super(JGitText.get().walkFailure, cause);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnmergedPathException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnmergedPathException.java
index 51e651ca5..ccc960e96 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnmergedPathException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnmergedPathException.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.errors;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.dircache.DirCacheEntry;
/**
@@ -62,7 +64,7 @@ public class UnmergedPathException extends IOException {
* the first non-zero stage of the unmerged path.
*/
public UnmergedPathException(final DirCacheEntry dce) {
- super("Unmerged path: " + dce.getPathString());
+ super(MessageFormat.format(JGitText.get().unmergedPath, dce.getPathString()));
entry = dce;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java
index 42182965a..cff542be2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java
@@ -46,6 +46,8 @@
import java.util.List;
+import org.eclipse.jgit.JGitText;
+
abstract class AbstractHead implements Head {
private List<Head> newHeads = null;
@@ -64,7 +66,7 @@ abstract class AbstractHead implements Head {
*/
public final void setNewHeads(List<Head> newHeads) {
if (this.newHeads != null)
- throw new IllegalStateException("Property is already non null");
+ throw new IllegalStateException(JGitText.get().propertyIsAlreadyNonNull);
this.newHeads = newHeads;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/GroupHead.java b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/GroupHead.java
index 79f64f859..ffa34a710 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/GroupHead.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/GroupHead.java
@@ -44,11 +44,13 @@
package org.eclipse.jgit.fnmatch;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.InvalidPatternException;
final class GroupHead extends AbstractHead {
@@ -112,9 +114,9 @@ final class GroupHead extends AbstractHead {
characterClasses.add(LetterPattern.INSTANCE);
characterClasses.add(DigitPattern.INSTANCE);
} else {
- final String message = String.format(
- "The character class %s is not supported.",
- characterClass);
+ final String message = String.format(MessageFormat.format(
+ JGitText.get().characterClassIsNotSupported,
+ characterClass));
throw new InvalidPatternException(message, wholePattern);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java
index 9d9174111..a150e8fea 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AbbreviatedObjectId.java
@@ -43,6 +43,9 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.InvalidObjectIdException;
import org.eclipse.jgit.util.NB;
import org.eclipse.jgit.util.RawParseUtils;
@@ -74,7 +77,8 @@ public final class AbbreviatedObjectId {
public static final AbbreviatedObjectId fromString(final byte[] buf,
final int offset, final int end) {
if (end - offset > Constants.OBJECT_ID_STRING_LENGTH)
- throw new IllegalArgumentException("Invalid id");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidIdLength
+ , end - offset, Constants.OBJECT_ID_STRING_LENGTH));
return fromHexString(buf, offset, end);
}
@@ -87,7 +91,7 @@ public static final AbbreviatedObjectId fromString(final byte[] buf,
*/
public static final AbbreviatedObjectId fromString(final String str) {
if (str.length() > Constants.OBJECT_ID_STRING_LENGTH)
- throw new IllegalArgumentException("Invalid id: " + str);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidId, str));
final byte[] b = Constants.encodeASCII(str);
return fromHexString(b, 0, b.length);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BinaryDelta.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BinaryDelta.java
index 461e6d402..a59b33533 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BinaryDelta.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BinaryDelta.java
@@ -44,6 +44,8 @@
package org.eclipse.jgit.lib;
+import org.eclipse.jgit.JGitText;
+
/**
* Recreate a stream from a base stream and a GIT pack delta.
* <p>
@@ -78,7 +80,7 @@ public static final byte[] apply(final byte[] base, final byte[] delta) {
shift += 7;
} while ((c & 0x80) != 0);
if (base.length != baseLen)
- throw new IllegalArgumentException("base length incorrect");
+ throw new IllegalArgumentException(JGitText.get().baseLengthIncorrect);
// Length of the resulting object (a variable length int).
//
@@ -132,7 +134,7 @@ public static final byte[] apply(final byte[] base, final byte[] delta) {
// cmd == 0 has been reserved for future encoding but
// for now its not acceptable.
//
- throw new IllegalArgumentException("unsupported command 0");
+ throw new IllegalArgumentException(JGitText.get().unsupportedCommand0);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
index 0a4222fc3..b05942b02 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
@@ -47,7 +47,9 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.util.RawParseUtils;
@@ -91,7 +93,7 @@ public BlobBasedConfig(Config base, final Repository r,
super(base);
final ObjectLoader loader = r.openBlob(objectId);
if (loader == null)
- throw new IOException("Blob not found: " + objectId);
+ throw new IOException(MessageFormat.format(JGitText.get().blobNotFound, objectId));
fromText(RawParseUtils.decode(loader.getBytes()));
}
@@ -118,12 +120,12 @@ public BlobBasedConfig(Config base, final Commit commit, final String path)
final Repository r = commit.getRepository();
final TreeWalk tree = TreeWalk.forPath(r, path, treeId);
if (tree == null)
- throw new FileNotFoundException("Entry not found by path: " + path);
+ throw new FileNotFoundException(MessageFormat.format(JGitText.get().entryNotFoundByPath, path));
final ObjectId blobId = tree.getObjectId(0);
final ObjectLoader loader = tree.getRepository().openBlob(blobId);
if (loader == null)
- throw new IOException("Blob not found: " + blobId + " for path: "
- + path);
+ throw new IOException(MessageFormat.format(JGitText.get().blobNotFoundForPath
+ , blobId, path));
fromText(RawParseUtils.decode(loader.getBytes()));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java
index 65921e53c..66dd89120 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Commit.java
@@ -49,7 +49,9 @@
import java.io.DataInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -279,18 +281,18 @@ private void decode() {
DataInputStream br = new DataInputStream(new ByteArrayInputStream(raw));
String n = br.readLine();
if (n == null || !n.startsWith("tree ")) {
- throw new CorruptObjectException(commitId, "no tree");
+ throw new CorruptObjectException(commitId, JGitText.get().corruptObjectNotree);
}
while ((n = br.readLine()) != null && n.startsWith("parent ")) {
// empty body
}
if (n == null || !n.startsWith("author ")) {
- throw new CorruptObjectException(commitId, "no author");
+ throw new CorruptObjectException(commitId, JGitText.get().corruptObjectNoAuthor);
}
String rawAuthor = n.substring("author ".length());
n = br.readLine();
if (n == null || !n.startsWith("committer ")) {
- throw new CorruptObjectException(commitId, "no committer");
+ throw new CorruptObjectException(commitId, JGitText.get().corruptObjectNoCommitter);
}
String rawCommitter = n.substring("committer ".length());
n = br.readLine();
@@ -298,8 +300,8 @@ private void decode() {
encoding = Charset.forName(n.substring("encoding ".length()));
else
if (n == null || !n.equals("")) {
- throw new CorruptObjectException(commitId,
- "malformed header:"+n);
+ throw new CorruptObjectException(commitId, MessageFormat.format(
+ JGitText.get().corruptObjectMalformedHeader, n));
}
byte[] readBuf = new byte[br.available()]; // in-memory stream so this is all bytes left
br.read(readBuf);
@@ -336,12 +338,12 @@ public void setMessage(final String m) {
*/
public void commit() throws IOException {
if (getCommitId() != null)
- throw new IllegalStateException("exists " + getCommitId());
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().commitAlreadyExists, getCommitId()));
setCommitId(new ObjectWriter(objdb).writeCommit(this));
}
public String toString() {
- return "Commit[" + ObjectId.toString(getCommitId()) + " " + getAuthor() + "]";
+ return "Commit[" + ObjectId.toString(getCommitId()) + " " + getAuthor() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
/**
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
index 062c1c397..7c5af1e64 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
@@ -50,6 +50,7 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -59,6 +60,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.util.StringUtils;
@@ -210,8 +212,8 @@ public int getInt(final String section, String subsection,
final long val = getLong(section, subsection, name, defaultValue);
if (Integer.MIN_VALUE <= val && val <= Integer.MAX_VALUE)
return (int) val;
- throw new IllegalArgumentException("Integer value " + section + "."
- + name + " out of range");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().integerValueOutOfRange
+ , section, name));
}
/**
@@ -257,8 +259,8 @@ public long getLong(final String section, String subsection,
try {
return mul * Long.parseLong(n);
} catch (NumberFormatException nfe) {
- throw new IllegalArgumentException("Invalid integer value: "
- + section + "." + name + "=" + str);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidIntegerValue
+ , section, name, str));
}
}
@@ -303,8 +305,8 @@ public boolean getBoolean(final String section, String subsection,
try {
return StringUtils.toBoolean(n);
} catch (IllegalArgumentException err) {
- throw new IllegalArgumentException("Invalid boolean value: "
- + section + "." + name + "=" + n);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidBooleanValue
+ , section, name, n));
}
}
@@ -819,7 +821,7 @@ public void fromText(final String text) throws ConfigInvalidException {
input = in.read();
}
if (']' != input)
- throw new ConfigInvalidException("Bad group header");
+ throw new ConfigInvalidException(JGitText.get().badGroupHeader);
e.suffix = "";
} else if (last != null) {
@@ -835,7 +837,7 @@ public void fromText(final String text) throws ConfigInvalidException {
e.value = readValue(in, false, -1);
} else
- throw new ConfigInvalidException("Invalid line in config file");
+ throw new ConfigInvalidException(JGitText.get().invalidLineInConfigFile);
}
state.set(newState(newEntries));
@@ -862,7 +864,7 @@ private static String readSectionName(final StringReader in)
for (;;) {
int c = in.read();
if (c < 0)
- throw new ConfigInvalidException("Unexpected end of config file");
+ throw new ConfigInvalidException(JGitText.get().unexpectedEndOfConfigFile);
if (']' == c) {
in.reset();
@@ -873,7 +875,7 @@ private static String readSectionName(final StringReader in)
for (;;) {
c = in.read();
if (c < 0)
- throw new ConfigInvalidException("Unexpected end of config file");
+ throw new ConfigInvalidException(JGitText.get().unexpectedEndOfConfigFile);
if ('"' == c) {
in.reset();
@@ -882,7 +884,7 @@ private static String readSectionName(final StringReader in)
if (' ' == c || '\t' == c)
continue; // Skipped...
- throw new ConfigInvalidException("Bad section entry: " + name);
+ throw new ConfigInvalidException(MessageFormat.format(JGitText.get().badSectionEntry, name));
}
break;
}
@@ -890,7 +892,7 @@ private static String readSectionName(final StringReader in)
if (Character.isLetterOrDigit((char) c) || '.' == c || '-' == c)
name.append((char) c);
else
- throw new ConfigInvalidException("Bad section entry: " + name);
+ throw new ConfigInvalidException(MessageFormat.format(JGitText.get().badSectionEntry, name));
}
return name.toString();
}
@@ -901,7 +903,7 @@ private static String readKeyName(final StringReader in)
for (;;) {
int c = in.read();
if (c < 0)
- throw new ConfigInvalidException("Unexpected end of config file");
+ throw new ConfigInvalidException(JGitText.get().unexpectedEndOfConfigFile);
if ('=' == c)
break;
@@ -910,7 +912,7 @@ private static String readKeyName(final StringReader in)
for (;;) {
c = in.read();
if (c < 0)
- throw new ConfigInvalidException("Unexpected end of config file");
+ throw new ConfigInvalidException(JGitText.get().unexpectedEndOfConfigFile);
if ('=' == c)
break;
@@ -922,7 +924,7 @@ private static String readKeyName(final StringReader in)
if (' ' == c || '\t' == c)
continue; // Skipped...
- throw new ConfigInvalidException("Bad entry delimiter");
+ throw new ConfigInvalidException(JGitText.get().badEntryDelimiter);
}
break;
}
@@ -937,7 +939,7 @@ private static String readKeyName(final StringReader in)
name.append((char) c);
break;
} else
- throw new ConfigInvalidException("Bad entry name: " + name);
+ throw new ConfigInvalidException(MessageFormat.format(JGitText.get().badEntryName, name));
}
return name.toString();
}
@@ -950,13 +952,13 @@ private static String readValue(final StringReader in, boolean quote,
int c = in.read();
if (c < 0) {
if (value.length() == 0)
- throw new ConfigInvalidException("Unexpected end of config file");
+ throw new ConfigInvalidException(JGitText.get().unexpectedEndOfConfigFile);
break;
}
if ('\n' == c) {
if (quote)
- throw new ConfigInvalidException("Newline in quotes not allowed");
+ throw new ConfigInvalidException(JGitText.get().newlineInQuotesNotAllowed);
in.reset();
break;
}
@@ -985,7 +987,7 @@ private static String readValue(final StringReader in, boolean quote,
c = in.read();
switch (c) {
case -1:
- throw new ConfigInvalidException("End of file in escape");
+ throw new ConfigInvalidException(JGitText.get().endOfFileInEscape);
case '\n':
continue;
case 't':
@@ -1004,7 +1006,7 @@ private static String readValue(final StringReader in, boolean quote,
value.append('"');
continue;
default:
- throw new ConfigInvalidException("Bad escape: " + ((char) c));
+ throw new ConfigInvalidException(MessageFormat.format(JGitText.get().badEscape, ((char) c)));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
index 348905dd1..37836f324 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
@@ -49,7 +49,9 @@
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.util.MutableInteger;
@@ -327,8 +329,8 @@ public static MessageDigest newMessageDigest() {
try {
return MessageDigest.getInstance(HASH_FUNCTION);
} catch (NoSuchAlgorithmException nsae) {
- throw new RuntimeException("Required hash function "
- + HASH_FUNCTION + " not available.", nsae);
+ throw new RuntimeException(MessageFormat.format(
+ JGitText.get().requiredHashFunctionNotAvailable, HASH_FUNCTION), nsae);
}
}
@@ -349,7 +351,7 @@ public static String typeString(final int typeCode) {
case OBJ_TAG:
return TYPE_TAG;
default:
- throw new IllegalArgumentException("Bad object type: " + typeCode);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().badObjectType, typeCode));
}
}
@@ -373,7 +375,7 @@ public static byte[] encodedTypeString(final int typeCode) {
case OBJ_TAG:
return ENCODED_TYPE_TAG;
default:
- throw new IllegalArgumentException("Bad object type: " + typeCode);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().badObjectType, typeCode));
}
}
@@ -408,7 +410,7 @@ public static int decodeTypeString(final AnyObjectId id,
|| typeString[position + 2] != 'o'
|| typeString[position + 3] != 'b'
|| typeString[position + 4] != endMark)
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
offset.value = position + 5;
return Constants.OBJ_BLOB;
@@ -419,7 +421,7 @@ public static int decodeTypeString(final AnyObjectId id,
|| typeString[position + 4] != 'i'
|| typeString[position + 5] != 't'
|| typeString[position + 6] != endMark)
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
offset.value = position + 7;
return Constants.OBJ_COMMIT;
@@ -428,7 +430,7 @@ public static int decodeTypeString(final AnyObjectId id,
case 'a':
if (typeString[position + 2] != 'g'
|| typeString[position + 3] != endMark)
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
offset.value = position + 4;
return Constants.OBJ_TAG;
@@ -436,19 +438,19 @@ public static int decodeTypeString(final AnyObjectId id,
if (typeString[position + 2] != 'e'
|| typeString[position + 3] != 'e'
|| typeString[position + 4] != endMark)
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
offset.value = position + 5;
return Constants.OBJ_TREE;
default:
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
}
default:
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
}
} catch (ArrayIndexOutOfBoundsException bad) {
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
}
}
@@ -481,7 +483,7 @@ public static byte[] encodeASCII(final String s) {
for (int k = r.length - 1; k >= 0; k--) {
final char c = s.charAt(k);
if (c > 127)
- throw new IllegalArgumentException("Not ASCII string: " + s);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().notASCIIString, s));
r[k] = (byte) c;
}
return r;
@@ -512,7 +514,7 @@ public static byte[] encode(final String str) {
static {
if (OBJECT_ID_LENGTH != newMessageDigest().getDigestLength())
- throw new LinkageError("Incorrect OBJECT_ID_LENGTH.");
+ throw new LinkageError(JGitText.get().incorrectOBJECT_ID_LENGTH);
CHARSET = Charset.forName(CHARACTER_ENCODING);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaOfsPackedObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaOfsPackedObjectLoader.java
index 0b7c6c45f..d0e98a2a9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaOfsPackedObjectLoader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaOfsPackedObjectLoader.java
@@ -48,6 +48,7 @@
import java.io.IOException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
/** Reads a deltified object which uses an offset to find its base. */
@@ -75,7 +76,7 @@ public ObjectId getDeltaBase() throws IOException {
final ObjectId id = pack.findObjectForOffset(deltaBase);
if (id == null)
throw new CorruptObjectException(
- "Offset-written delta base for object not found in a pack");
+ JGitText.get().offsetWrittenDeltaBaseForObjectNotFoundInAPack);
return id;
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaPackedObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaPackedObjectLoader.java
index b42549943..bbc1c62a8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaPackedObjectLoader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DeltaPackedObjectLoader.java
@@ -47,8 +47,10 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.zip.DataFormatException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
/** Reader for a deltified object stored in a pack file. */
@@ -93,8 +95,8 @@ public void materialize(final WindowCursor curs) throws IOException {
pack.saveCache(objectOffset, cachedBytes, objectType);
} catch (DataFormatException dfe) {
final CorruptObjectException coe;
- coe = new CorruptObjectException("Object at " + objectOffset
- + " in " + pack.getPackFile() + " has bad zlib stream");
+ coe = new CorruptObjectException(MessageFormat.format(JGitText.get().objectAtHasBadZlibStream,
+ objectOffset, pack.getPackFile()));
coe.initCause(dfe);
throw coe;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java
index 315c4670a..eb0091791 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileBasedConfig.java
@@ -52,7 +52,9 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils;
@@ -110,11 +112,11 @@ public void load() throws IOException, ConfigInvalidException {
} catch (FileNotFoundException noFile) {
clear();
} catch (IOException e) {
- final IOException e2 = new IOException("Cannot read " + getFile());
+ final IOException e2 = new IOException(MessageFormat.format(JGitText.get().cannotReadFile, getFile()));
e2.initCause(e);
throw e2;
} catch (ConfigInvalidException e) {
- throw new ConfigInvalidException("Cannot read " + getFile(), e);
+ throw new ConfigInvalidException(MessageFormat.format(JGitText.get().cannotReadFile, getFile()), e);
}
}
@@ -134,12 +136,12 @@ public void save() throws IOException {
final byte[] out = Constants.encode(toText());
final LockFile lf = new LockFile(getFile());
if (!lf.lock())
- throw new IOException("Cannot lock " + getFile());
+ throw new IOException(MessageFormat.format(JGitText.get().cannotLockFile, getFile()));
try {
lf.setNeedStatInformation(true);
lf.write(out);
if (!lf.commit())
- throw new IOException("Cannot commit write to " + getFile());
+ throw new IOException(MessageFormat.format(JGitText.get().cannotCommitWriteTo, getFile()));
} finally {
lf.unlock();
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java
index bba18408c..0203d5d44 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java
@@ -59,6 +59,7 @@
import java.nio.ByteOrder;
import java.nio.channels.FileChannel;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.Comparator;
import java.util.Date;
import java.util.Iterator;
@@ -66,6 +67,7 @@
import java.util.Stack;
import java.util.TreeMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.NotSupportedException;
@@ -238,7 +240,8 @@ public void read() throws IOException {
buffer.order(ByteOrder.BIG_ENDIAN);
int j = channel.read(buffer);
if (j != buffer.capacity())
- throw new IOException("Could not read index in one go, only "+j+" out of "+buffer.capacity()+" read");
+ throw new IOException(MessageFormat.format(JGitText.get().couldNotReadIndexInOneGo
+ , j, buffer.capacity()));
buffer.flip();
header = new Header(buffer);
entries.clear();
@@ -266,7 +269,7 @@ public void write() throws IOException {
File tmpIndex = new File(cacheFile.getAbsoluteFile() + ".tmp");
File lock = new File(cacheFile.getAbsoluteFile() + ".lock");
if (!lock.createNewFile())
- throw new IOException("Index file is in use");
+ throw new IOException(JGitText.get().indexFileIsInUse);
try {
FileOutputStream fileOutputStream = new FileOutputStream(tmpIndex);
FileChannel fc = fileOutputStream.getChannel();
@@ -298,10 +301,10 @@ public void write() throws IOException {
if (cacheFile.exists())
if (!cacheFile.delete())
throw new IOException(
- "Could not rename delete old index");
+ JGitText.get().couldNotRenameDeleteOldIndex);
if (!tmpIndex.renameTo(cacheFile))
throw new IOException(
- "Could not rename temporary index file to index");
+ JGitText.get().couldNotRenameTemporaryIndexFileToIndex);
changed = false;
statDirty = false;
lastCacheTime = cacheFile.lastModified();
@@ -309,10 +312,10 @@ public void write() throws IOException {
} finally {
if (!lock.delete())
throw new IOException(
- "Could not delete lock file. Should not happen");
+ JGitText.get().couldNotDeleteLockFileShouldNotHappen);
if (tmpIndex.exists() && !tmpIndex.delete())
throw new IOException(
- "Could not delete temporary index file. Should not happen");
+ JGitText.get().couldNotDeleteTemporaryIndexFileShouldNotHappen);
}
}
@@ -320,7 +323,7 @@ private void checkWriteOk() throws IOException {
for (Iterator i = entries.values().iterator(); i.hasNext();) {
Entry e = (Entry) i.next();
if (e.getStage() != 0) {
- throw new NotSupportedException("Cannot work with other stages than zero right now. Won't write corrupt index.");
+ throw new NotSupportedException(JGitText.get().cannotWorkWithOtherStagesThanZeroRightNow);
}
}
}
@@ -339,7 +342,7 @@ static boolean File_hasExecute() {
static byte[] makeKey(File wd, File f) {
if (!f.getPath().startsWith(wd.getPath()))
- throw new Error("Path is not in working dir");
+ throw new Error(JGitText.get().pathIsNotInWorkingDir);
String relName = Repository.stripWorkDir(wd, f);
return Constants.encode(relName);
}
@@ -608,7 +611,8 @@ public boolean isModified(File wd, boolean forceContentCheck) {
if (!file.isDirectory())
return true;
} else {
- System.out.println("Does not handle mode "+mode+" ("+file+")");
+ System.out.println(MessageFormat.format(JGitText.get().doesNotHandleMode
+ , mode, file));
return true;
}
}
@@ -781,11 +785,11 @@ private void read(ByteBuffer buf) throws CorruptObjectException {
version = buf.getInt();
entries = buf.getInt();
if (signature != 0x44495243)
- throw new CorruptObjectException("Index signature is invalid: "
- + signature);
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().indexSignatureIsInvalid, signature));
if (version != 2)
- throw new CorruptObjectException(
- "Unknown index version (or corrupt index):" + version);
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().unknownIndexVersionOrCorruptIndex, version));
}
void write(ByteBuffer buf) {
@@ -877,7 +881,7 @@ public void checkoutEntry(File wd, Entry e) throws IOException {
ByteBuffer buffer = ByteBuffer.wrap(bytes);
int j = channel.write(buffer);
if (j != bytes.length)
- throw new IOException("Could not write file " + file);
+ throw new IOException(MessageFormat.format(JGitText.get().couldNotWriteFile, file));
channel.close();
if (config_filemode() && File_hasExecute()) {
if (FileMode.EXECUTABLE_FILE.equals(e.mode)) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java
index b1ee94eff..12f9af727 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexTreeWalker.java
@@ -48,6 +48,7 @@
import java.io.File;
import java.io.IOException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.GitIndex.Entry;
/**
@@ -143,8 +144,8 @@ private void walk(Tree tree, Tree auxTree) throws IOException {
private void visitEntry(TreeEntry t1, TreeEntry t2,
Entry i) throws IOException {
- assert t1 != null || t2 != null || i != null : "Needs at least one entry";
- assert root != null : "Needs workdir";
+ assert t1 != null || t2 != null || i != null : JGitText.get().needsAtLeastOneEntry;
+ assert root != null : JGitText.get().needsWorkdir;
if (t1 != null && t1.getParent() == null)
t1 = null;
@@ -169,8 +170,8 @@ else if (t2 != null)
private void finishVisitTree(TreeEntry t1, TreeEntry t2, int curIndexPos)
throws IOException {
- assert t1 != null || t2 != null : "Needs at least one entry";
- assert root != null : "Needs workdir";
+ assert t1 != null || t2 != null : JGitText.get().needsAtLeastOneEntry;
+ assert root != null : JGitText.get().needsWorkdir;
if (t1 != null && t1.getParent() == null)
t1 = null;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
index bd773c470..13f158ded 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
@@ -54,6 +54,9 @@
import java.io.OutputStream;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Git style file locking and replacement.
@@ -330,7 +333,7 @@ public void close() throws IOException {
private void requireLock() {
if (os == null) {
unlock();
- throw new IllegalStateException("Lock on " + ref + " not held.");
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().lockOnNotHeld, ref));
}
}
@@ -382,7 +385,7 @@ public void waitForStatChange() throws InterruptedException {
public boolean commit() {
if (os != null) {
unlock();
- throw new IllegalStateException("Lock on " + ref + " not closed.");
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().lockOnNotClosed, ref));
}
saveStatInformation();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java
index a6680d055..2e0e0118f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java
@@ -46,6 +46,9 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.InvalidObjectIdException;
import org.eclipse.jgit.util.NB;
import org.eclipse.jgit.util.RawParseUtils;
@@ -162,7 +165,8 @@ public void fromString(final byte[] buf, final int offset) {
*/
public void fromString(final String str) {
if (str.length() != Constants.OBJECT_ID_STRING_LENGTH)
- throw new IllegalArgumentException("Invalid id: " + str);
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().invalidId, str));
fromHexString(Constants.encodeASCII(str), 0);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
index 5906802d1..f32ae5951 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
@@ -48,6 +48,9 @@
import static org.eclipse.jgit.util.RawParseUtils.nextLF;
import static org.eclipse.jgit.util.RawParseUtils.parseBase10;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.util.MutableInteger;
@@ -123,7 +126,8 @@ public void check(final int objType, final byte[] raw)
checkBlob(raw);
break;
default:
- throw new CorruptObjectException("Invalid object type: " + objType);
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().corruptObjectInvalidType2, objType));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDirectory.java
index 024bd15b0..06700ebe1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDirectory.java
@@ -48,6 +48,7 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -59,6 +60,7 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.PackMismatchException;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.util.FS;
@@ -175,13 +177,13 @@ public void openPack(final File pack, final File idx) throws IOException {
final String i = idx.getName();
if (p.length() != 50 || !p.startsWith("pack-") || !p.endsWith(".pack"))
- throw new IOException("Not a valid pack " + pack);
+ throw new IOException(MessageFormat.format(JGitText.get().notAValidPack, pack));
if (i.length() != 49 || !i.startsWith("pack-") || !i.endsWith(".idx"))
- throw new IOException("Not a valid pack " + idx);
+ throw new IOException(MessageFormat.format(JGitText.get().notAValidPack, idx));
if (!p.substring(0, 45).equals(i.substring(0, 45)))
- throw new IOException("Pack " + pack + "does not match index");
+ throw new IOException(MessageFormat.format(JGitText.get().packDoesNotMatchIndex, pack));
insertPack(new PackFile(idx, pack));
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectWriter.java
index b75328330..ea57a0215 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectWriter.java
@@ -53,9 +53,11 @@
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ObjectWritingException;
/**
@@ -147,10 +149,8 @@ public ObjectId writeTree(final Tree t) throws IOException {
final ObjectId id = e.getId();
if (id == null)
- throw new ObjectWritingException("Object at path \""
- + e.getFullName() + "\" does not have an id assigned."
- + " All object ids must be assigned prior"
- + " to writing a tree.");
+ throw new ObjectWritingException(MessageFormat.format(
+ JGitText.get().objectAtPathDoesNotHaveId, e.getFullName()));
e.getMode().copyTo(o);
o.write(' ');
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java
index 63f516263..8f4e69163 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackFile.java
@@ -52,6 +52,7 @@
import java.io.RandomAccessFile;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel.MapMode;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
@@ -60,6 +61,7 @@
import java.util.zip.CheckedOutputStream;
import java.util.zip.DataFormatException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.PackInvalidException;
import org.eclipse.jgit.errors.PackMismatchException;
@@ -135,7 +137,7 @@ private synchronized PackIndex idx() throws IOException {
if (packChecksum == null)
packChecksum = idx.packChecksum;
else if (!Arrays.equals(packChecksum, idx.packChecksum))
- throw new PackMismatchException("Pack checksum mismatch");
+ throw new PackMismatchException(JGitText.get().packChecksumMismatch);
loadedIdx = idx;
} catch (IOException e) {
@@ -261,7 +263,7 @@ final byte[] decompress(final long position, final int totalSize,
final WindowCursor curs) throws DataFormatException, IOException {
final byte[] dstbuf = new byte[totalSize];
if (curs.inflate(this, position, dstbuf, 0) != totalSize)
- throw new EOFException("Short compressed stream at " + position);
+ throw new EOFException(MessageFormat.format(JGitText.get().shortCompressedStreamAt, position));
return dstbuf;
}
@@ -289,15 +291,15 @@ final void copyRawData(final PackedObjectLoader loader,
final ObjectId id = findObjectForOffset(objectOffset);
final long expected = idx.findCRC32(id);
if (computed != expected)
- throw new CorruptObjectException("Object at " + objectOffset
- + " in " + getPackFile() + " has bad zlib stream");
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().objectAtHasBadZlibStream, objectOffset, getPackFile()));
} else {
try {
curs.inflateVerify(this, dataOffset);
} catch (DataFormatException dfe) {
final CorruptObjectException coe;
- coe = new CorruptObjectException("Object at " + objectOffset
- + " in " + getPackFile() + " has bad zlib stream");
+ coe = new CorruptObjectException(MessageFormat.format(
+ JGitText.get().objectAtHasBadZlibStream, objectOffset, getPackFile()));
coe.initCause(dfe);
throw coe;
}
@@ -433,24 +435,23 @@ private void onOpenPack() throws IOException {
IO.readFully(fd.getChannel(), 0, buf, 0, 12);
if (RawParseUtils.match(buf, 0, Constants.PACK_SIGNATURE) != 4)
- throw new IOException("Not a PACK file.");
+ throw new IOException(JGitText.get().notAPACKFile);
final long vers = NB.decodeUInt32(buf, 4);
final long packCnt = NB.decodeUInt32(buf, 8);
if (vers != 2 && vers != 3)
- throw new IOException("Unsupported pack version " + vers + ".");
+ throw new IOException(MessageFormat.format(JGitText.get().unsupportedPackVersion, vers));
if (packCnt != idx.getObjectCount())
- throw new PackMismatchException("Pack object count mismatch:"
- + " pack " + packCnt
- + " index " + idx.getObjectCount()
- + ": " + getPackFile());
+ throw new PackMismatchException(MessageFormat.format(
+ JGitText.get().packObjectCountMismatch, packCnt, idx.getObjectCount(), getPackFile()));
IO.readFully(fd.getChannel(), length - 20, buf, 0, 20);
if (!Arrays.equals(buf, packChecksum))
- throw new PackMismatchException("Pack checksum mismatch:"
- + " pack " + ObjectId.fromRaw(buf).name()
- + " index " + ObjectId.fromRaw(idx.packChecksum).name()
- + ": " + getPackFile());
+ throw new PackMismatchException(MessageFormat.format(
+ JGitText.get().packObjectCountMismatch
+ , ObjectId.fromRaw(buf).name()
+ , ObjectId.fromRaw(idx.packChecksum).name()
+ , getPackFile()));
}
private PackedObjectLoader reader(final WindowCursor curs,
@@ -494,7 +495,7 @@ private PackedObjectLoader reader(final WindowCursor curs,
(int) dataSize, ObjectId.fromRaw(ib));
}
default:
- throw new IOException("Unknown object type " + typeCode + ".");
+ throw new IOException(MessageFormat.format(JGitText.get().unknownObjectType, typeCode));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java
index 2043145b8..25b4f569c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java
@@ -48,8 +48,10 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.Iterator;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.NB;
@@ -92,14 +94,14 @@ public static PackIndex open(final File idxFile) throws IOException {
case 2:
return new PackIndexV2(fd);
default:
- throw new IOException("Unsupported pack index version " + v);
+ throw new IOException(MessageFormat.format(JGitText.get().unsupportedPackIndexVersion, v));
}
}
return new PackIndexV1(fd, hdr);
} catch (IOException ioe) {
final String path = idxFile.getAbsolutePath();
final IOException err;
- err = new IOException("Unreadable pack index: " + path);
+ err = new IOException(MessageFormat.format(JGitText.get().unreadablePackIndex, path));
err.initCause(ioe);
throw err;
} finally {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexV2.java
index eb644c51c..128b2df8c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexV2.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexV2.java
@@ -49,6 +49,7 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.NB;
@@ -111,7 +112,7 @@ class PackIndexV2 extends PackIndex {
final long nameLen = bucketCnt * Constants.OBJECT_ID_LENGTH;
if (nameLen > Integer.MAX_VALUE)
- throw new IOException("Index file is too large for jgit");
+ throw new IOException(JGitText.get().indexFileIsTooLargeForJgit);
final int intNameLen = (int) nameLen;
final byte[] raw = new byte[intNameLen];
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriter.java
index 5fcf71a78..4d2714bc5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriter.java
@@ -48,8 +48,10 @@
import java.io.IOException;
import java.io.OutputStream;
import java.security.DigestOutputStream;
+import java.text.MessageFormat;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.transport.PackedObjectInfo;
import org.eclipse.jgit.util.NB;
@@ -131,8 +133,8 @@ public static PackIndexWriter createVersion(final OutputStream dst,
case 2:
return new PackIndexWriterV2(dst);
default:
- throw new IllegalArgumentException(
- "Unsupported pack index version " + version);
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().unsupportedPackIndexVersion, version));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriterV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriterV1.java
index b3be5480c..eb44b3a8c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriterV1.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndexWriterV1.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.transport.PackedObjectInfo;
import org.eclipse.jgit.util.NB;
@@ -73,7 +74,7 @@ protected void writeImpl() throws IOException {
for (final PackedObjectInfo oe : entries) {
if (!canStore(oe))
- throw new IOException("Pack too large for index version 1");
+ throw new IOException(JGitText.get().packTooLargeForIndexVersion1);
NB.encodeInt32(tmp, 0, (int) oe.getOffset());
oe.copyRawTo(tmp, 4);
out.write(tmp);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackReverseIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackReverseIndex.java
index c0ed7b29a..f4f57aed4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackReverseIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackReverseIndex.java
@@ -43,8 +43,10 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
import java.util.Arrays;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.lib.PackIndex.MutableEntry;
@@ -94,7 +96,7 @@ class PackReverseIndex {
if (n32 > Integer.MAX_VALUE || n64 > Integer.MAX_VALUE
|| cnt > 0xffffffffL)
throw new IllegalArgumentException(
- "Huge indexes are not supported by jgit, yet");
+ JGitText.get().hugeIndexesAreNotSupportedByJgitYet);
offsets32 = new int[(int) n32];
offsets64 = new long[(int) n64];
@@ -166,9 +168,9 @@ long findNextOffset(final long offset, final long maxOffset)
if (offset <= Integer.MAX_VALUE) {
final int i32 = Arrays.binarySearch(offsets32, (int) offset);
if (i32 < 0)
- throw new CorruptObjectException(
- "Can't find object in (reverse) pack index for the specified offset "
- + offset);
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().cantFindObjectInReversePackIndexForTheSpecifiedOffset
+ , offset));
if (i32 + 1 == offsets32.length) {
if (offsets64.length > 0)
@@ -179,9 +181,9 @@ long findNextOffset(final long offset, final long maxOffset)
} else {
final int i64 = Arrays.binarySearch(offsets64, offset);
if (i64 < 0)
- throw new CorruptObjectException(
- "Can't find object in (reverse) pack index for the specified offset "
- + offset);
+ throw new CorruptObjectException(MessageFormat.format(
+ JGitText.get().cantFindObjectInReversePackIndexForTheSpecifiedOffset
+ , offset));
if (i64 + 1 == offsets64.length)
return maxOffset;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackWriter.java
index 4a205fffb..48f41a558 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackWriter.java
@@ -54,6 +54,7 @@
import java.util.List;
import java.util.zip.Deflater;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.revwalk.ObjectWalk;
@@ -103,7 +104,7 @@ public class PackWriter {
*
* @see #preparePack(Collection, Collection)
*/
- public static final String COUNTING_OBJECTS_PROGRESS = "Counting objects";
+ public static final String COUNTING_OBJECTS_PROGRESS = JGitText.get().countingObjects;
/**
* Title of {@link ProgressMonitor} task used during searching for objects
@@ -111,7 +112,7 @@ public class PackWriter {
*
* @see #writePack(OutputStream)
*/
- public static final String SEARCHING_REUSE_PROGRESS = "Compressing objects";
+ public static final String SEARCHING_REUSE_PROGRESS = JGitText.get().compressingObjects;
/**
* Title of {@link ProgressMonitor} task used during writing out pack
@@ -119,7 +120,7 @@ public class PackWriter {
*
* @see #writePack(OutputStream)
*/
- public static final String WRITING_OBJECTS_PROGRESS = "Writing objects";
+ public static final String WRITING_OBJECTS_PROGRESS = JGitText.get().writingObjects;
/**
* Default value of deltas reuse option.
@@ -605,7 +606,7 @@ private void searchForReuse() throws IOException {
for (ObjectToPack otp : list) {
if (initMonitor.isCancelled())
throw new IOException(
- "Packing cancelled during objects writing");
+ JGitText.get().packingCancelledDuringObjectsWriting);
reuseLoaders.clear();
searchForReuse(reuseLoaders, otp);
initMonitor.update(1);
@@ -688,7 +689,7 @@ private void writeObjects() throws IOException {
for (ObjectToPack otp : list) {
if (writeMonitor.isCancelled())
throw new IOException(
- "Packing cancelled during objects writing");
+ JGitText.get().packingCancelledDuringObjectsWriting);
if (!otp.isWritten())
writeObject(otp);
}
@@ -727,7 +728,7 @@ private void writeObject(final ObjectToPack otp) throws IOException {
reuse.endCopyRawData();
}
} else if (otp.isDeltaRepresentation()) {
- throw new IOException("creating deltas is not implemented");
+ throw new IOException(JGitText.get().creatingDeltasIsNotImplemented);
} else {
writeWholeObjectDeflate(otp);
}
@@ -886,11 +887,11 @@ public void addObject(final RevObject object)
objectsLists[object.getType()].add(otp);
} catch (ArrayIndexOutOfBoundsException x) {
throw new IncorrectObjectTypeException(object,
- "COMMIT nor TREE nor BLOB nor TAG");
+ JGitText.get().incorrectObjectType_COMMITnorTREEnorBLOBnorTAG);
} catch (UnsupportedOperationException x) {
// index pointing to "dummy" empty list
throw new IncorrectObjectTypeException(object,
- "COMMIT nor TREE nor BLOB nor TAG");
+ JGitText.get().incorrectObjectType_COMMITnorTREEnorBLOBnorTAG);
}
objectsMap.add(otp);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java
index 0bc2e7a2d..522f8477b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java
@@ -45,11 +45,13 @@
package org.eclipse.jgit.lib;
+import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.util.SystemReader;
/**
@@ -197,13 +199,13 @@ public PersonIdent(final PersonIdent pi, final long aWhen, final int aTZ) {
public PersonIdent(final String in) {
final int lt = in.indexOf('<');
if (lt == -1) {
- throw new IllegalArgumentException("Malformed PersonIdent string"
- + " (no < was found): " + in);
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().malformedpersonIdentString, in));
}
final int gt = in.indexOf('>', lt);
if (gt == -1) {
- throw new IllegalArgumentException("Malformed PersonIdent string"
- + " (no > was found): " + in);
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().malformedpersonIdentString, in));
}
final int sp = in.indexOf(' ', gt + 2);
if (sp == -1) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDirectory.java
index faebbf67c..5ba186955 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDirectory.java
@@ -67,11 +67,13 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ObjectWritingException;
import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevTag;
@@ -493,7 +495,8 @@ void delete(RefDirectoryUpdate update) throws IOException {
if (packed.contains(name)) {
LockFile lck = new LockFile(packedRefsFile);
if (!lck.lock())
- throw new IOException("Cannot lock " + packedRefsFile);
+ throw new IOException(MessageFormat.format(
+ JGitText.get().cannotLockFile, packedRefsFile));
try {
PackedRefList cur = readPackedRefs(0, 0);
int idx = cur.find(name);
@@ -574,7 +577,7 @@ else if (log.isFile())
if (dir.exists())
throw err;
if (!dir.mkdirs() && !dir.isDirectory())
- throw new IOException("Cannot create directory " + dir);
+ throw new IOException(MessageFormat.format(JGitText.get().cannotCreateDirectory, dir));
out = new FileOutputStream(log, true);
}
try {
@@ -677,7 +680,7 @@ private RefList<Ref> parsePackedRefs(final BufferedReader br)
if (p.charAt(0) == '^') {
if (last == null)
- throw new IOException("Peeled line before ref.");
+ throw new IOException(JGitText.get().peeledLineBeforeRef);
ObjectId id = ObjectId.fromString(p.substring(1));
last = new ObjectIdRef.PeeledTag(PACKED, last.getName(), last
@@ -721,18 +724,16 @@ protected void writeFile(String name, byte[] content)
try {
lck.write(content);
} catch (IOException ioe) {
- throw new ObjectWritingException("Unable to write " + name,
- ioe);
+ throw new ObjectWritingException(MessageFormat.format(JGitText.get().unableToWrite, name), ioe);
}
try {
lck.waitForStatChange();
} catch (InterruptedException e) {
lck.unlock();
- throw new ObjectWritingException("Interrupted writing "
- + name);
+ throw new ObjectWritingException(MessageFormat.format(JGitText.get().interruptedWriting, name));
}
if (!lck.commit())
- throw new ObjectWritingException("Unable to write " + name);
+ throw new ObjectWritingException(MessageFormat.format(JGitText.get().unableToWrite, name));
packedRefs.compareAndSet(oldPackedList, new PackedRefList(refs,
content.length, lck.getCommitLastModified()));
@@ -795,7 +796,7 @@ private LooseRef scanRef(LooseRef ref, String name) throws IOException {
n--;
if (n < 6) {
String content = RawParseUtils.decode(buf, 0, n);
- throw new IOException("Not a ref: " + name + ": " + content);
+ throw new IOException(MessageFormat.format(JGitText.get().notARef, name, content));
}
final String target = RawParseUtils.decode(buf, 5, n);
return newSymbolicRef(modified, name, target);
@@ -811,7 +812,7 @@ private LooseRef scanRef(LooseRef ref, String name) throws IOException {
while (0 < n && Character.isWhitespace(buf[n - 1]))
n--;
String content = RawParseUtils.decode(buf, 0, n);
- throw new IOException("Not a ref: " + name + ": " + content);
+ throw new IOException(MessageFormat.format(JGitText.get().notARef, name, content));
}
return new LooseUnpeeled(modified, name, id);
}
@@ -889,7 +890,7 @@ static int levelsIn(final String name) {
static void delete(final File file, final int depth) throws IOException {
if (!file.delete() && file.isFile())
- throw new IOException("File cannot be deleted: " + file);
+ throw new IOException(MessageFormat.format(JGitText.get().fileCannotBeDeleted, file));
File dir = file.getParentFile();
for (int i = 0; i < depth; ++i) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
index 553266284..89f59150a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
@@ -45,7 +45,9 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
@@ -395,7 +397,7 @@ public Result getResult() {
private void requireCanDoUpdate() {
if (newValue == null)
- throw new IllegalStateException("A NewObjectId is required.");
+ throw new IllegalStateException(JGitText.get().aNewObjectIdIsRequired);
}
/**
@@ -524,7 +526,7 @@ Result execute(Result status) throws IOException {
*/
public Result link(String target) throws IOException {
if (!target.startsWith(Constants.R_REFS))
- throw new IllegalArgumentException("Not " + Constants.R_REFS);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().illegalArgumentNotA, Constants.R_REFS));
if (getRefDatabase().isNameConflicting(getName()))
return Result.LOCK_FAILURE;
try {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
index b394f34bb..4c5503f32 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
@@ -51,6 +51,7 @@
import java.util.Collections;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils;
@@ -75,24 +76,24 @@ static public class Entry {
pos += Constants.OBJECT_ID_STRING_LENGTH;
if (raw[pos++] != ' ')
throw new IllegalArgumentException(
- "Raw log message does not parse as log entry");
+ JGitText.get().rawLogMessageDoesNotParseAsLogEntry);
newId = ObjectId.fromString(raw, pos);
pos += Constants.OBJECT_ID_STRING_LENGTH;
if (raw[pos++] != ' ') {
throw new IllegalArgumentException(
- "Raw log message does not parse as log entry");
+ JGitText.get().rawLogMessageDoesNotParseAsLogEntry);
}
who = RawParseUtils.parsePersonIdentOnly(raw, pos);
int p0 = RawParseUtils.next(raw, pos, '\t'); // personident has no
// \t
if (p0 == -1) {
throw new IllegalArgumentException(
- "Raw log message does not parse as log entry");
+ JGitText.get().rawLogMessageDoesNotParseAsLogEntry);
}
int p1 = RawParseUtils.nextLF(raw, p0);
if (p1 == -1) {
throw new IllegalArgumentException(
- "Raw log message does not parse as log entry");
+ JGitText.get().rawLogMessageDoesNotParseAsLogEntry);
}
comment = RawParseUtils.decode(raw, p0, p1 - 1);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 9f4bb100f..e4d857bf8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -48,6 +48,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -61,6 +62,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.RevisionSyntaxException;
@@ -191,7 +193,7 @@ public Repository(final File d, final File workTree, final File objectDir,
if (d != null)
gitDir = d;
else
- throw new IllegalArgumentException("Either GIT_DIR or GIT_WORK_TREE must be passed to Repository constructor");
+ throw new IllegalArgumentException(JGitText.get().eitherGIT_DIRorGIT_WORK_TREEmustBePassed);
}
userConfig = SystemReader.getInstance().openUserConfig();
@@ -226,8 +228,8 @@ public Repository(final File d, final File workTree, final File objectDir,
final String repositoryFormatVersion = getConfig().getString(
"core", null, "repositoryFormatVersion");
if (!"0".equals(repositoryFormatVersion)) {
- throw new IOException("Unknown repository format \""
- + repositoryFormatVersion + "\"; expected \"0\".");
+ throw new IOException(MessageFormat.format(
+ JGitText.get().unknownRepositoryFormat2, repositoryFormatVersion));
}
}
}
@@ -236,9 +238,8 @@ private void loadUserConfig() throws IOException {
try {
userConfig.load();
} catch (ConfigInvalidException e1) {
- IOException e2 = new IOException("User config file "
- + userConfig.getFile().getAbsolutePath() + " invalid: "
- + e1);
+ IOException e2 = new IOException(MessageFormat.format(
+ JGitText.get().userConfigFileInvalid, userConfig.getFile().getAbsolutePath(), e1));
e2.initCause(e1);
throw e2;
}
@@ -248,7 +249,7 @@ private void loadConfig() throws IOException {
try {
config.load();
} catch (ConfigInvalidException e1) {
- IOException e2 = new IOException("Unknown repository format");
+ IOException e2 = new IOException(JGitText.get().unknownRepositoryFormat);
e2.initCause(e1);
throw e2;
}
@@ -279,8 +280,7 @@ public synchronized void create() throws IOException {
public void create(boolean bare) throws IOException {
final RepositoryConfig cfg = getConfig();
if (cfg.getFile().exists()) {
- throw new IllegalStateException("Repository already exists: "
- + gitDir);
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().repositoryAlreadyExists, gitDir));
}
gitDir.mkdirs();
refs.create();
@@ -506,7 +506,7 @@ public Object mapObject(final ObjectId id, final String refName) throws IOExcept
default:
throw new IncorrectObjectTypeException(id,
- "COMMIT nor TREE nor BLOB nor TAG");
+ JGitText.get().incorrectObjectType_COMMITnorTREEnorBLOBnorTAG);
}
}
@@ -727,7 +727,7 @@ public ObjectId resolve(final String revstr) throws IOException {
pnum = Integer.parseInt(parentnum);
} catch (NumberFormatException e) {
throw new RevisionSyntaxException(
- "Invalid commit parent number",
+ JGitText.get().invalidCommitParentNumber,
revstr);
}
if (pnum != 0) {
@@ -853,7 +853,7 @@ else if (item.equals("")) {
dist = Integer.parseInt(distnum);
} catch (NumberFormatException e) {
throw new RevisionSyntaxException(
- "Invalid ancestry length", revstr);
+ JGitText.get().invalidAncestryLength, revstr);
}
while (dist > 0) {
final ObjectId[] parents = ((Commit) ref).getParentIds();
@@ -877,7 +877,7 @@ else if (item.equals("")) {
}
}
if (time != null)
- throw new RevisionSyntaxException("reflogs not yet supported by revision parser", revstr);
+ throw new RevisionSyntaxException(JGitText.get().reflogsNotYetSupportedByRevisionParser, revstr);
i = m - 1;
break;
default:
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tag.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tag.java
index 35ccf773c..5b3531eb1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tag.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tag.java
@@ -48,7 +48,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.ObjectWritingException;
@@ -135,18 +137,18 @@ private void decode() {
new ByteArrayInputStream(raw)));
String n = br.readLine();
if (n == null || !n.startsWith("object ")) {
- throw new CorruptObjectException(tagId, "no object");
+ throw new CorruptObjectException(tagId, JGitText.get().corruptObjectNoObject);
}
objId = ObjectId.fromString(n.substring(7));
n = br.readLine();
if (n == null || !n.startsWith("type ")) {
- throw new CorruptObjectException(tagId, "no type");
+ throw new CorruptObjectException(tagId, JGitText.get().corruptObjectNoType);
}
type = n.substring("type ".length());
n = br.readLine();
if (n == null || !n.startsWith("tag ")) {
- throw new CorruptObjectException(tagId, "no tag name");
+ throw new CorruptObjectException(tagId, JGitText.get().corruptObjectNoTagName);
}
tag = n.substring("tag ".length());
n = br.readLine();
@@ -154,13 +156,13 @@ private void decode() {
// We should see a "tagger" header here, but some repos have tags
// without it.
if (n == null)
- throw new CorruptObjectException(tagId, "no tagger header");
+ throw new CorruptObjectException(tagId, JGitText.get().corruptObjectNoTaggerHeader);
if (n.length()>0)
if (n.startsWith("tagger "))
tagger = new PersonIdent(n.substring("tagger ".length()));
else
- throw new CorruptObjectException(tagId, "no tagger/bad header");
+ throw new CorruptObjectException(tagId, JGitText.get().corruptObjectNoTaggerBadHeader);
// Message should start with an empty line, but
StringBuilder tempMessage = new StringBuilder();
@@ -196,7 +198,7 @@ public void setMessage(final String m) {
*/
public void tag() throws IOException {
if (getTagId() != null)
- throw new IllegalStateException("exists " + getTagId());
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().illegalStateExists, getTagId()));
final ObjectId id;
final RefUpdate ru;
@@ -212,7 +214,7 @@ public void tag() throws IOException {
ru.setNewObjectId(id);
ru.setRefLogMessage("tagged " + getTag(), false);
if (ru.forceUpdate() == RefUpdate.Result.LOCK_FAILURE)
- throw new ObjectWritingException("Unable to lock tag " + getTag());
+ throw new ObjectWritingException(MessageFormat.format(JGitText.get().unableToLockTag, getTag()));
}
public String toString() {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java
index 61607cba9..2aa3098f1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Tree.java
@@ -46,7 +46,9 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.EntryExistsException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -245,7 +247,7 @@ public boolean isLoaded() {
*/
public void unload() {
if (isModified())
- throw new IllegalStateException("Cannot unload a modified tree.");
+ throw new IllegalStateException(JGitText.get().cannotUnloadAModifiedTree);
contents = null;
}
@@ -555,14 +557,14 @@ private void readTree(final byte[] raw) throws IOException {
while (rawPtr < rawSize) {
int c = raw[rawPtr++];
if (c < '0' || c > '7')
- throw new CorruptObjectException(getId(), "invalid entry mode");
+ throw new CorruptObjectException(getId(), JGitText.get().corruptObjectInvalidEntryMode);
int mode = c - '0';
for (;;) {
c = raw[rawPtr++];
if (' ' == c)
break;
else if (c < '0' || c > '7')
- throw new CorruptObjectException(getId(), "invalid mode");
+ throw new CorruptObjectException(getId(), JGitText.get().corruptObjectInvalidMode);
mode <<= 3;
mode += c - '0';
}
@@ -589,8 +591,8 @@ else if (FileMode.SYMLINK.equals(mode))
else if (FileMode.GITLINK.equals(mode))
ent = new GitlinkTreeEntry(this, id, name);
else
- throw new CorruptObjectException(getId(), "Invalid mode: "
- + Integer.toOctalString(mode));
+ throw new CorruptObjectException(getId(), MessageFormat.format(
+ JGitText.get().corruptObjectInvalidMode2, Integer.toOctalString(mode)));
temp[nextIndex++] = ent;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeIterator.java
index 937baf6cc..1f46c8f1b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeIterator.java
@@ -47,6 +47,8 @@
import java.io.IOException;
import java.util.Iterator;
+import org.eclipse.jgit.JGitText;
+
/**
* A tree iterator iterates over a tree and all its members recursing into
* subtrees according to order.
@@ -204,6 +206,6 @@ private boolean step() throws IOException {
public void remove() {
throw new IllegalStateException(
- "TreeIterator does not support remove()");
+ JGitText.get().treeIteratorDoesNotSupportRemove);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java
index 96a1f8024..cd2eb38ef 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UnpackedObjectLoader.java
@@ -50,6 +50,7 @@
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.MutableInteger;
@@ -118,25 +119,25 @@ private UnpackedObjectLoader(final byte[] compressed, final AnyObjectId id)
hdr.length - avail);
if (uncompressed == 0) {
throw new CorruptObjectException(id,
- "bad stream, corrupt header");
+ JGitText.get().corruptObjectBadStreamCorruptHeader);
}
avail += uncompressed;
} catch (DataFormatException dfe) {
final CorruptObjectException coe;
- coe = new CorruptObjectException(id, "bad stream");
+ coe = new CorruptObjectException(id, JGitText.get().corruptObjectBadStream);
coe.initCause(dfe);
throw coe;
}
if (avail < 5)
- throw new CorruptObjectException(id, "no header");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectNoHeader);
final MutableInteger p = new MutableInteger();
objectType = Constants.decodeTypeString(id, hdr, (byte) ' ', p);
objectSize = RawParseUtils.parseBase10(hdr, p.value, p);
if (objectSize < 0)
- throw new CorruptObjectException(id, "negative size");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectNegativeSize);
if (hdr[p.value++] != 0)
- throw new CorruptObjectException(id, "garbage after size");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectGarbageAfterSize);
bytes = new byte[objectSize];
if (p.value < avail)
System.arraycopy(hdr, p.value, bytes, 0, avail - p.value);
@@ -161,7 +162,7 @@ private UnpackedObjectLoader(final byte[] compressed, final AnyObjectId id)
objectType = typeCode;
break;
default:
- throw new CorruptObjectException(id, "invalid type");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectInvalidType);
}
objectSize = size;
@@ -182,17 +183,17 @@ private void decompress(final AnyObjectId id, final Inflater inf, int p)
p += uncompressed;
if (uncompressed == 0 && !inf.finished()) {
throw new CorruptObjectException(id,
- "bad stream, corrupt header");
+ JGitText.get().corruptObjectBadStreamCorruptHeader);
}
}
} catch (DataFormatException dfe) {
final CorruptObjectException coe;
- coe = new CorruptObjectException(id, "bad stream");
+ coe = new CorruptObjectException(id, JGitText.get().corruptObjectBadStream);
coe.initCause(dfe);
throw coe;
}
if (p != objectSize)
- throw new CorruptObjectException(id, "incorrect length");
+ throw new CorruptObjectException(id, JGitText.get().corruptObjectIncorrectLength);
}
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WholePackedObjectLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WholePackedObjectLoader.java
index 5005d37f1..fcfa57339 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WholePackedObjectLoader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WholePackedObjectLoader.java
@@ -46,8 +46,10 @@
package org.eclipse.jgit.lib;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.zip.DataFormatException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
/** Reader for a non-delta (just deflated) object in a pack file. */
@@ -84,8 +86,8 @@ public void materialize(final WindowCursor curs) throws IOException {
pack.saveCache(objectOffset, cachedBytes, objectType);
} catch (DataFormatException dfe) {
final CorruptObjectException coe;
- coe = new CorruptObjectException("Object at " + objectOffset
- + " in " + pack.getPackFile() + " has bad zlib stream");
+ coe = new CorruptObjectException(MessageFormat.format(JGitText.get().objectAtHasBadZlibStream,
+ objectOffset, pack.getPackFile()));
coe.initCause(dfe);
throw coe;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java
index b2c79c108..a44a30ee2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WindowCache.java
@@ -53,6 +53,8 @@
import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.concurrent.locks.ReentrantLock;
+import org.eclipse.jgit.JGitText;
+
/**
* Caches slices of a {@link PackFile} in memory for faster read access.
* <p>
@@ -121,9 +123,9 @@
public class WindowCache {
private static final int bits(int newSize) {
if (newSize < 4096)
- throw new IllegalArgumentException("Invalid window size");
+ throw new IllegalArgumentException(JGitText.get().invalidWindowSize);
if (Integer.bitCount(newSize) != 1)
- throw new IllegalArgumentException("Window size must be power of 2");
+ throw new IllegalArgumentException(JGitText.get().windowSizeMustBePowerOf2);
return Integer.numberOfTrailingZeros(newSize);
}
@@ -247,9 +249,9 @@ private WindowCache(final WindowCacheConfig cfg) {
tableSize = tableSize(cfg);
final int lockCount = lockCount(cfg);
if (tableSize < 1)
- throw new IllegalArgumentException("tSize must be >= 1");
+ throw new IllegalArgumentException(JGitText.get().tSizeMustBeGreaterOrEqual1);
if (lockCount < 1)
- throw new IllegalArgumentException("lockCount must be >= 1");
+ throw new IllegalArgumentException(JGitText.get().lockCountMustBeGreaterOrEqual1);
queue = new ReferenceQueue<ByteWindow>();
clock = new AtomicLong(1);
@@ -278,9 +280,9 @@ else if (eb < 4)
openBytes = new AtomicLong();
if (maxFiles < 1)
- throw new IllegalArgumentException("Open files must be >= 1");
+ throw new IllegalArgumentException(JGitText.get().openFilesMustBeAtLeast1);
if (maxBytes < windowSize)
- throw new IllegalArgumentException("Window size must be < limit");
+ throw new IllegalArgumentException(JGitText.get().windowSizeMustBeLesserThanLimit);
}
int getOpenFiles() {
@@ -343,9 +345,9 @@ private static int tableSize(final WindowCacheConfig cfg) {
final int wsz = cfg.getPackedGitWindowSize();
final long limit = cfg.getPackedGitLimit();
if (wsz <= 0)
- throw new IllegalArgumentException("Invalid window size");
+ throw new IllegalArgumentException(JGitText.get().invalidWindowSize);
if (limit < wsz)
- throw new IllegalArgumentException("Window size must be < limit");
+ throw new IllegalArgumentException(JGitText.get().windowSizeMustBeLesserThanLimit);
return (int) Math.min(5 * (limit / wsz) / 2, 2000000000);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java
index 76585add1..ee7820286 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java
@@ -49,9 +49,11 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CheckoutConflictException;
import org.eclipse.jgit.lib.GitIndex.Entry;
@@ -189,7 +191,7 @@ private void cleanUpConflicts() throws CheckoutConflictException {
for (String c : conflicts) {
File conflict = new File(root, c);
if (!conflict.delete())
- throw new CheckoutConflictException("Cannot delete file: " + c);
+ throw new CheckoutConflictException(MessageFormat.format(JGitText.get().cannotDeleteFile, c));
removeEmptyParents(conflict);
}
for (String r : removed) {
@@ -263,7 +265,7 @@ void prescanTwoTrees() throws IOException {
public void visitEntry(TreeEntry treeEntry, TreeEntry auxEntry,
Entry indexEntry, File file) throws IOException {
if (treeEntry instanceof Tree || auxEntry instanceof Tree) {
- throw new IllegalArgumentException("Can't pass me a tree!");
+ throw new IllegalArgumentException(JGitText.get().cantPassMeATree);
}
processEntry(treeEntry, auxEntry, indexEntry);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WriteTree.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WriteTree.java
index 5bb4e535e..bb97ccced 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/WriteTree.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/WriteTree.java
@@ -47,7 +47,9 @@
import java.io.File;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.GitlinksNotSupportedException;
import org.eclipse.jgit.errors.SymlinksNotSupportedException;
@@ -75,10 +77,8 @@ public void visitFile(final FileTreeEntry f) throws IOException {
public void visitSymlink(final SymlinkTreeEntry s) throws IOException {
if (s.isModified()) {
- throw new SymlinksNotSupportedException("Symlink \""
- + s.getFullName()
- + "\" cannot be written as the link target"
- + " cannot be read from within Java.");
+ throw new SymlinksNotSupportedException(MessageFormat.format(
+ JGitText.get().symlinkCannotBeWrittenAsTheLinkTarget, s.getFullName()));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
index e7d84c68a..d678f7c0f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
@@ -44,8 +44,10 @@
package org.eclipse.jgit.merge;
+import java.text.MessageFormat;
import java.util.HashMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Repository;
/**
@@ -97,8 +99,7 @@ public static void register(final MergeStrategy imp) {
public static synchronized void register(final String name,
final MergeStrategy imp) {
if (STRATEGIES.containsKey(name))
- throw new IllegalArgumentException("Merge strategy \"" + name
- + "\" already exists as a default strategy");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().mergeStrategyAlreadyExistsAsDefault, name));
STRATEGIES.put(name, imp);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
index 275a6d68f..38af20fb8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.merge;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
@@ -180,10 +182,9 @@ protected AbstractTreeIterator mergeBase(final int aIdx, final int bIdx)
return new EmptyTreeIterator();
final RevCommit base2 = walk.next();
if (base2 != null) {
- throw new IOException("Multiple merge bases for:" + "\n "
- + sourceCommits[aIdx].name() + "\n "
- + sourceCommits[bIdx].name() + "found:" + "\n "
- + base.name() + "\n " + base2.name());
+ throw new IOException(MessageFormat.format(JGitText.get().multipleMergeBasesFor
+ , sourceCommits[aIdx].name(), sourceCommits[bIdx].name()
+ , base.name(), base2.name()));
}
return openTree(base.getTree());
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java b/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java
index f2e379e13..6f81af845 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java
@@ -68,7 +68,8 @@
* </pre>
*/
public class NLS {
- static final Locale ROOT_LOCALE = new Locale("", "", "");
+ /** The root locale constant. It is defined here because the Locale.ROOT is not defined in Java 5 */
+ public static final Locale ROOT_LOCALE = new Locale("", "", "");
private static final InheritableThreadLocal<NLS> local = new InheritableThreadLocal<NLS>() {
protected NLS initialValue() {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java b/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java
index c908aa055..2c745e1f3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java
@@ -99,7 +99,7 @@
* {@link ResourceBundle#getBundle(String, Locale)} method to load a resource
* bundle. See the documentation of this method for a detailed explanation of
* resource bundle loading strategy. After a bundle is created the
- * {@link #getEffectiveLocale()} method can be used to determine whether the
+ * {@link #effectiveLocale()} method can be used to determine whether the
* bundle really corresponds to the requested locale or is a fallback.
*
* <p>
@@ -122,15 +122,23 @@
public abstract class TranslationBundle {
private Locale effectiveLocale;
+ private ResourceBundle resourceBundle;
/**
* @return the locale locale used for loading the resource bundle from which
* the field values were taken
*/
- public Locale getEffectiveLocale() {
+ public Locale effectiveLocale() {
return effectiveLocale;
}
+ /**
+ * @return the resource bundle on which this translation bundle is based
+ */
+ public ResourceBundle resourceBundle() {
+ return resourceBundle;
+ }
+
/**
* Injects locale specific text in all instance fields of this instance.
* Only public instance fields of type <code>String</code> are considered.
@@ -150,18 +158,17 @@ public Locale getEffectiveLocale() {
*/
void load(Locale locale) throws TranslationBundleLoadingException {
Class bundleClass = getClass();
- ResourceBundle bundle;
try {
- bundle = ResourceBundle.getBundle(bundleClass.getName(), locale);
+ resourceBundle = ResourceBundle.getBundle(bundleClass.getName(), locale);
} catch (MissingResourceException e) {
throw new TranslationBundleLoadingException(bundleClass, locale, e);
}
- this.effectiveLocale = bundle.getLocale();
+ this.effectiveLocale = resourceBundle.getLocale();
for (Field field : bundleClass.getFields()) {
if (field.getType().equals(String.class)) {
try {
- String translatedText = bundle.getString(field.getName());
+ String translatedText = resourceBundle.getString(field.getName());
field.set(this, translatedText);
} catch (MissingResourceException e) {
throw new TranslationStringMissingException(bundleClass, locale, field.getName(), e);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java
index 781190539..042c77851 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java
@@ -48,7 +48,9 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AbbreviatedObjectId;
import org.eclipse.jgit.util.MutableInteger;
@@ -183,16 +185,14 @@ int parseBody(final Patch script, final int end) {
final int cmp = o.nContext + o.nDeleted;
if (cmp < o.lineCount) {
final int missingCnt = o.lineCount - cmp;
- script.error(buf, startOffset, "Truncated hunk, at least "
- + missingCnt + " lines is missing for ancestor "
- + (ancestor + 1));
+ script.error(buf, startOffset, MessageFormat.format(
+ JGitText.get().truncatedHunkLinesMissingForAncestor, missingCnt, (ancestor + 1)));
}
}
if (nContext + nAdded < newLineCount) {
final int missingCount = newLineCount - (nContext + nAdded);
- script.error(buf, startOffset, "Truncated hunk, at least "
- + missingCount + " new lines is missing");
+ script.error(buf, startOffset, MessageFormat.format(JGitText.get().truncatedHunkNewLinesMissing, missingCount));
}
return c;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
index c35b613a2..25dc72af2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/FileHeader.java
@@ -54,10 +54,12 @@
import java.io.IOException;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.diff.EditList;
import org.eclipse.jgit.lib.AbbreviatedObjectId;
import org.eclipse.jgit.lib.Constants;
@@ -241,8 +243,7 @@ String getScriptText(Charset[] charsetGuess) {
}
if (charsetGuess != null && charsetGuess.length != getParentCount() + 1)
- throw new IllegalArgumentException("Expected "
- + (getParentCount() + 1) + " character encoding guesses");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().expectedCharacterEncodingGuesses, (getParentCount() + 1)));
if (trySimpleConversion(charsetGuess)) {
Charset cs = charsetGuess != null ? charsetGuess[0] : null;
@@ -302,7 +303,7 @@ private String[] extractFileLines(final Charset[] csGuess) {
}
return r;
} catch (IOException ioe) {
- throw new RuntimeException("Cannot convert script to text", ioe);
+ throw new RuntimeException(JGitText.get().cannotConvertScriptToText, ioe);
} finally {
for (final TemporaryBuffer b : tmp) {
if (b != null)
@@ -410,7 +411,7 @@ public List<? extends HunkHeader> getHunks() {
void addHunk(final HunkHeader h) {
if (h.getFileHeader() != this)
- throw new IllegalArgumentException("Hunk belongs to another file");
+ throw new IllegalArgumentException(JGitText.get().hunkBelongsToAnotherFile);
if (hunks == null)
hunks = new ArrayList<HunkHeader>();
hunks.add(h);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/HunkHeader.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/HunkHeader.java
index 9d78d0b99..bfb20b64e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/HunkHeader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/HunkHeader.java
@@ -49,7 +49,9 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.diff.EditList;
import org.eclipse.jgit.lib.AbbreviatedObjectId;
@@ -278,21 +280,21 @@ && match(buf, last, Patch.SIG_FOOTER) >= 0) {
if (nContext + old.nDeleted < old.lineCount) {
final int missingCount = old.lineCount - (nContext + old.nDeleted);
- script.error(buf, startOffset, "Truncated hunk, at least "
- + missingCount + " old lines is missing");
+ script.error(buf, startOffset, MessageFormat.format(
+ JGitText.get().truncatedHunkOldLinesMissing, missingCount));
} else if (nContext + old.nAdded < newLineCount) {
final int missingCount = newLineCount - (nContext + old.nAdded);
- script.error(buf, startOffset, "Truncated hunk, at least "
- + missingCount + " new lines is missing");
+ script.error(buf, startOffset, MessageFormat.format(
+ JGitText.get().truncatedHunkNewLinesMissing, missingCount));
} else if (nContext + old.nDeleted > old.lineCount
|| nContext + old.nAdded > newLineCount) {
final String oldcnt = old.lineCount + ":" + newLineCount;
final String newcnt = (nContext + old.nDeleted) + ":"
+ (nContext + old.nAdded);
- script.warn(buf, startOffset, "Hunk header " + oldcnt
- + " does not match body line count of " + newcnt);
+ script.warn(buf, startOffset, MessageFormat.format(
+ JGitText.get().hunkHeaderDoesNotMatchBodyLineCountOf, oldcnt, newcnt));
}
return c;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/Patch.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/Patch.java
index eff5303dc..ce006dadb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/Patch.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/Patch.java
@@ -55,6 +55,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.util.TemporaryBuffer;
/** A parsed collection of {@link FileHeader}s from a unified diff patch file */
@@ -175,7 +176,7 @@ private int parseFile(final byte[] buf, int c, final int end) {
// have missed a file header previously. The hunk
// isn't valid without knowing where it comes from.
//
- error(buf, c, "Hunk disconnected from file");
+ error(buf, c, JGitText.get().hunkDisconnectedFromFile);
c = nextLF(buf, c);
continue;
}
@@ -300,7 +301,7 @@ private int parseHunks(final FileHeader fh, int c, final int end) {
break;
default:
if (match(buf, c, SIG_FOOTER) < 0)
- warn(buf, c, "Unexpected hunk trailer");
+ warn(buf, c, JGitText.get().unexpectedHunkTrailer);
}
}
continue;
@@ -345,7 +346,7 @@ private int parseGitBinary(final FileHeader fh, int c, final int end) {
if (nEnd < 0) {
// Not a binary hunk.
//
- error(fh.buf, c, "Missing forward-image in GIT binary patch");
+ error(fh.buf, c, JGitText.get().missingForwardImageInGITBinaryPatch);
return c;
}
c = nEnd;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
index 8f6d083a3..61eed3fa9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
@@ -43,10 +43,12 @@
package org.eclipse.jgit.revplot;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashSet;
import java.util.TreeSet;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.revwalk.RevCommitList;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -83,7 +85,7 @@ public void clear() {
@Override
public void source(final RevWalk w) {
if (!(w instanceof PlotWalk))
- throw new ClassCastException("Not a " + PlotWalk.class.getName());
+ throw new ClassCastException(MessageFormat.format(JGitText.get().classCastNotA, PlotWalk.class.getName()));
super.source(w);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java
index 66756ae99..6b4ed80e1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java
@@ -51,6 +51,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Commit;
import org.eclipse.jgit.lib.Ref;
@@ -86,7 +87,7 @@ public PlotWalk(final Repository repo) {
@Override
public void sort(final RevSort s, final boolean use) {
if (s == RevSort.TOPO && !use)
- throw new IllegalArgumentException("Topological sort required.");
+ throw new IllegalArgumentException(JGitText.get().topologicalSortRequired);
super.sort(s, use);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
index 2f01f541d..edb883714 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.revwalk;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -118,7 +120,7 @@ private void add(final RevCommit c) {
// commit admitted to the initial queue only once. If
// we see this marks aren't correctly erased.
//
- throw new IllegalStateException("Stale RevFlags on " + c.name());
+ throw new IllegalStateException(MessageFormat.format(JGitText.get().staleRevFlagsOn, c.name()));
}
c.flags |= flag;
pending.add(c);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
index ddf40ac10..11d40012c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.revwalk;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -273,10 +275,8 @@ public RevObject nextObject() throws MissingObjectException,
if (FileMode.GITLINK.equals(mode))
break;
treeWalk.getEntryObjectId(idBuffer);
- throw new CorruptObjectException("Invalid mode " + mode
- + " for " + idBuffer.name() + " '"
- + treeWalk.getEntryPathString() + "' in "
- + currentTree.name() + ".");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().corruptObjectInvalidMode3
+ , mode , idBuffer.name() , treeWalk.getEntryPathString() , currentTree.name()));
}
treeWalk = treeWalk.next();
@@ -428,9 +428,8 @@ private void markTreeUninteresting(final RevTree tree)
if (FileMode.GITLINK.equals(mode))
break;
treeWalk.getEntryObjectId(idBuffer);
- throw new CorruptObjectException("Invalid mode " + mode
- + " for " + idBuffer.name() + " "
- + treeWalk.getEntryPathString() + " in " + tree + ".");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().corruptObjectInvalidMode3
+ , mode , idBuffer.name() , treeWalk.getEntryPathString() , tree));
}
treeWalk = treeWalk.next();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java
index 83f57d266..e09fae43a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java
@@ -43,6 +43,10 @@
package org.eclipse.jgit.revwalk;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
+
/**
* Application level mark bit for {@link RevObject}s.
* <p>
@@ -94,8 +98,8 @@ static class StaticRevFlag extends RevFlag {
@Override
public RevWalk getRevWalk() {
- throw new UnsupportedOperationException(toString()
- + " is a static flag and has no RevWalk instance");
+ throw new UnsupportedOperationException(MessageFormat.format(
+ JGitText.get().isAStaticFlagAndHasNorevWalkInstance, toString()));
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
index 0454b6ea7..5f8f41956 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObjectList.java
@@ -45,8 +45,11 @@
package org.eclipse.jgit.revwalk;
+import java.text.MessageFormat;
import java.util.AbstractList;
+import org.eclipse.jgit.JGitText;
+
/**
* An ordered list of {@link RevObject} subclasses.
*
@@ -77,7 +80,7 @@ public RevObjectList() {
public void add(final int index, final E element) {
if (index != size)
- throw new UnsupportedOperationException("Not add-at-end: " + index);
+ throw new UnsupportedOperationException(MessageFormat.format(JGitText.get().unsupportedOperationNotAddAtEnd, index));
set(index, element);
size++;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
index 4c43aa14e..94e11752c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
@@ -45,11 +45,13 @@
package org.eclipse.jgit.revwalk;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.Iterator;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.RevWalkException;
@@ -630,7 +632,7 @@ public RevObject lookupAny(final AnyObjectId id, final int type) {
r = new RevTag(id);
break;
default:
- throw new IllegalArgumentException("invalid git type: " + type);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidGitType, type));
}
objects.add(r);
}
@@ -755,7 +757,7 @@ public RevObject parseAny(final AnyObjectId id)
break;
}
default:
- throw new IllegalArgumentException("Bad object type: " + type);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().badObjectType, type));
}
objects.add(r);
} else
@@ -820,8 +822,8 @@ public RevFlag newFlag(final String name) {
int allocFlag() {
if (freeFlags == 0)
- throw new IllegalArgumentException(32 - RESERVED_FLAGS
- + " flags already created.");
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().flagsAlreadyCreated, 32 - RESERVED_FLAGS));
final int m = Integer.lowestOneBit(freeFlags);
freeFlags &= ~m;
return m;
@@ -838,9 +840,9 @@ int allocFlag() {
*/
public void carry(final RevFlag flag) {
if ((freeFlags & flag.mask) != 0)
- throw new IllegalArgumentException(flag.name + " is disposed.");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().flagIsDisposed, flag.name));
if (flag.walker != this)
- throw new IllegalArgumentException(flag.name + " not from this.");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().flagNotFromThis, flag.name));
carryFlags |= flag.mask;
}
@@ -1059,7 +1061,7 @@ public void remove() {
protected void assertNotStarted() {
if (isNotStarted())
return;
- throw new IllegalStateException("Output has already been started.");
+ throw new IllegalStateException(JGitText.get().outputHasAlreadyBeenStarted);
}
private boolean isNotStarted() {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
index c5353fe8c..5e778a416 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
@@ -46,7 +46,9 @@
package org.eclipse.jgit.revwalk;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.revwalk.filter.AndRevFilter;
@@ -88,8 +90,8 @@ RevCommit next() throws MissingObjectException,
// use the bulk of the generator pipeline.
//
if (tf != TreeFilter.ALL)
- throw new IllegalStateException("Cannot combine TreeFilter "
- + tf + " with RevFilter " + rf + ".");
+ throw new IllegalStateException(MessageFormat.format(
+ JGitText.get().cannotCombineTreeFilterWithRevFilter, tf, rf));
final MergeBaseGenerator mbg = new MergeBaseGenerator(w);
walker.pending = mbg;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AndRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
index 112f07aed..d4790f870 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.util.Collection;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -90,7 +91,7 @@ public static RevFilter create(final RevFilter[] list) {
if (list.length == 2)
return create(list[0], list[1]);
if (list.length < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final RevFilter[] subfilters = new RevFilter[list.length];
System.arraycopy(list, 0, subfilters, 0, list.length);
return new List(subfilters);
@@ -106,7 +107,7 @@ public static RevFilter create(final RevFilter[] list) {
*/
public static RevFilter create(final Collection<RevFilter> list) {
if (list.size() < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final RevFilter[] subfilters = new RevFilter[list.size()];
list.toArray(subfilters);
if (subfilters.length == 2)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
index 2ede91b57..3f88c7b8c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
@@ -45,6 +45,7 @@
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.util.RawCharSequence;
import org.eclipse.jgit.util.RawParseUtils;
@@ -68,7 +69,7 @@ public class AuthorRevFilter {
*/
public static RevFilter create(String pattern) {
if (pattern.length() == 0)
- throw new IllegalArgumentException("Cannot match on empty string.");
+ throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);
if (SubStringRevFilter.safe(pattern))
return new SubStringSearch(pattern);
return new PatternSearch(pattern);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
index 59c3e080d..e607f4f92 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
@@ -45,6 +45,7 @@
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.util.RawCharSequence;
import org.eclipse.jgit.util.RawParseUtils;
@@ -68,7 +69,7 @@ public class CommitterRevFilter {
*/
public static RevFilter create(String pattern) {
if (pattern.length() == 0)
- throw new IllegalArgumentException("Cannot match on empty string.");
+ throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);
if (SubStringRevFilter.safe(pattern))
return new SubStringSearch(pattern);
return new PatternSearch(pattern);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
index 6ab3b1d3b..e40fb0183 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
@@ -45,6 +45,7 @@
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.util.RawCharSequence;
import org.eclipse.jgit.util.RawParseUtils;
@@ -68,7 +69,7 @@ public class MessageRevFilter {
*/
public static RevFilter create(String pattern) {
if (pattern.length() == 0)
- throw new IllegalArgumentException("Cannot match on empty string.");
+ throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);
if (SubStringRevFilter.safe(pattern))
return new SubStringSearch(pattern);
return new PatternSearch(pattern);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
index bd1314a93..586c138ff 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.util.Collection;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -88,7 +89,7 @@ public static RevFilter create(final RevFilter[] list) {
if (list.length == 2)
return create(list[0], list[1]);
if (list.length < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final RevFilter[] subfilters = new RevFilter[list.length];
System.arraycopy(list, 0, subfilters, 0, list.length);
return new List(subfilters);
@@ -104,7 +105,7 @@ public static RevFilter create(final RevFilter[] list) {
*/
public static RevFilter create(final Collection<RevFilter> list) {
if (list.size() < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final RevFilter[] subfilters = new RevFilter[list.size()];
list.toArray(subfilters);
if (subfilters.length == 2)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
index 5f2bcf26a..c2a287958 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
@@ -48,6 +48,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.Constants;
@@ -101,7 +102,7 @@ protected static final String forceToRaw(final String patternText) {
protected PatternMatchRevFilter(String pattern, final boolean innerString,
final boolean rawEncoding, final int flags) {
if (pattern.length() == 0)
- throw new IllegalArgumentException("Cannot match on empty string.");
+ throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);
patternText = pattern;
if (innerString) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFilter.java
index 2d67d9763..378c90699 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFilter.java
@@ -45,6 +45,7 @@
import java.io.IOException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.StopWalkException;
@@ -157,7 +158,7 @@ public String toString() {
public static final RevFilter MERGE_BASE = new RevFilter() {
@Override
public boolean include(final RevWalk walker, final RevCommit c) {
- throw new UnsupportedOperationException("Cannot be combined.");
+ throw new UnsupportedOperationException(JGitText.get().cannotBeCombined);
}
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
index c5d6db7e3..0430b5fdc 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
@@ -60,6 +60,7 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
+import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -78,6 +79,7 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ProgressMonitor;
@@ -158,7 +160,7 @@ private static MessageDigest newMD5() {
try {
return MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("JRE lacks MD5 implementation", e);
+ throw new RuntimeException(JGitText.get().JRELacksMD5Implementation, e);
}
}
@@ -211,11 +213,11 @@ private static MessageDigest newMD5() {
public AmazonS3(final Properties props) {
publicKey = props.getProperty("accesskey");
if (publicKey == null)
- throw new IllegalArgumentException("Missing accesskey.");
+ throw new IllegalArgumentException(JGitText.get().missingAccesskey);
final String secret = props.getProperty("secretkey");
if (secret == null)
- throw new IllegalArgumentException("Missing secretkey.");
+ throw new IllegalArgumentException(JGitText.get().missingSecretkey);
privateKey = new SecretKeySpec(Constants.encodeASCII(secret), HMAC);
final String pacl = props.getProperty("acl", "PRIVATE");
@@ -241,9 +243,9 @@ else if (StringUtils.equalsIgnoreCase("PUBLIC_READ", pacl))
encryption = WalkEncryption.NONE;
}
} catch (InvalidKeySpecException e) {
- throw new IllegalArgumentException("Invalid encryption", e);
+ throw new IllegalArgumentException(JGitText.get().invalidEncryption, e);
} catch (NoSuchAlgorithmException e) {
- throw new IllegalArgumentException("Invalid encryption", e);
+ throw new IllegalArgumentException(JGitText.get().invalidEncryption, e);
}
maxAttempts = Integer.parseInt(props.getProperty(
@@ -471,7 +473,7 @@ private void putImpl(final String bucket, final String key,
if (monitor == null)
monitor = NullProgressMonitor.INSTANCE;
if (monitorTask == null)
- monitorTask = "Uploading " + key;
+ monitorTask = MessageFormat.format(JGitText.get().progressMonUploading, key);
final String md5str = Base64.encodeBytes(csum);
final long len = buf.length();
@@ -508,9 +510,8 @@ private void putImpl(final String bucket, final String key,
private IOException error(final String action, final String key,
final HttpURLConnection c) throws IOException {
- final IOException err = new IOException(action + " of '" + key
- + "' failed: " + HttpSupport.response(c) + " "
- + c.getResponseMessage());
+ final IOException err = new IOException(MessageFormat.format(JGitText.get().amazonS3ActionFailed
+ , action, key, HttpSupport.response(c), c.getResponseMessage()));
final ByteArrayOutputStream b = new ByteArrayOutputStream();
byte[] buf = new byte[2048];
for (;;) {
@@ -527,8 +528,8 @@ private IOException error(final String action, final String key,
}
private IOException maxAttempts(final String action, final String key) {
- return new IOException(action + " of '" + key + "' failed:"
- + " Giving up after " + maxAttempts + " attempts.");
+ return new IOException(MessageFormat.format(JGitText.get().amazonS3ActionFailedGivingUp
+ , action, key, maxAttempts));
}
private HttpURLConnection open(final String method, final String bucket,
@@ -614,9 +615,9 @@ private void authorize(final HttpURLConnection c) throws IOException {
m.init(privateKey);
sec = Base64.encodeBytes(m.doFinal(s.toString().getBytes("UTF-8")));
} catch (NoSuchAlgorithmException e) {
- throw new IOException("No " + HMAC + " support:" + e.getMessage());
+ throw new IOException(MessageFormat.format(JGitText.get().noHMACsupport, HMAC, e.getMessage()));
} catch (InvalidKeyException e) {
- throw new IOException("Invalid key: " + e.getMessage());
+ throw new IOException(MessageFormat.format(JGitText.get().invalidKey, e.getMessage()));
}
c.setRequestProperty("Authorization", "AWS " + publicKey + ":" + sec);
}
@@ -668,7 +669,7 @@ void list() throws IOException {
try {
xr = XMLReaderFactory.createXMLReader();
} catch (SAXException e) {
- throw new IOException("No XML parser available.");
+ throw new IOException(JGitText.get().noXMLParserAvailable);
}
xr.setContentHandler(this);
final InputStream in = c.getInputStream();
@@ -676,7 +677,7 @@ void list() throws IOException {
xr.parse(new InputSource(in));
} catch (SAXException parsingError) {
final IOException p;
- p = new IOException("Error listing " + prefix);
+ p = new IOException(MessageFormat.format(JGitText.get().errorListing, prefix));
p.initCause(parsingError);
throw p;
} finally {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseConnection.java
index 1339b8691..30d3bb13e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseConnection.java
@@ -52,6 +52,7 @@
import java.util.Collections;
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Ref;
@@ -111,7 +112,7 @@ protected void available(final Map<String, Ref> all) {
protected void markStartedOperation() throws TransportException {
if (startedOperation)
throw new TransportException(
- "Only one operation call per connection is supported.");
+ JGitText.get().onlyOneOperationCallPerConnectionIsSupported);
startedOperation = true;
}
@@ -136,7 +137,7 @@ protected Writer getMessageWriter() {
*/
protected void setMessageWriter(Writer writer) {
if (messageWriter != null)
- throw new IllegalStateException("Writer already initialized");
+ throw new IllegalStateException(JGitText.get().writerAlreadyInitialized);
messageWriter = writer;
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java
index 7b6d3e121..2927cada9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java
@@ -50,10 +50,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.errors.RemoteRepositoryException;
@@ -230,8 +232,8 @@ private void readAdvertisedRefsImpl() throws IOException {
name = name.substring(0, name.length() - 3);
final Ref prior = avail.get(name);
if (prior == null)
- throw new PackProtocolException(uri, "advertisement of "
- + name + "^{} came before " + name);
+ throw new PackProtocolException(uri, MessageFormat.format(
+ JGitText.get().advertisementCameBefore, name, name));
if (prior.getPeeledObjectId() != null)
throw duplicateAdvertisement(name + "^{}");
@@ -258,7 +260,7 @@ private void readAdvertisedRefsImpl() throws IOException {
* possibly why.
*/
protected TransportException noRepository() {
- return new NoRemoteRepositoryException(uri, "not found.");
+ return new NoRemoteRepositoryException(uri, JGitText.get().notFound);
}
protected boolean isCapableOf(final String option) {
@@ -274,8 +276,7 @@ protected boolean wantCapability(final StringBuilder b, final String option) {
}
private PackProtocolException duplicateAdvertisement(final String name) {
- return new PackProtocolException(uri, "duplicate advertisements of "
- + name);
+ return new PackProtocolException(uri, MessageFormat.format(JGitText.get().duplicateAdvertisementsOf, name));
}
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
index 7b90ec199..2819ae26d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
@@ -47,11 +47,13 @@
import java.io.IOException;
import java.io.InputStream;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.AnyObjectId;
@@ -391,8 +393,7 @@ else if (wantCapability(line, OPTION_SIDE_BAND))
// ACK status to tell us common objects for reuse in future
// requests. If its not enabled, we can't talk to the peer.
//
- throw new PackProtocolException(uri, "stateless RPC requires "
- + OPTION_MULTI_ACK_DETAILED + " to be enabled");
+ throw new PackProtocolException(uri, MessageFormat.format(JGitText.get().statelessRPCRequiresOptionToBeEnabled, OPTION_MULTI_ACK_DETAILED));
}
return line.toString();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
index e10cefd3a..44ccd2d6a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
@@ -45,10 +45,12 @@
package org.eclipse.jgit.transport;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.PackProtocolException;
@@ -137,7 +139,7 @@ protected TransportException noRepository() {
} catch (TransportException e) {
// Fall through.
}
- return new TransportException(uri, "push not permitted");
+ return new TransportException(uri, JGitText.get().pushNotPermitted);
}
protected void doPush(final ProgressMonitor monitor,
@@ -158,8 +160,7 @@ protected void doPush(final ProgressMonitor monitor,
//
int b = in.read();
if (0 <= b)
- throw new TransportException(uri, "expected EOF;"
- + " received '" + (char) b + "' instead");
+ throw new TransportException(uri, MessageFormat.format(JGitText.get().expectedEOFReceived, (char) b));
}
}
} catch (TransportException e) {
@@ -201,7 +202,7 @@ private void writeCommands(final Collection<RemoteRefUpdate> refUpdates,
}
if (monitor.isCancelled())
- throw new TransportException(uri, "push cancelled");
+ throw new TransportException(uri, JGitText.get().pushCancelled);
pckOut.end();
outNeedsEnd = false;
}
@@ -252,13 +253,11 @@ private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
throws IOException {
final String unpackLine = readStringLongTimeout();
if (!unpackLine.startsWith("unpack "))
- throw new PackProtocolException(uri, "unexpected report line: "
- + unpackLine);
+ throw new PackProtocolException(uri, MessageFormat.format(JGitText.get().unexpectedReportLine, unpackLine));
final String unpackStatus = unpackLine.substring("unpack ".length());
if (!unpackStatus.equals("ok"))
- throw new TransportException(uri,
- "error occurred during unpacking on the remote end: "
- + unpackStatus);
+ throw new TransportException(uri, MessageFormat.format(
+ JGitText.get().errorOccurredDuringUnpackingOnTheRemoteEnd, unpackStatus));
String refLine;
while ((refLine = pckIn.readString()) != PacketLineIn.END) {
@@ -272,16 +271,15 @@ private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
refNameEnd = refLine.indexOf(" ", 3);
}
if (refNameEnd == -1)
- throw new PackProtocolException(uri
- + ": unexpected report line: " + refLine);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().unexpectedReportLine2
+ , uri, refLine));
final String refName = refLine.substring(3, refNameEnd);
final String message = (ok ? null : refLine
.substring(refNameEnd + 1));
final RemoteRefUpdate rru = refUpdates.get(refName);
if (rru == null)
- throw new PackProtocolException(uri
- + ": unexpected ref report: " + refName);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().unexpectedRefReport, uri, refName));
if (ok) {
rru.setStatus(Status.OK);
} else {
@@ -291,9 +289,8 @@ private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
}
for (final RemoteRefUpdate rru : refUpdates.values()) {
if (rru.getStatus() == Status.AWAITING_REPORT)
- throw new PackProtocolException(uri
- + ": expected report for ref " + rru.getRemoteName()
- + " not received");
+ throw new PackProtocolException(MessageFormat.format(
+ JGitText.get().expectedReportForRefNotReceived , uri, rru.getRemoteName()));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
index c788244f7..3b97dfc0d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
@@ -50,6 +50,7 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -59,6 +60,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingBundlePrerequisiteException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.PackProtocolException;
@@ -101,7 +103,7 @@ class BundleFetchConnection extends BaseFetchConnection {
readBundleV2();
break;
default:
- throw new TransportException(transport.uri, "not a bundle");
+ throw new TransportException(transport.uri, JGitText.get().notABundle);
}
} catch (TransportException err) {
close();
@@ -119,7 +121,7 @@ private int readSignature() throws IOException {
final String rev = readLine(new byte[1024]);
if (TransportBundle.V2_BUNDLE_SIGNATURE.equals(rev))
return 2;
- throw new TransportException(transport.uri, "not a bundle");
+ throw new TransportException(transport.uri, JGitText.get().notABundle);
}
private void readBundleV2() throws IOException {
@@ -151,7 +153,7 @@ private void readBundleV2() throws IOException {
private PackProtocolException duplicateAdvertisement(final String name) {
return new PackProtocolException(transport.uri,
- "duplicate advertisements of " + name);
+ MessageFormat.format(JGitText.get().duplicateAdvertisementsOf, name));
}
private String readLine(final byte[] hdrbuf) throws IOException {
@@ -227,8 +229,8 @@ private void verifyPrerequisites() throws TransportException {
} catch (MissingObjectException notFound) {
missing.put(p, e.getValue());
} catch (IOException err) {
- throw new TransportException(transport.uri, "Cannot read commit "
- + p.name(), err);
+ throw new TransportException(transport.uri
+ , MessageFormat.format(JGitText.get().cannotReadCommit, p.name()), err);
}
}
if (!missing.isEmpty())
@@ -253,7 +255,7 @@ private void verifyPrerequisites() throws TransportException {
}
}
} catch (IOException err) {
- throw new TransportException(transport.uri, "Cannot read object", err);
+ throw new TransportException(transport.uri, JGitText.get().cannotReadObject, err);
}
if (remaining > 0) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
index 7b0a5eec4..7e91557b0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
@@ -47,11 +47,13 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@@ -112,9 +114,9 @@ public BundleWriter(final Repository repo, final ProgressMonitor monitor) {
*/
public void include(final String name, final AnyObjectId id) {
if (!Repository.isValidRefName(name))
- throw new IllegalArgumentException("Invalid ref name: " + name);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidRefName, name));
if (include.containsKey(name))
- throw new IllegalStateException("Duplicate ref: " + name);
+ throw new IllegalStateException(JGitText.get().duplicateRef + name);
include.put(name, id.toObjectId());
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
index cafcd7b4b..39c7ae8f0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Daemon.java
@@ -57,6 +57,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
@@ -250,7 +251,7 @@ public void setTimeout(final int seconds) {
*/
public synchronized void start() throws IOException {
if (acceptThread != null)
- throw new IllegalStateException("Daemon already running");
+ throw new IllegalStateException(JGitText.get().daemonAlreadyRunning);
final ServerSocket listenSock = new ServerSocket(
myAddress != null ? myAddress.getPort() : 0, BACKLOG,
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java
index b86f86d2f..fc203f69c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java
@@ -48,6 +48,7 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -57,6 +58,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
@@ -122,8 +124,8 @@ private void executeImp(final ProgressMonitor monitor,
final Set<Ref> matched = new HashSet<Ref>();
for (final RefSpec spec : toFetch) {
if (spec.getSource() == null)
- throw new TransportException(
- "Source ref not specified for refspec: " + spec);
+ throw new TransportException(MessageFormat.format(
+ JGitText.get().sourceRefNotSpecifiedForRefspec, spec));
if (spec.isWildcard())
expandWildcard(spec, matched);
@@ -181,8 +183,8 @@ else if (tagopt == TagOpt.FETCH_TAGS)
u.update(walk);
result.add(u);
} catch (IOException err) {
- throw new TransportException("Failure updating tracking ref "
- + u.getLocalName() + ": " + err.getMessage(), err);
+ throw new TransportException(MessageFormat.format(
+ JGitText.get().failureUpdatingTrackingRef, u.getLocalName(), err.getMessage()), err);
}
}
@@ -190,8 +192,8 @@ else if (tagopt == TagOpt.FETCH_TAGS)
try {
updateFETCH_HEAD(result);
} catch (IOException err) {
- throw new TransportException("Failure updating FETCH_HEAD: "
- + err.getMessage(), err);
+ throw new TransportException(MessageFormat.format(
+ JGitText.get().failureUpdatingFETCH_HEAD, err.getMessage()), err);
}
}
}
@@ -207,7 +209,7 @@ private void fetchObjects(final ProgressMonitor monitor)
if (transport.isCheckFetchedObjects()
&& !conn.didFetchTestConnectivity() && !askForIsComplete())
throw new TransportException(transport.getURI(),
- "peer did not supply a complete object graph");
+ JGitText.get().peerDidNotSupplyACompleteObjectGraph);
}
private void closeConnection(final FetchResult result) {
@@ -301,7 +303,7 @@ private boolean askForIsComplete() throws TransportException {
} catch (MissingObjectException e) {
return false;
} catch (IOException e) {
- throw new TransportException("Unable to check connectivity.", e);
+ throw new TransportException(JGitText.get().unableToCheckConnectivity, e);
}
}
@@ -317,8 +319,7 @@ private void expandSingle(final RefSpec spec, final Set<Ref> matched)
throws TransportException {
final Ref src = conn.getRef(spec.getSource());
if (src == null) {
- throw new TransportException("Remote does not have "
- + spec.getSource() + " available for fetch.");
+ throw new TransportException(MessageFormat.format(JGitText.get().remoteDoesNotHaveSpec, spec.getSource()));
}
if (matched.add(src))
want(src, spec);
@@ -376,9 +377,8 @@ private void want(final Ref src, final RefSpec spec)
} catch (IOException err) {
// Bad symbolic ref? That is the most likely cause.
//
- throw new TransportException("Cannot resolve"
- + " local tracking ref " + spec.getDestination()
- + " for updating.", err);
+ throw new TransportException( MessageFormat.format(
+ JGitText.get().cannotResolveLocalTrackingRefForUpdating, spec.getDestination()), err);
}
}
@@ -432,13 +432,12 @@ private void deleteTrackingRef(final FetchResult result,
case FORCED:
break;
default:
- throw new TransportException(transport.getURI(),
- "Cannot delete stale tracking ref " + name + ": "
- + u.getResult().name());
+ throw new TransportException(transport.getURI(), MessageFormat.format(
+ JGitText.get().cannotDeleteStaleTrackingRef2, name, u.getResult().name()));
}
} catch (IOException e) {
- throw new TransportException(transport.getURI(),
- "Cannot delete stale tracking ref " + name, e);
+ throw new TransportException(transport.getURI(), MessageFormat.format(
+ JGitText.get().cannotDeleteStaleTrackingRef, name), e);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java
index 6eeccea84..2a5b4344f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java
@@ -52,6 +52,7 @@
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -60,6 +61,7 @@
import java.util.zip.Deflater;
import java.util.zip.Inflater;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.AnyObjectId;
@@ -82,10 +84,10 @@
/** Indexes Git pack files for local use. */
public class IndexPack {
/** Progress message when reading raw data from the pack. */
- public static final String PROGRESS_DOWNLOAD = "Receiving objects";
+ public static final String PROGRESS_DOWNLOAD = JGitText.get().receivingObjects;
/** Progress message when computing names of delta compressed objects. */
- public static final String PROGRESS_RESOLVE_DELTA = "Resolving deltas";
+ public static final String PROGRESS_RESOLVE_DELTA = JGitText.get().resolvingDeltas;
/**
* Size of the internal stream buffer.
@@ -392,20 +394,19 @@ public void index(final ProgressMonitor progress) throws IOException {
indexOneObject();
progress.update(1);
if (progress.isCancelled())
- throw new IOException("Download cancelled");
+ throw new IOException(JGitText.get().downloadCancelled);
}
readPackFooter();
endInput();
progress.endTask();
if (deltaCount > 0) {
if (packOut == null)
- throw new IOException("need packOut");
+ throw new IOException(JGitText.get().needPackOut);
resolveDeltas(progress);
if (entryCount < objectCount) {
if (!fixThin) {
- throw new IOException("pack has "
- + (objectCount - entryCount)
- + " unresolved deltas");
+ throw new IOException(MessageFormat.format(
+ JGitText.get().packHasUnresolvedDeltas, (objectCount - entryCount)));
}
fixThinPack(progress);
}
@@ -458,7 +459,7 @@ private void resolveDeltas(final ProgressMonitor progress)
resolveDeltas(entries[i]);
progress.update(entryCount - before);
if (progress.isCancelled())
- throw new IOException("Download cancelled during indexing");
+ throw new IOException(JGitText.get().downloadCancelledDuringIndexing);
}
progress.endTask();
}
@@ -505,12 +506,12 @@ private void resolveDeltas(final long pos, final int oldCRC, int type,
break;
}
default:
- throw new IOException("Unknown object type " + typeCode + ".");
+ throw new IOException(MessageFormat.format(JGitText.get().unknownObjectType, typeCode));
}
final int crc32 = (int) crc.getValue();
if (oldCRC != crc32)
- throw new IOException("Corruption detected re-reading at " + pos);
+ throw new IOException(MessageFormat.format(JGitText.get().corruptionDetectedReReadingAt, pos));
if (oe == null) {
objectDigest.update(Constants.encodedTypeString(type));
objectDigest.update((byte) ' ');
@@ -602,7 +603,7 @@ private void fixThinPack(final ProgressMonitor progress) throws IOException {
resolveChildDeltas(oe.getOffset(), typeCode, data, oe);
if (progress.isCancelled())
- throw new IOException("Download cancelled during indexing");
+ throw new IOException(JGitText.get().downloadCancelledDuringIndexing);
}
def.end();
@@ -691,7 +692,7 @@ private void fixHeaderFooter(final byte[] origcsum, final byte[] tailcsum)
if (!Arrays.equals(origDigest.digest(), origcsum)
|| !Arrays.equals(tailDigest.digest(), tailcsum))
- throw new IOException("Pack corrupted while writing to filesystem");
+ throw new IOException(JGitText.get().packCorruptedWhileWritingToFilesystem);
packcsum = packDigest.digest();
packOut.write(packcsum);
@@ -730,11 +731,11 @@ private void readPackHeader() throws IOException {
final int p = fillFromInput(hdrln);
for (int k = 0; k < Constants.PACK_SIGNATURE.length; k++)
if (buf[p + k] != Constants.PACK_SIGNATURE[k])
- throw new IOException("Not a PACK file.");
+ throw new IOException(JGitText.get().notAPACKFile);
final long vers = NB.decodeUInt32(buf, p + 4);
if (vers != 2 && vers != 3)
- throw new IOException("Unsupported pack version " + vers + ".");
+ throw new IOException(MessageFormat.format(JGitText.get().unsupportedPackVersion, vers));
objectCount = NB.decodeUInt32(buf, p + 8);
use(hdrln);
}
@@ -750,7 +751,7 @@ private void readPackFooter() throws IOException {
packOut.write(packcsum);
if (!Arrays.equals(cmpcsum, packcsum))
- throw new CorruptObjectException("Packfile checksum incorrect.");
+ throw new CorruptObjectException(JGitText.get().corruptObjectPackfileChecksumIncorrect);
}
// Cleanup all resources associated with our input parsing.
@@ -814,7 +815,7 @@ private void indexOneObject() throws IOException {
break;
}
default:
- throw new IOException("Unknown object type " + typeCode + ".");
+ throw new IOException(MessageFormat.format(JGitText.get().unknownObjectType, typeCode));
}
}
@@ -839,9 +840,8 @@ private void verifySafeObject(final AnyObjectId id, final int type,
try {
objCheck.check(type, data);
} catch (CorruptObjectException e) {
- throw new IOException("Invalid "
- + Constants.typeString(type) + " " + id.name()
- + ":" + e.getMessage());
+ throw new IOException(MessageFormat.format(JGitText.get().invalidObject
+ , Constants.typeString(type) , id.name() , e.getMessage()));
}
}
@@ -849,7 +849,7 @@ private void verifySafeObject(final AnyObjectId id, final int type,
if (ldr != null) {
final byte[] existingData = ldr.getCachedBytes();
if (ldr.getType() != type || !Arrays.equals(data, existingData)) {
- throw new IOException("Collision on " + id.name());
+ throw new IOException(MessageFormat.format(JGitText.get().collisionOn, id.name()));
}
}
}
@@ -904,7 +904,7 @@ private int fillFromInput(final int need) throws IOException {
}
next = in.read(buf, next, free);
if (next <= 0)
- throw new EOFException("Packfile is truncated.");
+ throw new EOFException(JGitText.get().packfileIsTruncated);
bAvail += next;
}
return bOffset;
@@ -924,7 +924,7 @@ private int fillFromFile(final int need) throws IOException {
}
next = packOut.read(buf, next, free);
if (next <= 0)
- throw new EOFException("Packfile is truncated.");
+ throw new EOFException(JGitText.get().packfileIsTruncated);
bAvail += next;
}
return bOffset;
@@ -966,7 +966,7 @@ private void skipInflateFromInput(long sz) throws IOException {
n += inf.inflate(dst, n, free);
}
if (n != sz)
- throw new DataFormatException("wrong decompressed length");
+ throw new DataFormatException(JGitText.get().wrongDecompressedLength);
n = bAvail - inf.getRemaining();
if (n > 0) {
crc.update(buf, p, n);
@@ -998,7 +998,7 @@ private byte[] inflateFromInput(final long sz) throws IOException {
n += inf.inflate(dst, n, dst.length - n);
}
if (n != sz)
- throw new DataFormatException("wrong decompressed length");
+ throw new DataFormatException(JGitText.get().wrongDecompressedLength);
n = bAvail - inf.getRemaining();
if (n > 0) {
crc.update(buf, p, n);
@@ -1043,8 +1043,8 @@ private byte[] inflateFromFile(final int sz) throws IOException {
}
private static CorruptObjectException corrupt(final DataFormatException dfe) {
- return new CorruptObjectException("Packfile corruption detected: "
- + dfe.getMessage());
+ return new CorruptObjectException(MessageFormat.format(
+ JGitText.get().packfileCorruptionDetected, dfe.getMessage()));
}
private static class DeltaChain extends ObjectId {
@@ -1138,7 +1138,7 @@ public PackLock renameAndOpenPack(final String lockMessage)
// to create it. There is no way to move this pack in.
//
cleanupTemporaryFiles();
- throw new IOException("Cannot create " + packDir.getAbsolutePath());
+ throw new IOException(MessageFormat.format(JGitText.get().cannotCreateDirectory, packDir.getAbsolutePath()));
}
if (finalPack.exists()) {
@@ -1154,7 +1154,7 @@ public PackLock renameAndOpenPack(final String lockMessage)
//
try {
if (!keep.lock(lockMessage))
- throw new IOException("Cannot lock pack in " + finalPack);
+ throw new IOException(MessageFormat.format(JGitText.get().cannotLockPackIn, finalPack));
} catch (IOException e) {
cleanupTemporaryFiles();
throw e;
@@ -1164,7 +1164,7 @@ public PackLock renameAndOpenPack(final String lockMessage)
if (!dstPack.renameTo(finalPack)) {
cleanupTemporaryFiles();
keep.unlock();
- throw new IOException("Cannot move pack to " + finalPack);
+ throw new IOException(MessageFormat.format(JGitText.get().cannotMovePackTo, finalPack));
}
if (!dstIdx.renameTo(finalIdx)) {
@@ -1172,7 +1172,7 @@ public PackLock renameAndOpenPack(final String lockMessage)
keep.unlock();
if (!finalPack.delete())
finalPack.deleteOnExit();
- throw new IOException("Cannot move index to " + finalIdx);
+ throw new IOException(MessageFormat.format(JGitText.get().cannotMoveIndexTo, finalIdx));
}
try {
@@ -1199,4 +1199,4 @@ private void addObjectAndTrack(PackedObjectInfo oe) {
if (needNewObjectIds())
newObjectIds.add(oe);
}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java
index 170e4ddbe..3821d696e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java
@@ -47,7 +47,9 @@
import java.io.IOException;
import java.io.InputStream;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.MutableObjectId;
@@ -82,7 +84,7 @@ static enum AckNackResult {
AckNackResult readACK(final MutableObjectId returnedId) throws IOException {
final String line = readString();
if (line.length() == 0)
- throw new PackProtocolException("Expected ACK/NAK, found EOF");
+ throw new PackProtocolException(JGitText.get().expectedACKNAKFoundEOF);
if ("NAK".equals(line))
return AckNackResult.NAK;
if (line.startsWith("ACK ")) {
@@ -98,7 +100,7 @@ else if (arg.equals(" common"))
else if (arg.equals(" ready"))
return AckNackResult.ACK_READY;
}
- throw new PackProtocolException("Expected ACK/NAK, got: " + line);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().expectedACKNAKGot, line));
}
String readString() throws IOException {
@@ -142,9 +144,9 @@ int readLength() throws IOException {
throw new ArrayIndexOutOfBoundsException();
return len;
} catch (ArrayIndexOutOfBoundsException err) {
- throw new IOException("Invalid packet line header: "
- + (char) lineBuffer[0] + (char) lineBuffer[1]
- + (char) lineBuffer[2] + (char) lineBuffer[3]);
+ throw new IOException(MessageFormat.format(JGitText.get().invalidPacketLineHeader,
+ "" + (char) lineBuffer[0] + (char) lineBuffer[1]
+ + (char) lineBuffer[2] + (char) lineBuffer[3]));
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushProcess.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushProcess.java
index 03b783427..02497cb06 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushProcess.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushProcess.java
@@ -44,10 +44,12 @@
package org.eclipse.jgit.transport;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
@@ -66,7 +68,7 @@
*/
class PushProcess {
/** Task name for {@link ProgressMonitor} used during opening connection. */
- static final String PROGRESS_OPENING_CONNECTION = "Opening connection";
+ static final String PROGRESS_OPENING_CONNECTION = JGitText.get().openingConnection;
/** Transport used to perform this operation. */
private final Transport transport;
@@ -97,9 +99,8 @@ class PushProcess {
this.toPush = new HashMap<String, RemoteRefUpdate>();
for (final RemoteRefUpdate rru : toPush) {
if (this.toPush.put(rru.getRemoteName(), rru) != null)
- throw new TransportException(
- "Duplicate remote ref update is illegal. Affected remote name: "
- + rru.getRemoteName());
+ throw new TransportException(MessageFormat.format(
+ JGitText.get().duplicateRemoteRefUpdateIsIllegal, rru.getRemoteName()));
}
}
@@ -200,9 +201,8 @@ private Map<String, RemoteRefUpdate> prepareRemoteUpdates()
} catch (MissingObjectException x) {
fastForward = false;
} catch (Exception x) {
- throw new TransportException(transport.getURI(),
- "reading objects from local repository failed: "
- + x.getMessage(), x);
+ throw new TransportException(transport.getURI(), MessageFormat.format(
+ JGitText.get().readingObjectsFromLocalRepositoryFailed, x.getMessage()), x);
}
rru.setFastForward(fastForward);
if (!fastForward && !rru.isForceUpdate())
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 4e62d7427..e42b7fe0c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -57,6 +57,7 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -64,6 +65,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.lib.Config;
@@ -724,7 +726,7 @@ private void recvCommands() throws IOException {
}
if (line.length() < 83) {
- final String m = "error: invalid protocol: wanted 'old new ref'";
+ final String m = JGitText.get().errorInvalidProtocolWantedOldNewRef;
sendError(m);
throw new PackProtocolException(m);
}
@@ -898,7 +900,7 @@ private void validateCommands() {
// other requested old id is invalid.
//
cmd.setResult(Result.REJECTED_OTHER_REASON,
- "invalid old id sent");
+ JGitText.get().invalidOldIdSent);
continue;
}
@@ -906,7 +908,7 @@ private void validateCommands() {
if (ref == null) {
// The ref must have been advertised in order to be updated.
//
- cmd.setResult(Result.REJECTED_OTHER_REASON, "no such ref");
+ cmd.setResult(Result.REJECTED_OTHER_REASON, JGitText.get().noSuchRef);
continue;
}
@@ -915,7 +917,7 @@ private void validateCommands() {
// object id we advertised.
//
cmd.setResult(Result.REJECTED_OTHER_REASON,
- "invalid old id sent");
+ JGitText.get().invalidOldIdSent);
continue;
}
@@ -958,7 +960,7 @@ private void validateCommands() {
if (!cmd.getRefName().startsWith(Constants.R_REFS)
|| !Repository.isValidRefName(cmd.getRefName())) {
- cmd.setResult(Result.REJECTED_OTHER_REASON, "funny refname");
+ cmd.setResult(Result.REJECTED_OTHER_REASON, JGitText.get().funnyRefname);
}
}
}
@@ -997,8 +999,8 @@ private void execute(final ReceiveCommand cmd) {
break;
}
} catch (IOException err) {
- cmd.setResult(Result.REJECTED_OTHER_REASON, "lock error: "
- + err.getMessage());
+ cmd.setResult(Result.REJECTED_OTHER_REASON, MessageFormat.format(
+ JGitText.get().lockError, err.getMessage()));
}
}
@@ -1047,7 +1049,7 @@ private List<ReceiveCommand> filterCommands(final Result want) {
private void sendStatusReport(final boolean forClient, final Reporter out)
throws IOException {
if (unpackError != null) {
- out.sendString("unpack error " + unpackError.getMessage());
+ out.sendString(MessageFormat.format(JGitText.get().unpackError, unpackError.getMessage()));
if (forClient) {
for (final ReceiveCommand cmd : commands) {
out.sendString("ng " + cmd.getRefName()
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java
index 154ae3fed..ca6f01500 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java
@@ -43,6 +43,9 @@
package org.eclipse.jgit.transport;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
@@ -125,7 +128,7 @@ public RefSpec(final String spec) {
if (c == 0) {
s = s.substring(1);
if (isWildcard(s))
- throw new IllegalArgumentException("Invalid wildcards " + spec);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
dstName = s;
} else if (c > 0) {
srcName = s.substring(0, c);
@@ -133,10 +136,10 @@ public RefSpec(final String spec) {
if (isWildcard(srcName) && isWildcard(dstName))
wildcard = true;
else if (isWildcard(srcName) || isWildcard(dstName))
- throw new IllegalArgumentException("Invalid wildcards " + spec);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
} else {
if (isWildcard(s))
- throw new IllegalArgumentException("Invalid wildcards " + spec);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
srcName = s;
}
}
@@ -211,9 +214,9 @@ public RefSpec setSource(final String source) {
final RefSpec r = new RefSpec(this);
r.srcName = source;
if (isWildcard(r.srcName) && r.dstName == null)
- throw new IllegalStateException("Destination is not a wildcard.");
+ throw new IllegalStateException(JGitText.get().destinationIsNotAWildcard);
if (isWildcard(r.srcName) != isWildcard(r.dstName))
- throw new IllegalStateException("Source/Destination must match.");
+ throw new IllegalStateException(JGitText.get().sourceDestinationMustMatch);
return r;
}
@@ -250,9 +253,9 @@ public RefSpec setDestination(final String destination) {
final RefSpec r = new RefSpec(this);
r.dstName = destination;
if (isWildcard(r.dstName) && r.srcName == null)
- throw new IllegalStateException("Source is not a wildcard.");
+ throw new IllegalStateException(JGitText.get().sourceIsNotAWildcard);
if (isWildcard(r.srcName) != isWildcard(r.dstName))
- throw new IllegalStateException("Source/Destination must match.");
+ throw new IllegalStateException(JGitText.get().sourceDestinationMustMatch);
return r;
}
@@ -271,7 +274,7 @@ public RefSpec setDestination(final String destination) {
public RefSpec setSourceDestination(final String source,
final String destination) {
if (isWildcard(source) != isWildcard(destination))
- throw new IllegalArgumentException("Source/Destination must match.");
+ throw new IllegalStateException(JGitText.get().sourceDestinationMustMatch);
final RefSpec r = new RefSpec(this);
r.wildcard = isWildcard(source);
r.srcName = source;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteRefUpdate.java
index b2aa6335d..1b17c9f0f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteRefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteRefUpdate.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.transport;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -184,13 +186,13 @@ public RemoteRefUpdate(final Repository localDb, final String srcRef,
final String localName, final ObjectId expectedOldObjectId)
throws IOException {
if (remoteName == null)
- throw new IllegalArgumentException("Remote name can't be null.");
+ throw new IllegalArgumentException(JGitText.get().remoteNameCantBeNull);
this.srcRef = srcRef;
this.newObjectId = (srcRef == null ? ObjectId.zeroId() : localDb
.resolve(srcRef));
if (newObjectId == null)
- throw new IOException("Source ref " + srcRef
- + " doesn't resolve to any object.");
+ throw new IOException(MessageFormat.format(
+ JGitText.get().sourceRefDoesntResolveToAnyObject, srcRef));
this.remoteName = remoteName;
this.forceUpdate = forceUpdate;
if (localName != null && localDb != null)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java
index 796cb745a..1f9883e50 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandInputStream.java
@@ -49,9 +49,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
+import java.text.MessageFormat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
@@ -75,7 +77,7 @@
* @see SideBandOutputStream
*/
class SideBandInputStream extends InputStream {
- private static final String PFX_REMOTE = "remote: ";
+ private static final String PFX_REMOTE = JGitText.get().prefixRemote;
static final int CH_DATA = 1;
@@ -170,7 +172,7 @@ private void needDataPacket() throws IOException {
eof = true;
throw new TransportException(PFX_REMOTE + readString(available));
default:
- throw new PackProtocolException("Invalid channel " + channel);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().invalidChannel, channel));
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
index 6e0a52627..31acdcde5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
@@ -45,6 +45,9 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Multiplexes data and progress messages.
@@ -94,14 +97,11 @@ class SideBandOutputStream extends OutputStream {
*/
SideBandOutputStream(final int chan, final int sz, final OutputStream os) {
if (chan <= 0 || chan > 255)
- throw new IllegalArgumentException("channel " + chan
- + " must be in range [0, 255]");
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().channelMustBeInRange0_255, chan));
if (sz <= HDR_SIZE)
- throw new IllegalArgumentException("packet size " + sz
- + " must be >= " + HDR_SIZE);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().packetSizeMustBeAtLeast, sz, HDR_SIZE));
else if (MAX_BUF < sz)
- throw new IllegalArgumentException("packet size " + sz
- + " must be <= " + MAX_BUF);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().packetSizeMustBeAtMost, sz, MAX_BUF));
out = os;
buffer = new byte[sz];
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshTransport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshTransport.java
index 5c6b498ca..d25a7b618 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshTransport.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshTransport.java
@@ -50,6 +50,7 @@
import java.net.ConnectException;
import java.net.UnknownHostException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
@@ -96,10 +97,10 @@ protected SshTransport(Repository local, URIish uri) {
*/
public void setSshSessionFactory(SshSessionFactory factory) {
if (factory == null)
- throw new NullPointerException("The factory must not be null");
+ throw new NullPointerException(JGitText.get().theFactoryMustNotBeNull);
if (sock != null)
throw new IllegalStateException(
- "An SSH session has been already created");
+ JGitText.get().anSSHSessionHasBeenAlreadyCreated);
sch = factory;
}
@@ -133,7 +134,7 @@ protected void initSession() throws TransportException {
} catch (JSchException je) {
final Throwable c = je.getCause();
if (c instanceof UnknownHostException)
- throw new TransportException(uri, "unknown host");
+ throw new TransportException(uri, JGitText.get().unknownHost);
if (c instanceof ConnectException)
throw new TransportException(uri, c.getMessage());
throw new TransportException(uri, je.getMessage(), je);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java
index 66f36a0d2..82a5f23b6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TagOpt.java
@@ -44,6 +44,10 @@
package org.eclipse.jgit.transport;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
+
/** Specification of annotated tag behavior during fetch. */
public enum TagOpt {
/**
@@ -105,6 +109,6 @@ public static TagOpt fromOption(final String o) {
if (tagopt.option().equals(o))
return tagopt;
}
- throw new IllegalArgumentException("Invalid tag option: " + o);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidTagOption, o));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java
index d6400963a..c0b2eedc0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java
@@ -48,6 +48,7 @@
import java.io.IOException;
import java.net.URISyntaxException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -56,6 +57,7 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
@@ -240,9 +242,8 @@ public static Transport open(final Repository local,
throws NotSupportedException {
final List<URIish> uris = getURIs(cfg, op);
if (uris.isEmpty())
- throw new IllegalArgumentException(
- "Remote config \""
- + cfg.getName() + "\" has no URIs associated");
+ throw new IllegalArgumentException(MessageFormat.format(
+ JGitText.get().remoteConfigHasNoURIAssociated, cfg.getName()));
final Transport tn = open(local, uris.get(0));
tn.applyConfig(cfg);
return tn;
@@ -351,7 +352,7 @@ else if (TransportBundleFile.canHandle(remote))
else if (TransportLocal.canHandle(remote))
return new TransportLocal(local, remote);
- throw new NotSupportedException("URI not supported: " + remote);
+ throw new NotSupportedException(MessageFormat.format(JGitText.get().URINotSupported, remote));
}
/**
@@ -787,7 +788,7 @@ public FetchResult fetch(final ProgressMonitor monitor,
// If the caller did not ask for anything use the defaults.
//
if (fetch.isEmpty())
- throw new TransportException("Nothing to fetch.");
+ throw new TransportException(JGitText.get().nothingToFetch);
toFetch = fetch;
} else if (!fetch.isEmpty()) {
// If the caller asked for something specific without giving
@@ -862,12 +863,11 @@ public PushResult push(final ProgressMonitor monitor,
try {
toPush = findRemoteRefUpdatesFor(push);
} catch (final IOException e) {
- throw new TransportException(
- "Problem with resolving push ref specs locally: "
- + e.getMessage(), e);
+ throw new TransportException(MessageFormat.format(
+ JGitText.get().problemWithResolvingPushRefSpecsLocally, e.getMessage()), e);
}
if (toPush.isEmpty())
- throw new TransportException("Nothing to push.");
+ throw new TransportException(JGitText.get().nothingToPush);
}
final PushProcess pushProcess = new PushProcess(this, toPush);
return pushProcess.execute(monitor);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportAmazonS3.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportAmazonS3.java
index a3fd1ceae..bcf6e873f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportAmazonS3.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportAmazonS3.java
@@ -50,6 +50,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLConnection;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -57,6 +58,7 @@
import java.util.Properties;
import java.util.TreeMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
@@ -133,7 +135,7 @@ static boolean canHandle(final URIish uri) {
try {
props = AmazonS3.properties(propsFile);
} catch (IOException e) {
- throw new NotSupportedException("cannot read " + propsFile, e);
+ throw new NotSupportedException(MessageFormat.format(JGitText.get().cannotReadFile, propsFile), e);
}
} else {
props = new Properties();
@@ -277,7 +279,7 @@ private void readLooseRefs(final TreeMap<String, Ref> avail)
+ "refs")))
readRef(avail, "refs/" + n);
} catch (IOException e) {
- throw new TransportException(getURI(), "cannot list refs", e);
+ throw new TransportException(getURI(), JGitText.get().cannotListRefs, e);
}
}
@@ -295,11 +297,12 @@ private Ref readRef(final TreeMap<String, Ref> avail, final String rn)
} catch (FileNotFoundException noRef) {
return null;
} catch (IOException err) {
- throw new TransportException(getURI(), "read " + ref, err);
+ throw new TransportException(getURI(), MessageFormat.format(
+ JGitText.get().transportExceptionReadRef, ref), err);
}
if (s == null)
- throw new TransportException(getURI(), "Empty ref: " + rn);
+ throw new TransportException(getURI(), MessageFormat.format(JGitText.get().transportExceptionEmptyRef, rn));
if (s.startsWith("ref: ")) {
final String target = s.substring("ref: ".length());
@@ -320,7 +323,7 @@ private Ref readRef(final TreeMap<String, Ref> avail, final String rn)
return r;
}
- throw new TransportException(getURI(), "Bad ref: " + rn + ": " + s);
+ throw new TransportException(getURI(), MessageFormat.format(JGitText.get().transportExceptionBadRef, rn, s));
}
private Storage loose(final Ref r) {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleFile.java
index 17e3bdd22..0245818fe 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleFile.java
@@ -51,6 +51,7 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
@@ -84,7 +85,7 @@ public FetchConnection openFetch() throws NotSupportedException,
try {
src = new FileInputStream(bundle);
} catch (FileNotFoundException err) {
- throw new TransportException(uri, "not found");
+ throw new TransportException(uri, JGitText.get().notFound);
}
return new BundleFetchConnection(this, src);
}
@@ -92,7 +93,7 @@ public FetchConnection openFetch() throws NotSupportedException,
@Override
public PushConnection openPush() throws NotSupportedException {
throw new NotSupportedException(
- "Push is not supported for bundle transport");
+ JGitText.get().pushIsNotSupportedForBundleTransport);
}
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleStream.java
index e5188bb23..defc8c2bb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportBundleStream.java
@@ -49,6 +49,7 @@
import java.io.IOException;
import java.io.InputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
@@ -92,7 +93,7 @@ public TransportBundleStream(final Repository db, final URIish uri,
@Override
public FetchConnection openFetch() throws TransportException {
if (src == null)
- throw new TransportException(uri, "Only one fetch supported");
+ throw new TransportException(uri, JGitText.get().onlyOneFetchSupported);
try {
return new BundleFetchConnection(this, src);
} finally {
@@ -103,7 +104,7 @@ public FetchConnection openFetch() throws TransportException {
@Override
public PushConnection openPush() throws NotSupportedException {
throw new NotSupportedException(
- "Push is not supported for bundle transport");
+ JGitText.get().pushIsNotSupportedForBundleTransport);
}
@Override
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitAnon.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitAnon.java
index 8a0b4357c..5ad57768f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitAnon.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitAnon.java
@@ -56,6 +56,7 @@
import java.net.Socket;
import java.net.UnknownHostException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
@@ -107,7 +108,7 @@ Socket openConnection() throws TransportException {
// ignore a failure during close, we're already failing
}
if (c instanceof UnknownHostException)
- throw new TransportException(uri, "unknown host");
+ throw new TransportException(uri, JGitText.get().unknownHost);
if (c instanceof ConnectException)
throw new TransportException(uri, c.getMessage());
throw new TransportException(uri, c.getMessage(), c);
@@ -151,7 +152,7 @@ class TcpFetchConnection extends BasePackFetchConnection {
} catch (IOException err) {
close();
throw new TransportException(uri,
- "remote hung up unexpectedly", err);
+ JGitText.get().remoteHungUpUnexpectedly, err);
}
readAdvertisedRefs();
}
@@ -190,7 +191,7 @@ class TcpPushConnection extends BasePackPushConnection {
} catch (IOException err) {
close();
throw new TransportException(uri,
- "remote hung up unexpectedly", err);
+ JGitText.get().remoteHungUpUnexpectedly, err);
}
readAdvertisedRefs();
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
index 8df3ea5b2..34b13b2d1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
@@ -51,7 +51,9 @@
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import java.text.MessageFormat;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
@@ -172,8 +174,8 @@ void checkExecFailure(int status, String exe, String why)
IOException cause = null;
if (why != null && why.length() > 0)
cause = new IOException(why);
- throw new TransportException(uri, "cannot execute: "
- + commandFor(exe), cause);
+ throw new TransportException(uri, MessageFormat.format(
+ JGitText.get().cannotExecute, commandFor(exe)), cause);
}
}
@@ -257,7 +259,7 @@ class SshFetchConnection extends BasePackFetchConnection {
} catch (IOException err) {
close();
throw new TransportException(uri,
- "remote hung up unexpectedly", err);
+ JGitText.get().remoteHungUpUnexpectedly, err);
}
try {
@@ -325,7 +327,7 @@ class SshPushConnection extends BasePackPushConnection {
} catch (IOException err) {
close();
throw new TransportException(uri,
- "remote hung up unexpectedly", err);
+ JGitText.get().remoteHungUpUnexpectedly, err);
}
try {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
index f49828bf2..71e7bf285 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
@@ -65,6 +65,7 @@
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -73,6 +74,7 @@
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.PackProtocolException;
@@ -170,7 +172,7 @@ private static class HttpConfig {
baseUrl = new URL(uriString);
objectsUrl = new URL(baseUrl, "objects/");
} catch (MalformedURLException e) {
- throw new NotSupportedException("Invalid URL " + uri, e);
+ throw new NotSupportedException(MessageFormat.format(JGitText.get().invalidURL, uri), e);
}
http = local.getConfig().get(HTTP_KEY);
proxySelector = ProxySelector.getDefault();
@@ -216,7 +218,7 @@ public FetchConnection openFetch() throws TransportException,
} catch (TransportException err) {
throw err;
} catch (IOException err) {
- throw new TransportException(uri, "error reading info/refs", err);
+ throw new TransportException(uri, JGitText.get().errorReadingInfoRefs, err);
}
}
@@ -265,8 +267,8 @@ private FetchConnection newDumbConnection(InputStream in)
break;
default:
- throw new TransportException(uri, "cannot read HEAD: " + status
- + " " + conn.getResponseMessage());
+ throw new TransportException(uri, MessageFormat.format(
+ JGitText.get().cannotReadHEAD, status, conn.getResponseMessage()));
}
}
@@ -292,11 +294,11 @@ public PushConnection openPush() throws NotSupportedException,
return new SmartHttpPushConnection(in);
} else if (!useSmartHttp) {
- final String msg = "smart HTTP push disabled";
+ final String msg = JGitText.get().smartHTTPPushDisabled;
throw new NotSupportedException(msg);
} else {
- final String msg = "remote does not support smart HTTP push";
+ final String msg = JGitText.get().remoteDoesNotSupportSmartHTTPPush;
throw new NotSupportedException(msg);
}
} finally {
@@ -307,7 +309,7 @@ public PushConnection openPush() throws NotSupportedException,
} catch (TransportException err) {
throw err;
} catch (IOException err) {
- throw new TransportException(uri, "error reading info/refs", err);
+ throw new TransportException(uri, JGitText.get().errorReadingInfoRefs, err);
}
}
@@ -335,7 +337,7 @@ private HttpURLConnection connect(final String service)
u = new URL(b.toString());
} catch (MalformedURLException e) {
- throw new NotSupportedException("Invalid URL " + uri, e);
+ throw new NotSupportedException(MessageFormat.format(JGitText.get().invalidURL, uri), e);
}
try {
@@ -352,10 +354,10 @@ private HttpURLConnection connect(final String service)
return conn;
case HttpURLConnection.HTTP_NOT_FOUND:
- throw new NoRemoteRepositoryException(uri, u + " not found");
+ throw new NoRemoteRepositoryException(uri, MessageFormat.format(JGitText.get().URLNotFound, u));
case HttpURLConnection.HTTP_FORBIDDEN:
- throw new TransportException(uri, service + " not permitted");
+ throw new TransportException(uri, MessageFormat.format(JGitText.get().serviceNotPermitted, service));
default:
String err = status + " " + conn.getResponseMessage();
@@ -366,7 +368,7 @@ private HttpURLConnection connect(final String service)
} catch (TransportException e) {
throw e;
} catch (IOException e) {
- throw new TransportException(uri, "cannot open " + service, e);
+ throw new TransportException(uri, MessageFormat.format(JGitText.get().cannotOpenService, service), e);
}
}
@@ -389,8 +391,7 @@ final InputStream openInputStream(HttpURLConnection conn)
}
IOException wrongContentType(String expType, String actType) {
- final String why = "expected Content-Type " + expType
- + "; received Content-Type " + actType;
+ final String why = MessageFormat.format(JGitText.get().expectedReceivedContentType, expType, actType);
return new TransportException(uri, why);
}
@@ -410,9 +411,8 @@ private void readSmartHeaders(final InputStream in, final String service)
final byte[] magic = new byte[5];
IO.readFully(in, magic, 0, magic.length);
if (magic[4] != '#') {
- throw new TransportException(uri, "expected pkt-line with"
- + " '# service=', got '" + RawParseUtils.decode(magic)
- + "'");
+ throw new TransportException(uri, MessageFormat.format(
+ JGitText.get().expectedPktLineWithService, RawParseUtils.decode(magic)));
}
final PacketLineIn pckIn = new PacketLineIn(new UnionInputStream(
@@ -420,8 +420,8 @@ private void readSmartHeaders(final InputStream in, final String service)
final String exp = "# service=" + service;
final String act = pckIn.readString();
if (!exp.equals(act)) {
- throw new TransportException(uri, "expected '" + exp + "', got '"
- + act + "'");
+ throw new TransportException(uri, MessageFormat.format(
+ JGitText.get().expectedGot, exp, act));
}
while (pckIn.readString() != PacketLineIn.END) {
@@ -546,16 +546,15 @@ Map<String, Ref> readAdvertisedImpl(final BufferedReader br)
}
private PackProtocolException outOfOrderAdvertisement(final String n) {
- return new PackProtocolException("advertisement of " + n
- + "^{} came before " + n);
+ return new PackProtocolException(MessageFormat.format(JGitText.get().advertisementOfCameBefore, n, n));
}
private PackProtocolException invalidAdvertisement(final String n) {
- return new PackProtocolException("invalid advertisement of " + n);
+ return new PackProtocolException(MessageFormat.format(JGitText.get().invalidAdvertisementOf, n));
}
private PackProtocolException duplicateAdvertisement(final String n) {
- return new PackProtocolException("duplicate advertisements of " + n);
+ return new PackProtocolException(MessageFormat.format(JGitText.get().duplicateAdvertisementsOf, n));
}
@Override
@@ -667,9 +666,8 @@ void execute() throws IOException {
// our request buffer. Send with a Content-Length header.
//
if (out.length() == 0) {
- throw new TransportException(uri, "Starting read stage"
- + " without written request data pending"
- + " is not supported");
+ throw new TransportException(uri,
+ JGitText.get().startingReadStageWithoutWrittenRequestDataPendingIsNotSupported);
}
// Try to compress the content, but only if that is smaller.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
index 22c436de3..cf4dbd539 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportLocal.java
@@ -56,6 +56,7 @@
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
@@ -175,7 +176,7 @@ class InternalLocalFetchConnection extends BasePackFetchConnection {
try {
dst = new Repository(remoteGitDir);
} catch (IOException err) {
- throw new TransportException(uri, "not a git directory");
+ throw new TransportException(uri, JGitText.get().notAGitDirectory);
}
final PipedInputStream in_r;
@@ -199,7 +200,7 @@ class InternalLocalFetchConnection extends BasePackFetchConnection {
out_w = new PipedOutputStream(out_r);
} catch (IOException err) {
dst.close();
- throw new TransportException(uri, "cannot connect pipes", err);
+ throw new TransportException(uri, JGitText.get().cannotConnectPipes, err);
}
worker = new Thread("JGit-Upload-Pack") {
@@ -315,7 +316,7 @@ class InternalLocalPushConnection extends BasePackPushConnection {
try {
dst = new Repository(remoteGitDir);
} catch (IOException err) {
- throw new TransportException(uri, "not a git directory");
+ throw new TransportException(uri, JGitText.get().notAGitDirectory);
}
final PipedInputStream in_r;
@@ -331,7 +332,7 @@ class InternalLocalPushConnection extends BasePackPushConnection {
out_w = new PipedOutputStream(out_r);
} catch (IOException err) {
dst.close();
- throw new TransportException(uri, "cannot connect pipes", err);
+ throw new TransportException(uri, JGitText.get().cannotConnectPipes, err);
}
worker = new Thread("JGit-Receive-Pack") {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
index 80b94b232..5939bc2f2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
@@ -50,6 +50,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
/**
@@ -107,7 +108,7 @@ public URIish(String s) throws URISyntaxException {
host = matcher.group(2);
path = matcher.group(3);
} else
- throw new URISyntaxException(s, "Cannot parse Git URI-ish");
+ throw new URISyntaxException(s, JGitText.get().cannotParseGitURIish);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index 3d5abd34b..3381c0724 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -54,6 +55,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.PackProtocolException;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
@@ -371,7 +373,7 @@ private void recvWants() throws IOException {
if (line == PacketLineIn.END)
break;
if (!line.startsWith("want ") || line.length() < 45)
- throw new PackProtocolException("expected want; got " + line);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().expectedGot, "want", line));
if (isFirst && line.length() > 45) {
String opt = line.substring(45);
@@ -387,10 +389,10 @@ private void recvWants() throws IOException {
try {
o = walk.parseAny(id);
} catch (IOException e) {
- throw new PackProtocolException(id.name() + " not valid", e);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().notValid, id.name()), e);
}
if (!o.has(ADVERTISED))
- throw new PackProtocolException(id.name() + " not valid");
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().notValid, id.name()));
want(o);
}
}
@@ -473,7 +475,7 @@ else if (multiAck != MultiAck.OFF)
return true;
} else {
- throw new PackProtocolException("expected have; got " + line);
+ throw new PackProtocolException(MessageFormat.format(JGitText.get().expectedGot, "have", line));
}
}
}
@@ -521,7 +523,7 @@ private boolean okToGiveUpImp() throws PackProtocolException {
i.remove();
}
} catch (IOException e) {
- throw new PackProtocolException("internal revision error", e);
+ throw new PackProtocolException(JGitText.get().internalRevisionError, e);
}
return wantCommits.isEmpty();
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java
index d368fb2cd..b55de9265 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java
@@ -51,6 +51,7 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
+import java.text.MessageFormat;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
@@ -61,6 +62,8 @@
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
+import org.eclipse.jgit.JGitText;
+
abstract class WalkEncryption {
static final WalkEncryption NONE = new NoEncryption();
@@ -84,18 +87,18 @@ protected void validateImpl(final HttpURLConnection u, final String p,
if (v == null)
v = "";
if (!version.equals(v))
- throw new IOException("Unsupported encryption version: " + v);
+ throw new IOException(MessageFormat.format(JGitText.get().unsupportedEncryptionVersion, v));
v = u.getHeaderField(p + JETS3T_CRYPTO_ALG);
if (v == null)
v = "";
if (!name.equals(v))
- throw new IOException("Unsupported encryption algorithm: " + v);
+ throw new IOException(JGitText.get().unsupportedEncryptionAlgorithm + v);
}
IOException error(final Throwable why) {
final IOException e;
- e = new IOException("Encryption error: " + why.getMessage());
+ e = new IOException(MessageFormat.format(JGitText.get().encryptionError, why.getMessage()));
e.initCause(why);
return e;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java
index ba4486144..625474547 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java
@@ -49,6 +49,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -58,6 +59,7 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CompoundException;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -261,7 +263,7 @@ private void queueWants(final Collection<Ref> want)
if (inWorkQueue.add(id))
workQueue.add(id);
} catch (IOException e) {
- throw new TransportException("Cannot read " + id.name(), e);
+ throw new TransportException(MessageFormat.format(JGitText.get().cannotRead, id.name()), e);
}
}
}
@@ -280,7 +282,7 @@ private void process(final ObjectId id) throws TransportException {
return;
}
} catch (IOException e) {
- throw new TransportException("Cannot read " + id.name(), e);
+ throw new TransportException(MessageFormat.format(JGitText.get().cannotRead, id.name()), e);
}
switch (obj.getType()) {
@@ -297,7 +299,7 @@ private void process(final ObjectId id) throws TransportException {
processTag(obj);
break;
default:
- throw new TransportException("Unknown object type " + id.name());
+ throw new TransportException(MessageFormat.format(JGitText.get().unknownObjectType, id.name()));
}
// If we had any prior errors fetching this object they are
@@ -308,7 +310,7 @@ private void process(final ObjectId id) throws TransportException {
private void processBlob(final RevObject obj) throws TransportException {
if (!local.hasObject(obj))
- throw new TransportException("Cannot read blob " + obj.name(),
+ throw new TransportException(MessageFormat.format(JGitText.get().cannotReadBlob, obj.name()),
new MissingObjectException(obj, Constants.TYPE_BLOB));
obj.add(COMPLETE);
}
@@ -331,14 +333,12 @@ private void processTree(final RevObject obj) throws TransportException {
if (FileMode.GITLINK.equals(mode))
continue;
treeWalk.getObjectId(idBuffer, 0);
- throw new CorruptObjectException("Invalid mode " + mode
- + " for " + idBuffer.name() + " "
- + treeWalk.getPathString() + " in "
- + obj.getId().name() + ".");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().invalidModeFor
+ , mode, idBuffer.name(), treeWalk.getPathString(), obj.getId().name()));
}
}
} catch (IOException ioe) {
- throw new TransportException("Cannot read tree " + obj.name(), ioe);
+ throw new TransportException(MessageFormat.format(JGitText.get().cannotReadTree, obj.name()), ioe);
}
obj.add(COMPLETE);
}
@@ -445,7 +445,7 @@ private void downloadObject(final ProgressMonitor pm, final AnyObjectId id)
List<Throwable> failures = fetchErrors.get(id.copy());
final TransportException te;
- te = new TransportException("Cannot get " + id.name() + ".");
+ te = new TransportException(MessageFormat.format(JGitText.get().cannotGet, id.name()));
if (failures != null && !failures.isEmpty()) {
if (failures.size() == 1)
te.initCause(failures.get(0));
@@ -521,8 +521,8 @@ private boolean downloadPackedObject(final ProgressMonitor monitor,
// the object, but after indexing we didn't
// actually find it in the pack.
//
- recordError(id, new FileNotFoundException("Object " + id.name()
- + " not found in " + pack.packName + "."));
+ recordError(id, new FileNotFoundException(MessageFormat.format(
+ JGitText.get().objectNotFoundIn, id.name(), pack.packName)));
continue;
}
@@ -565,7 +565,7 @@ private boolean downloadLooseObject(final AnyObjectId id,
recordError(id, e);
return false;
} catch (IOException e) {
- throw new TransportException("Cannot download " + id.name(), e);
+ throw new TransportException(MessageFormat.format(JGitText.get().cannotDownload, id.name()), e);
}
}
@@ -601,18 +601,15 @@ private void verifyLooseObject(final AnyObjectId id, final byte[] compressed)
idBuffer.fromRaw(objectDigest.digest(), 0);
if (!AnyObjectId.equals(id, idBuffer)) {
- throw new TransportException("Incorrect hash for " + id.name()
- + "; computed " + idBuffer.name() + " as a "
- + Constants.typeString(uol.getType()) + " from "
- + compressed.length + " bytes.");
+ throw new TransportException(MessageFormat.format(JGitText.get().incorrectHashFor
+ , id.name(), idBuffer.name(), Constants.typeString(uol.getType()), compressed.length));
}
if (objCheck != null) {
try {
objCheck.check(uol.getType(), uol.getCachedBytes());
} catch (CorruptObjectException e) {
- throw new TransportException("Invalid "
- + Constants.typeString(uol.getType()) + " "
- + id.name() + ":" + e.getMessage());
+ throw new TransportException(MessageFormat.format(JGitText.get().transportExceptionInvalid
+ , Constants.typeString(uol.getType()), id.name(), e.getMessage()));
}
}
}
@@ -650,7 +647,7 @@ private void saveLooseObject(final AnyObjectId id, final byte[] compressed)
tmp.delete();
if (local.hasObject(id))
return;
- throw new ObjectWritingException("Unable to store " + id.name() + ".");
+ throw new ObjectWritingException(MessageFormat.format(JGitText.get().unableToStore, id.name()));
}
private Collection<WalkRemoteObjectDatabase> expandOneAlternate(
@@ -658,7 +655,7 @@ private Collection<WalkRemoteObjectDatabase> expandOneAlternate(
while (!noAlternatesYet.isEmpty()) {
final WalkRemoteObjectDatabase wrr = noAlternatesYet.removeFirst();
try {
- pm.beginTask("Listing alternates", ProgressMonitor.UNKNOWN);
+ pm.beginTask(JGitText.get().listingAlternates, ProgressMonitor.UNKNOWN);
Collection<WalkRemoteObjectDatabase> altList = wrr
.getAlternates();
if (altList != null && !altList.isEmpty())
@@ -679,15 +676,14 @@ private void markLocalRefsComplete(final Set<ObjectId> have) throws TransportExc
try {
markLocalObjComplete(revWalk.parseAny(r.getObjectId()));
} catch (IOException readError) {
- throw new TransportException("Local ref " + r.getName()
- + " is missing object(s).", readError);
+ throw new TransportException(MessageFormat.format(JGitText.get().localRefIsMissingObjects, r.getName()), readError);
}
}
for (final ObjectId id : have) {
try {
markLocalObjComplete(revWalk.parseAny(id));
} catch (IOException readError) {
- throw new TransportException("Missing assumed "+id.name(), readError);
+ throw new TransportException(MessageFormat.format(JGitText.get().transportExceptionMissingAssumed, id.name()), readError);
}
}
}
@@ -726,7 +722,7 @@ private void markLocalCommitsComplete(final int until)
pushLocalCommit(p);
}
} catch (IOException err) {
- throw new TransportException("Local objects incomplete.", err);
+ throw new TransportException(JGitText.get().localObjectsIncomplete, err);
}
}
@@ -769,9 +765,8 @@ private void markTreeComplete(final RevTree tree) throws IOException {
if (FileMode.GITLINK.equals(mode))
continue;
treeWalk.getObjectId(idBuffer, 0);
- throw new CorruptObjectException("Invalid mode " + mode
- + " for " + idBuffer.name() + " "
- + treeWalk.getPathString() + " in " + tree.name() + ".");
+ throw new CorruptObjectException(MessageFormat.format(JGitText.get().corruptObjectInvalidMode3
+ , mode, idBuffer.name(), treeWalk.getPathString(), tree.name()));
}
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
index f977915bb..0edf9678e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
@@ -55,6 +55,7 @@
import java.util.Map;
import java.util.TreeMap;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
@@ -145,7 +146,7 @@ public void push(final ProgressMonitor monitor,
final String n = u.getRemoteName();
if (!n.startsWith("refs/") || !Repository.isValidRefName(n)) {
u.setStatus(Status.REJECTED_OTHER_REASON);
- u.setMessage("funny refname");
+ u.setMessage(JGitText.get().funnyRefname);
continue;
}
@@ -187,14 +188,14 @@ protected void writeFile(String file, byte[] content)
u.setStatus(Status.REJECTED_OTHER_REASON);
u.setMessage(err.getMessage());
}
- throw new TransportException(uri, "failed updating refs", err);
+ throw new TransportException(uri, JGitText.get().failedUpdatingRefs, err);
}
}
try {
refWriter.writeInfoRefs();
} catch (IOException err) {
- throw new TransportException(uri, "failed updating refs", err);
+ throw new TransportException(uri, JGitText.get().failedUpdatingRefs, err);
}
}
@@ -279,7 +280,7 @@ private void sendpack(final List<RemoteRefUpdate> updates,
safeDelete(pathIdx);
safeDelete(pathPack);
- throw new TransportException(uri, "cannot store objects", err);
+ throw new TransportException(uri, JGitText.get().cannotStoreObjects, err);
}
}
@@ -349,7 +350,7 @@ private void createNewRepository(final List<RemoteRefUpdate> updates)
final byte[] bytes = Constants.encode(ref);
dest.writeFile(ROOT_DIR + Constants.HEAD, bytes);
} catch (IOException e) {
- throw new TransportException(uri, "cannot create HEAD", e);
+ throw new TransportException(uri, JGitText.get().cannotCreateHEAD, e);
}
try {
@@ -358,7 +359,7 @@ private void createNewRepository(final List<RemoteRefUpdate> updates)
final byte[] bytes = Constants.encode(config);
dest.writeFile(ROOT_DIR + "config", bytes);
} catch (IOException e) {
- throw new TransportException(uri, "cannot create config", e);
+ throw new TransportException(uri, JGitText.get().cannotCreateConfig, e);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
index 2aa644ce8..f1743b378 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
@@ -50,10 +50,12 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
@@ -198,7 +200,7 @@ abstract WalkRemoteObjectDatabase openAlternate(String location)
* deletion is not supported, or deletion failed.
*/
void deleteFile(final String path) throws IOException {
- throw new IOException("Deleting '" + path + "' not supported.");
+ throw new IOException(MessageFormat.format(JGitText.get().deletingNotSupported, path));
}
/**
@@ -230,7 +232,7 @@ void deleteFile(final String path) throws IOException {
*/
OutputStream writeFile(final String path, final ProgressMonitor monitor,
final String monitorTask) throws IOException {
- throw new IOException("Writing of '" + path + "' not supported.");
+ throw new IOException(MessageFormat.format(JGitText.get().writingNotSupported, path));
}
/**
@@ -428,7 +430,7 @@ protected void readPackedRefs(final Map<String, Ref> avail)
} catch (FileNotFoundException notPacked) {
// Perhaps it wasn't worthwhile, or is just an older repository.
} catch (IOException e) {
- throw new TransportException(getURI(), "error in packed-refs", e);
+ throw new TransportException(getURI(), JGitText.get().errorInPackedRefs, e);
}
}
@@ -449,7 +451,7 @@ private void readPackedRefsImpl(final Map<String, Ref> avail,
}
if (line.charAt(0) == '^') {
if (last == null)
- throw new TransportException("Peeled line before ref.");
+ throw new TransportException(JGitText.get().peeledLineBeforeRef);
final ObjectId id = ObjectId.fromString(line.substring(1));
last = new ObjectIdRef.PeeledTag(Ref.Storage.PACKED, last
.getName(), last.getObjectId(), id);
@@ -459,7 +461,7 @@ private void readPackedRefsImpl(final Map<String, Ref> avail,
final int sp = line.indexOf(' ');
if (sp < 0)
- throw new TransportException("Unrecognized ref: " + line);
+ throw new TransportException(MessageFormat.format(JGitText.get().unrecognizedRef, line));
final ObjectId id = ObjectId.fromString(line.substring(0, sp));
final String name = line.substring(sp + 1);
if (peeled)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
index 6b8a6cea4..013e0edb3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
@@ -50,9 +50,11 @@
import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetEncoder;
import java.security.MessageDigest;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Comparator;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
@@ -373,7 +375,7 @@ void encodeName(final CharsetEncoder enc) {
b = enc.encode(CharBuffer.wrap(getName()));
} catch (CharacterCodingException e) {
// This should so never happen.
- throw new RuntimeException("Unencodeable file: " + getName());
+ throw new RuntimeException(MessageFormat.format(JGitText.get().unencodeableFile, getName()));
}
encodedNameLen = b.limit();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java
index 9a6156f08..12964bbe6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/AndTreeFilter.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.util.Collection;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -89,7 +90,7 @@ public static TreeFilter create(final TreeFilter[] list) {
if (list.length == 2)
return create(list[0], list[1]);
if (list.length < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final TreeFilter[] subfilters = new TreeFilter[list.length];
System.arraycopy(list, 0, subfilters, 0, list.length);
return new List(subfilters);
@@ -105,7 +106,7 @@ public static TreeFilter create(final TreeFilter[] list) {
*/
public static TreeFilter create(final Collection<TreeFilter> list) {
if (list.size() < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final TreeFilter[] subfilters = new TreeFilter[list.size()];
list.toArray(subfilters);
if (subfilters.length == 2)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java
index f14ceeab3..de5aa421a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/OrTreeFilter.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.util.Collection;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -87,7 +88,7 @@ public static TreeFilter create(final TreeFilter[] list) {
if (list.length == 2)
return create(list[0], list[1]);
if (list.length < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final TreeFilter[] subfilters = new TreeFilter[list.length];
System.arraycopy(list, 0, subfilters, 0, list.length);
return new List(subfilters);
@@ -103,7 +104,7 @@ public static TreeFilter create(final TreeFilter[] list) {
*/
public static TreeFilter create(final Collection<TreeFilter> list) {
if (list.size() < 2)
- throw new IllegalArgumentException("At least two filters needed.");
+ throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);
final TreeFilter[] subfilters = new TreeFilter[list.size()];
list.toArray(subfilters);
if (subfilters.length == 2)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
index 65451da8e..e31778984 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.treewalk.filter;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -76,7 +77,7 @@ public static PathFilter create(String path) {
while (path.endsWith("/"))
path = path.substring(0, path.length() - 1);
if (path.length() == 0)
- throw new IllegalArgumentException("Empty path not permitted.");
+ throw new IllegalArgumentException(JGitText.get().emptyPathNotPermitted);
return new PathFilter(path);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java
index e58512da3..756b00068 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java
@@ -48,6 +48,7 @@
import java.util.Collection;
import java.util.Comparator;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.StopWalkException;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -82,7 +83,7 @@ public class PathFilterGroup {
*/
public static TreeFilter createFromStrings(final Collection<String> paths) {
if (paths.isEmpty())
- throw new IllegalArgumentException("At least one path is required.");
+ throw new IllegalArgumentException(JGitText.get().atLeastOnePathIsRequired);
final PathFilter[] p = new PathFilter[paths.size()];
int i = 0;
for (final String s : paths)
@@ -103,7 +104,7 @@ public static TreeFilter createFromStrings(final Collection<String> paths) {
*/
public static TreeFilter create(final Collection<PathFilter> paths) {
if (paths.isEmpty())
- throw new IllegalArgumentException("At least one path is required.");
+ throw new IllegalArgumentException(JGitText.get().atLeastOnePathIsRequired);
final PathFilter[] p = new PathFilter[paths.size()];
paths.toArray(p);
return create(p);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
index 3721ec646..c4561c4d3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java
@@ -45,6 +45,7 @@
import java.io.IOException;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.Constants;
@@ -68,7 +69,7 @@ public class PathSuffixFilter extends TreeFilter {
*/
public static PathSuffixFilter create(String path) {
if (path.length() == 0)
- throw new IllegalArgumentException("Empty path not permitted.");
+ throw new IllegalArgumentException(JGitText.get().emptyPathNotPermitted);
return new PathSuffixFilter(path);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java
index 53c7beced..1c7d397e9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java
@@ -9,6 +9,9 @@
import java.io.Closeable;
import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
@@ -702,7 +705,7 @@ public static byte[] decode( byte[] source, int off, int len )
} // end if: white space, equals sign or better
else
{
- System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
+ System.err.println(MessageFormat.format(JGitText.get().badBase64InputCharacterAt, i+ source[i]));
return null;
} // end else:
} // each input character
@@ -925,7 +928,7 @@ public static byte[] decodeFromFile( String filename )
// Check for size of file
if( file.length() > Integer.MAX_VALUE )
{
- System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
+ System.err.println(MessageFormat.format(JGitText.get().fileIsTooBigForThisConvenienceMethod, file.length()));
return null;
} // end if: file too big for int index
buffer = new byte[ (int)file.length() ];
@@ -946,7 +949,7 @@ public static byte[] decodeFromFile( String filename )
} // end try
catch( java.io.IOException e )
{
- System.err.println( "Error decoding from file " + filename );
+ System.err.println(MessageFormat.format(JGitText.get().errorDecodingFromFile, filename));
} // end catch: IOException
finally
{
@@ -994,7 +997,7 @@ public static String encodeFromFile( String filename )
} // end try
catch( java.io.IOException e )
{
- System.err.println( "Error encoding from file " + filename );
+ System.err.println(MessageFormat.format(JGitText.get().errorEncodingFromFile, filename));
} // end catch: IOException
finally
{
@@ -1154,7 +1157,7 @@ else if( i == 0 ){
else
{
// Must have broken out from above.
- throw new java.io.IOException( "Improperly padded Base64 input." );
+ throw new java.io.IOException(JGitText.get().improperlyPaddedBase64Input);
} // end
} // end else: decode
@@ -1192,7 +1195,7 @@ else if( i == 0 ){
else
{
// When JDK1.4 is more accepted, use an assertion here.
- throw new java.io.IOException( "Error in Base64 code reading stream." );
+ throw new java.io.IOException(JGitText.get().errorInBase64CodeReadingStream);
} // end else
} // end read
@@ -1363,7 +1366,7 @@ public void write(int theByte) throws java.io.IOException
} // end if: meaningful base64 character
else if( DECODABET[ theByte & 0x7f ] != WHITE_SPACE_ENC )
{
- throw new java.io.IOException( "Invalid character in Base64 data." );
+ throw new java.io.IOException(JGitText.get().invalidCharacterInBase64Data);
} // end else: not white space either
} // end else: decoding
} // end write
@@ -1413,7 +1416,7 @@ public void flushBase64() throws java.io.IOException
} // end if: encoding
else
{
- throw new java.io.IOException( "Base64 input not properly padded." );
+ throw new java.io.IOException(JGitText.get().base64InputNotProperlyPadded);
} // end else: decoding
} // end if: buffer partially full
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
index 2532593ec..d3e1f6003 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
@@ -53,6 +53,9 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLEncoder;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/** Extra utilities to support usage of HTTP. */
public class HttpSupport {
@@ -133,7 +136,7 @@ public static void encode(final StringBuilder urlstr, final String key) {
try {
urlstr.append(URLEncoder.encode(key, "UTF-8"));
} catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Could not URL encode to UTF-8", e);
+ throw new RuntimeException(JGitText.get().couldNotURLEncodeToUTF8, e);
}
}
@@ -158,7 +161,7 @@ public static int response(final HttpURLConnection c) throws IOException {
// The standard J2SE error message is not very useful.
//
if ("Connection timed out: connect".equals(ce.getMessage()))
- throw new ConnectException("Connection time out: " + host);
+ throw new ConnectException(MessageFormat.format(JGitText.get().connectionTimeOut, host));
throw new ConnectException(ce.getMessage() + " " + host);
}
}
@@ -181,7 +184,7 @@ public static Proxy proxyFor(final ProxySelector proxySelector, final URL u)
return proxySelector.select(u.toURI()).get(0);
} catch (URISyntaxException e) {
final ConnectException err;
- err = new ConnectException("Cannot determine proxy for " + u);
+ err = new ConnectException(MessageFormat.format(JGitText.get().cannotDetermineProxyFor, u));
err.initCause(e);
throw err;
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java
index 566b85746..177865420 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java
@@ -53,6 +53,9 @@
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/**
* Input/Output utilities
@@ -95,7 +98,7 @@ public static final byte[] readFully(final File path, final int max)
try {
final long sz = in.getChannel().size();
if (sz > max)
- throw new IOException("File is too large: " + path);
+ throw new IOException(MessageFormat.format(JGitText.get().fileIsTooLarge, path));
final byte[] buf = new byte[(int) sz];
IO.readFully(in, buf, 0, buf.length);
return buf;
@@ -129,7 +132,7 @@ public static void readFully(final InputStream fd, final byte[] dst,
while (len > 0) {
final int r = fd.read(dst, off, len);
if (r <= 0)
- throw new EOFException("Short read of block.");
+ throw new EOFException(JGitText.get().shortReadOfBlock);
off += r;
len -= r;
}
@@ -158,7 +161,7 @@ public static void readFully(final FileChannel fd, long pos,
while (len > 0) {
final int r = fd.read(ByteBuffer.wrap(dst, off, len), pos);
if (r <= 0)
- throw new EOFException("Short read of block.");
+ throw new EOFException(JGitText.get().shortReadOfBlock);
pos += r;
off += r;
len -= r;
@@ -187,7 +190,7 @@ public static void skipFully(final InputStream fd, long toSkip)
while (toSkip > 0) {
final long r = fd.skip(toSkip);
if (r <= 0)
- throw new EOFException("Short skip of block");
+ throw new EOFException(JGitText.get().shortSkipOfBlock);
toSkip -= r;
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java
index 67d67b90c..f45bf2796 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java
@@ -44,6 +44,7 @@
package org.eclipse.jgit.util;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.Constants;
/**
@@ -67,7 +68,7 @@ public class RawSubStringPattern {
*/
public RawSubStringPattern(final String patternText) {
if (patternText.length() == 0)
- throw new IllegalArgumentException("Cannot match on empty string.");
+ throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);
needleString = patternText;
final byte[] b = Constants.encode(patternText);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
index 582dce8af..119c04157 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
@@ -43,6 +43,10 @@
package org.eclipse.jgit.util;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
+
/** Miscellaneous string comparison utility methods. */
public final class StringUtils {
private static final char[] LC;
@@ -135,7 +139,7 @@ public static boolean equalsIgnoreCase(final String a, final String b) {
*/
public static boolean toBoolean(final String stringValue) {
if (stringValue == null)
- throw new NullPointerException("Expected boolean string value");
+ throw new NullPointerException(JGitText.get().expectedBooleanStringValue);
if (equalsIgnoreCase("yes", stringValue)
|| equalsIgnoreCase("true", stringValue)
@@ -150,7 +154,7 @@ public static boolean toBoolean(final String stringValue) {
return false;
} else {
- throw new IllegalArgumentException("Not a boolean: " + stringValue);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().notABoolean, stringValue));
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java
index 95b3fa090..6c421c5f5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java
@@ -53,6 +53,7 @@
import java.io.OutputStream;
import java.util.ArrayList;
+import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ProgressMonitor;
@@ -196,7 +197,7 @@ public long length() {
public byte[] toByteArray() throws IOException {
final long len = length();
if (Integer.MAX_VALUE < len)
- throw new OutOfMemoryError("Length exceeds maximum array size");
+ throw new OutOfMemoryError(JGitText.get().lengthExceedsMaximumArraySize);
final byte[] out = new byte[(int) len];
int outPtr = 0;
for (final Block b : blocks) {
@@ -351,7 +352,7 @@ public byte[] toByteArray() throws IOException {
final long len = length();
if (Integer.MAX_VALUE < len)
- throw new OutOfMemoryError("Length exceeds maximum array size");
+ throw new OutOfMemoryError(JGitText.get().lengthExceedsMaximumArraySize);
final byte[] out = new byte[(int) len];
final FileInputStream in = new FileInputStream(onDiskFile);
try {
@@ -419,7 +420,7 @@ public Heap(final int limit) {
@Override
protected OutputStream overflow() throws IOException {
- throw new IOException("In-memory buffer limit exceeded");
+ throw new IOException(JGitText.get().inMemoryBufferLimitExceeded);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/DisabledOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/DisabledOutputStream.java
index e38660d63..d95849a76 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/DisabledOutputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/DisabledOutputStream.java
@@ -46,6 +46,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.eclipse.jgit.JGitText;
+
/** An OutputStream which always throws IllegalStateExeption during write. */
public final class DisabledOutputStream extends OutputStream {
/** The canonical instance which always throws IllegalStateException. */
@@ -61,6 +63,6 @@ public void write(int b) throws IOException {
// We shouldn't be writing output at this stage, there
// is nobody listening to us.
//
- throw new IllegalStateException("Writing not permitted");
+ throw new IllegalStateException(JGitText.get().writingNotPermitted);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/InterruptTimer.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/InterruptTimer.java
index 91aa1cb6d..575fa3ef0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/InterruptTimer.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/InterruptTimer.java
@@ -43,6 +43,10 @@
package org.eclipse.jgit.util.io;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
+
/**
* Triggers an interrupt on the calling thread if it doesn't complete a block.
* <p>
@@ -113,7 +117,7 @@ public InterruptTimer(final String threadName) {
*/
public void begin(final int timeout) {
if (timeout <= 0)
- throw new IllegalArgumentException("Invalid timeout: " + timeout);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidTimeout, timeout));
Thread.interrupted();
state.begin(timeout);
}
@@ -193,7 +197,7 @@ public synchronized void run() {
synchronized void begin(final int timeout) {
if (terminated)
- throw new IllegalStateException("Timer already terminated");
+ throw new IllegalStateException(JGitText.get().timerAlreadyTerminated);
callingThread = Thread.currentThread();
deadline = now() + timeout;
notifyAll();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutInputStream.java
index 19d7933e1..3670639c1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutInputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutInputStream.java
@@ -47,6 +47,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/** InputStream with a configurable timeout. */
public class TimeoutInputStream extends FilterInputStream {
@@ -80,7 +83,7 @@ public int getTimeout() {
*/
public void setTimeout(final int millis) {
if (millis < 0)
- throw new IllegalArgumentException("Invalid timeout: " + millis);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidTimeout, millis));
timeout = millis;
}
@@ -134,6 +137,6 @@ private void endRead() {
}
private static InterruptedIOException readTimedOut() {
- return new InterruptedIOException("Read timed out");
+ return new InterruptedIOException(JGitText.get().readTimedOut);
}
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutOutputStream.java
index a826086cd..59ac7b21e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutOutputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/TimeoutOutputStream.java
@@ -46,6 +46,9 @@
import java.io.IOException;
import java.io.InterruptedIOException;
import java.io.OutputStream;
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.JGitText;
/** OutputStream with a configurable timeout. */
public class TimeoutOutputStream extends OutputStream {
@@ -81,7 +84,7 @@ public int getTimeout() {
*/
public void setTimeout(final int millis) {
if (millis < 0)
- throw new IllegalArgumentException("Invalid timeout: " + millis);
+ throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidTimeout, millis));
timeout = millis;
}
@@ -147,6 +150,6 @@ private void endWrite() {
}
private static InterruptedIOException writeTimedOut() {
- return new InterruptedIOException("Write timed out");
+ return new InterruptedIOException(JGitText.get().writeTimedOut);
}
}
--
GitLab