From f5e5b98c3a993873bfbdd19ef28d14f8ccca4b0c Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sun, 17 Oct 2010 22:21:38 -0700 Subject: [PATCH] IndexPack: Make translated progress messages non-static These messages may need to change depending on the current thread's configured locale, and thus cannot be static. Change-Id: I96751a63852ec9c4bf6c47edadcf8752700543df Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/transport/IndexPack.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 f5cdac988..716416a36 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java @@ -84,12 +84,6 @@ import org.eclipse.jgit.util.NB; /** 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 = JGitText.get().receivingObjects; - - /** Progress message when computing names of delta compressed objects. */ - public static final String PROGRESS_RESOLVE_DELTA = JGitText.get().resolvingDeltas; - /** * Size of the internal stream buffer. *

@@ -404,7 +398,8 @@ public class IndexPack { baseById = new ObjectIdSubclassMap(); baseByPos = new LongMap(); - progress.beginTask(PROGRESS_DOWNLOAD, (int) objectCount); + progress.beginTask(JGitText.get().receivingObjects, + (int) objectCount); for (int done = 0; done < objectCount; done++) { indexOneObject(); progress.update(1); @@ -473,7 +468,7 @@ public class IndexPack { private void resolveDeltas(final ProgressMonitor progress) throws IOException { - progress.beginTask(PROGRESS_RESOLVE_DELTA, deltaCount); + progress.beginTask(JGitText.get().resolvingDeltas, deltaCount); final int last = entryCount; for (int i = 0; i < last; i++) { final int before = entryCount;