From 71c18201c1d438cc048060b61e4a1777ae9f9c1f Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Thu, 3 Jul 2014 22:06:46 +0200 Subject: [PATCH] Eliminate warning about overlapping variable names Change-Id: I7e749092c5b51e2857c186088e2c5c6c6d295367 --- .../tst/org/eclipse/jgit/diff/DiffFormatterTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index a18c4671d..60b746022 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -321,13 +321,13 @@ public class DiffFormatterTest extends RepositoryTestCase { write(new File(folder, "folder.txt"), "folder change"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter df = new DiffFormatter(new SafeBufferedOutputStream(os)); - df.setRepository(db); - df.setPathFilter(PathFilter.create("folder")); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); FileTreeIterator newTree = new FileTreeIterator(db); - df.format(oldTree, newTree); - df.flush(); + dfmt.format(oldTree, newTree); + dfmt.flush(); String actual = os.toString("UTF-8"); String expected =