From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 18 Oct 2010 05:21:38 +0000 (-0700)
Subject: IndexPack: Make translated progress messages non-static
X-Git-Tag: v0.10.1~145
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F1759%2F1;p=jgit.git

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 <spearce@spearce.org>
---

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 f5cdac9883..716416a367 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.
 	 * <p>
@@ -404,7 +398,8 @@ public class IndexPack {
 				baseById = new ObjectIdSubclassMap<DeltaChain>();
 				baseByPos = new LongMap<UnresolvedDelta>();
 
-				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;