motiejus
/
jgit
1
Fork 0
Code Releases Activity

Remove static progress task names from PackWriter 

These need to be dynamic based on the current thread's environment
at time of execution in order to be properly localized for the end
user that will be seeing these messages.

Change-Id: I4976f462cfe606edd2761c0e36b2f6b20f63d53c
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-07-28 10:48:04 -07:00
parent 396fe6da45
commit 21f76c2a69
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
View File

@ -123,29 +123,6 @@
* </p>
*/
public class PackWriter {
/**
* Title of {@link ProgressMonitor} task used during counting objects to
* pack.
*
* @see #preparePack(ProgressMonitor, Collection, Collection)
*/
public static final String COUNTING_OBJECTS_PROGRESS = JGitText.get().countingObjects;
/**
* Title of {@link ProgressMonitor} task used during compression.
*
* @see #writePack(ProgressMonitor, ProgressMonitor, OutputStream)
*/
public static final String COMPRESSING_OBJECTS_PROGRESS = JGitText.get().compressingObjects;
/**
* Title of {@link ProgressMonitor} task used during writing out pack
* (objects)
*
* @see #writePack(ProgressMonitor, ProgressMonitor, OutputStream)
*/
public static final String WRITING_OBJECTS_PROGRESS = JGitText.get().writingObjects;
/**
* Default value of deltas reuse option.
*
@ -838,9 +815,7 @@ private List<ObjectToPack> sortByName() {
* <p>
* At first, this method collects and sorts objects to pack, then deltas
* search is performed if set up accordingly, finally pack stream is
* written. {@link ProgressMonitor} tasks {@link #COMPRESSING_OBJECTS_PROGRESS}
* (only if reuseDeltas or reuseObjects is enabled) and
* {@link #WRITING_OBJECTS_PROGRESS} are updated during packing.
* written.
* </p>
* <p>
* All reused objects data checksum (Adler32/CRC32) is computed and
@ -875,8 +850,9 @@ public void writePack(ProgressMonitor compressMonitor,
final PackOutputStream out = new PackOutputStream(writeMonitor,
packStream, this);
writeMonitor.beginTask(WRITING_OBJECTS_PROGRESS, getObjectsNumber());
out.writeFileHeader(PACK_VERSION_GENERATED, getObjectsNumber());
int objCnt = getObjectsNumber();
writeMonitor.beginTask(JGitText.get().writingObjects, objCnt);
out.writeFileHeader(PACK_VERSION_GENERATED, objCnt);
writeObjects(writeMonitor, out);
writeChecksum(out);
@ -935,7 +911,7 @@ private void searchForDeltas(ProgressMonitor monitor)
}
}
monitor.beginTask(COMPRESSING_OBJECTS_PROGRESS, cnt);
monitor.beginTask(JGitText.get().compressingObjects, cnt);
// Sort the objects by path hash so like files are near each other,
// and then by size descending so that bigger files are first. This
@ -1315,7 +1291,7 @@ private ObjectWalk setUpWalker(
private void findObjectsToPack(final ProgressMonitor countingMonitor,
final ObjectWalk walker) throws MissingObjectException,
IncorrectObjectTypeException, IOException {
countingMonitor.beginTask(COUNTING_OBJECTS_PROGRESS,
countingMonitor.beginTask(JGitText.get().countingObjects,
ProgressMonitor.UNKNOWN);
RevObject o;