CacheRegion: fix non translatable text warnings Change-Id: I163957653b075f1f05a6219f4d23b340588ffcbd

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index f8c8eca..27270a1 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties

@@ -76,6 +76,7 @@
 buildingBitmaps=Building bitmaps
 cachedPacksPreventsIndexCreation=Using cached packs prevents index creation
 cachedPacksPreventsListingObjects=Using cached packs prevents listing objects
+cacheRegionAllOrNoneNull=expected all null or none: {0}, {1}
 cannotAccessLastModifiedForSafeDeletion=Unable to access lastModifiedTime of file {0}, skip deletion since we cannot safely avoid race condition
 cannotBeCombined=Cannot be combined.
 cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java
index 6aa4eef..cf3f978 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java

@@ -9,6 +9,9 @@
  */
 package org.eclipse.jgit.blame.cache;
 
+import java.text.MessageFormat;
+
+import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.ObjectId;
 
 /**
@@ -92,6 +95,7 @@ public int compareTo(CacheRegion o) {
 		return start - o.start;
 	}
 
+	@SuppressWarnings("nls")
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
@@ -115,7 +119,7 @@ private static void allOrNoneNull(String path, ObjectId commit) {
 		if (path == null && commit == null) {
 			return;
 		}
-		throw new IllegalArgumentException(String.format(
-				"expected all null or none: %s, %s", path, commit));
+		throw new IllegalArgumentException(MessageFormat
+				.format(JGitText.get().cacheRegionAllOrNoneNull, path, commit));
 	}
 }

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 91ce347..bf252f9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

@@ -106,6 +106,7 @@ public static JGitText get() {
 	/***/ public String buildingBitmaps;
 	/***/ public String cachedPacksPreventsIndexCreation;
 	/***/ public String cachedPacksPreventsListingObjects;
+	/***/ public String cacheRegionAllOrNoneNull;
 	/***/ public String cannotAccessLastModifiedForSafeDeletion;
 	/***/ public String cannotBeCombined;
 	/***/ public String cannotBeRecursiveWhenTreesAreIncluded;