Redo DiffFormatter API to be easier to use

Passing around the OutputStream and the Repository is crazy.  Instead
put the stream in the constructor, since this formatter exists only to
output to the stream, and put the repository as a member variable that
can be optionally set.

Change-Id: I2bad012fee7f40dc1346700ebd19f1e048982878
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2 files changed, 10 insertions, 9 deletions

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 a3fca638b5..32499618df 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
@@ -104,7 +104,8 @@ class Diff extends TextBuiltin {
 		fmt.setContext(lines);
 	}
 
-	private DiffFormatter fmt = new DiffFormatter() {
+	private DiffFormatter fmt = new DiffFormatter( //
+			new BufferedOutputStream(System.out)) {
 		@Override
 		protected RawText newRawText(byte[] raw) {
 			if (ignoreWsAll)
@@ -129,9 +130,9 @@ class Diff extends TextBuiltin {
 			out.flush();
 
 		} else {
-			BufferedOutputStream o = new BufferedOutputStream(System.out);
-			fmt.format(o, db, files);
-			o.flush();
+			fmt.setRepository(db);
+			fmt.format(files);
+			fmt.flush();
 		}
 	}
 
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 511da44984..aa4e8ae3cb 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
@@ -97,7 +97,8 @@ class Log extends RevWalkTextBuiltin {
 		diffFmt.setContext(lines);
 	}
 
-	private DiffFormatter diffFmt = new DiffFormatter();
+	private DiffFormatter diffFmt = new DiffFormatter( //
+			new BufferedOutputStream(System.out));
 
 	Log() {
 		fmt = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy ZZZZZ", Locale.US);
@@ -170,10 +171,9 @@ class Log extends RevWalkTextBuiltin {
 			Diff.nameStatus(out, files);
 
 		} else {
-			out.flush();
-			BufferedOutputStream o = new BufferedOutputStream(System.out);
-			diffFmt.format(o, db, files);
-			o.flush();
+			diffFmt.setRepository(db);
+			diffFmt.format(files);
+			diffFmt.flush();
 		}
 	}
 }