Rename DiffStyleRangeFormatter and friends

Since the DiffStyleRangeFormatter no longer produces StyleRanges, let's
rename this class to DiffRegionFormatter. Also rename its range classes
to *Region and derive them from Region.

Change-Id: I142ae0550723e819163c6c50a3c4229aa99ce855
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffRegionFormatterTest.java
index a1f7b5616e..2d9f25b0e0 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffRegionFormatterTest.java
@@ -17,8 +17,8 @@ import java.io.File;
 
 import org.eclipse.egit.core.Activator;
 import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
-import org.eclipse.egit.ui.internal.commit.DiffStyleRangeFormatter;
-import org.eclipse.egit.ui.internal.commit.DiffStyleRangeFormatter.DiffStyleRange;
+import org.eclipse.egit.ui.internal.commit.DiffRegionFormatter;
+import org.eclipse.egit.ui.internal.commit.DiffRegionFormatter.DiffRegion;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jgit.lib.Constants;
@@ -29,9 +29,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Unit tests for {@link DiffStyleRangeFormatter}
+ * Unit tests for {@link DiffRegionFormatter}.
  */
-public class DiffStyleRangeFormatterTest extends LocalRepositoryTestCase {
+public class DiffRegionFormatterTest extends LocalRepositoryTestCase {
 
 	private Repository repository;
 
@@ -55,20 +55,20 @@ public class DiffStyleRangeFormatterTest extends LocalRepositoryTestCase {
 	@Test
 	public void testRanges() throws Exception {
 		IDocument document = new Document();
-		DiffStyleRangeFormatter formatter = new DiffStyleRangeFormatter(
+		DiffRegionFormatter formatter = new DiffRegionFormatter(
 				document);
 		formatter.setRepository(repository);
 		formatter.format(commit.getTree(), commit.getParent(0).getTree());
 		assertTrue(document.getLength() > 0);
-		DiffStyleRange[] ranges = formatter.getRanges();
-		assertNotNull(ranges);
-		assertTrue(ranges.length > 0);
-		for (DiffStyleRange range : ranges) {
-			assertNotNull(range);
-			assertNotNull(range.diffType);
-			assertTrue(range.start >= 0);
-			assertTrue(range.length >= 0);
-			assertTrue(range.start < document.getLength());
+		DiffRegion[] regions = formatter.getRegions();
+		assertNotNull(regions);
+		assertTrue(regions.length > 0);
+		for (DiffRegion region : regions) {
+			assertNotNull(region);
+			assertNotNull(region.diffType);
+			assertTrue(region.getOffset() >= 0);
+			assertTrue(region.getLength() >= 0);
+			assertTrue(region.getOffset() < document.getLength());
 		}
 
 	}