fixed #38198

12 files changed, 36 insertions, 88 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 75fec62db..543fd08e6 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -18,6 +18,7 @@ Problem reports fixed</h2>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=37531">#37531</a>: the javadoc of CompareViewerPane.setImage(Image)<br>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38262">#38262</a>: Apply patch applies unchecked changes<br>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=36399">#36399</a>: Compare did retrieve entire remote ZIP contents on selection change<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38198">#38198</a>: TVT21:  Strings are not externalized<br>
 
 <h1>
 <hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 9b5496af0..9bfc8798e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -274,9 +274,9 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		
 		fPreviewViewer.setInput(
 			new DiffNode(Differencer.CONFLICTING,
-				new FakeInput("previewAncestor.txt"),	//$NON-NLS-1$
-				new FakeInput("previewLeft.txt"),	//$NON-NLS-1$
-				new FakeInput("previewRight.txt")	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewAncestor"),	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewLeft"),	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewRight")	//$NON-NLS-1$
 			)
 		);
 
@@ -330,26 +330,17 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		return checkBox;
 	}
 	
-	private String loadPreviewContentFromFile(String filename) {
+	private String loadPreviewContentFromFile(String key) {
+		
+		String preview= Utilities.getString(key);
 		String separator= System.getProperty("line.separator"); //$NON-NLS-1$
-		StringBuffer buffer= new StringBuffer(512);
-		BufferedReader reader= null;
-		try {
-			reader= new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(filename)));
-			String line;
-			while ((line= reader.readLine()) != null) {
-				buffer.append(line);
+		StringBuffer buffer= new StringBuffer();
+		for (int i= 0; i < preview.length(); i++) {
+			char c= preview.charAt(i);
+			if (c == '\n')
 				buffer.append(separator);
-			}
-		} catch (IOException io) {
-			CompareUIPlugin.log(io);
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException e) {
-				}
-			}
+			else
+				buffer.append(c);
 		}
 		return buffer.toString();
 	}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt
deleted file mode 100644
index fbc5599cd..000000000
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-1
-2
-3
-conflict
-4
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt
deleted file mode 100644
index b1849b6fa..000000000
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-2
-outgoing addition
-3
-outgoing change
-4
-pseudo conflict
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt
deleted file mode 100644
index acbf082c0..000000000
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1
-incoming addition
-incoming addition
-2
-3
-incoming change
-4
-pseudo conflict
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index 4c7b6e640..bb3643673 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -118,6 +118,11 @@ ComparePreferencePage.backgroundColor1.label= Bac&kground Color:
 ComparePreferencePage.backgroundColor2.label= S&ystem Default
 ComparePreferencePage.backgroundColor3.label= C&ustom
 
+# Compare editor contents for Compare preview page
+ComparePreferencePage.previewAncestor= 1\n2\n3\nconflict\n4\n5
+ComparePreferencePage.previewLeft= 1\n2\noutgoing addition\n3\noutgoing change\n4\npseudo conflict\n5
+ComparePreferencePage.previewRight= 1\nincoming addition\nincoming addition\n2\n3\nincoming change\n4\npseudo conflict\n5
+
 compareFontDefiniton.label= Compare Text Font
 compareFontDefiniton.description= The compare text font is used by textual compare/merge editors.
 
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 75fec62db..543fd08e6 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -18,6 +18,7 @@ Problem reports fixed</h2>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=37531">#37531</a>: the javadoc of CompareViewerPane.setImage(Image)<br>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38262">#38262</a>: Apply patch applies unchecked changes<br>
 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=36399">#36399</a>: Compare did retrieve entire remote ZIP contents on selection change<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38198">#38198</a>: TVT21:  Strings are not externalized<br>
 
 <h1>
 <hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 9b5496af0..9bfc8798e 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -274,9 +274,9 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		
 		fPreviewViewer.setInput(
 			new DiffNode(Differencer.CONFLICTING,
-				new FakeInput("previewAncestor.txt"),	//$NON-NLS-1$
-				new FakeInput("previewLeft.txt"),	//$NON-NLS-1$
-				new FakeInput("previewRight.txt")	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewAncestor"),	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewLeft"),	//$NON-NLS-1$
+				new FakeInput("ComparePreferencePage.previewRight")	//$NON-NLS-1$
 			)
 		);
 
@@ -330,26 +330,17 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		return checkBox;
 	}
 	
-	private String loadPreviewContentFromFile(String filename) {
+	private String loadPreviewContentFromFile(String key) {
+		
+		String preview= Utilities.getString(key);
 		String separator= System.getProperty("line.separator"); //$NON-NLS-1$
-		StringBuffer buffer= new StringBuffer(512);
-		BufferedReader reader= null;
-		try {
-			reader= new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(filename)));
-			String line;
-			while ((line= reader.readLine()) != null) {
-				buffer.append(line);
+		StringBuffer buffer= new StringBuffer();
+		for (int i= 0; i < preview.length(); i++) {
+			char c= preview.charAt(i);
+			if (c == '\n')
 				buffer.append(separator);
-			}
-		} catch (IOException io) {
-			CompareUIPlugin.log(io);
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException e) {
-				}
-			}
+			else
+				buffer.append(c);
 		}
 		return buffer.toString();
 	}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt
deleted file mode 100644
index fbc5599cd..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewAncestor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-1
-2
-3
-conflict
-4
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt
deleted file mode 100644
index b1849b6fa..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewLeft.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-2
-outgoing addition
-3
-outgoing change
-4
-pseudo conflict
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt
deleted file mode 100644
index acbf082c0..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/previewRight.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1
-incoming addition
-incoming addition
-2
-3
-incoming change
-4
-pseudo conflict
-5
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index 4c7b6e640..bb3643673 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -118,6 +118,11 @@ ComparePreferencePage.backgroundColor1.label= Bac&kground Color:
 ComparePreferencePage.backgroundColor2.label= S&ystem Default
 ComparePreferencePage.backgroundColor3.label= C&ustom
 
+# Compare editor contents for Compare preview page
+ComparePreferencePage.previewAncestor= 1\n2\n3\nconflict\n4\n5
+ComparePreferencePage.previewLeft= 1\n2\noutgoing addition\n3\noutgoing change\n4\npseudo conflict\n5
+ComparePreferencePage.previewRight= 1\nincoming addition\nincoming addition\n2\n3\nincoming change\n4\npseudo conflict\n5
+
 compareFontDefiniton.label= Compare Text Font
 compareFontDefiniton.description= The compare text font is used by textual compare/merge editors.