Bind 'result' string for internationalization

3 files changed, 25 insertions, 25 deletions

diff --git a/examples/org.eclipse.swt.examples/examples_control.properties b/examples/org.eclipse.swt.examples/examples_control.properties
index 73c5e94a4e..32c52bf4cb 100755
--- a/examples/org.eclipse.swt.examples/examples_control.properties
+++ b/examples/org.eclipse.swt.examples/examples_control.properties
@@ -70,7 +70,7 @@ Images_failed		= Warning: Failed to load images
 readme_txt			= readme.txt
 Index				= Index:
 Title				= Title:
-Result				= Result:
+Result				= Result: {0}
 FilterName_0		= Text Files
 FilterName_1		= Batch Files
 FilterName_2		= Doc Files
diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/DialogTab.java
index 8b362fc42a..d89bf0a7e6 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/DialogTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/DialogTab.java
@@ -109,7 +109,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			RGB result = dialog.open ();

 			textWidget.append (instance.getResourceString("ColorDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -119,7 +119,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			String result = dialog.open ();

 			textWidget.append (instance.getResourceString("DirectoryDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -131,7 +131,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			String result = dialog.open();

 			textWidget.append (instance.getResourceString("FileDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -140,7 +140,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			FontData result = dialog.open ();

 			textWidget.append (instance.getResourceString("FontDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 	

@@ -156,28 +156,28 @@ class DialogTab extends Tab {
 			 */

 			switch (result) {

 				case SWT.OK:

-					textWidget.append (instance.getResourceString("Result") + "SWT.OK");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.OK"}));

 					break;

 				case SWT.YES:

-					textWidget.append (instance.getResourceString("Result") + "SWT.YES");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.YES"}));

 					break;

 				case SWT.NO:

-					textWidget.append (instance.getResourceString("Result") + "SWT.NO");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.NO"}));

 					break;

 				case SWT.CANCEL:

-					textWidget.append (instance.getResourceString("Result") + "SWT.CANCEL");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.CANCEL"}));

 					break;

 				case SWT.ABORT: 

-					textWidget.append (instance.getResourceString("Result") + "SWT.ABORT");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.ABORT"}));

 					break;

 				case SWT.RETRY:

-					textWidget.append (instance.getResourceString("Result") + "SWT.RETRY");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.RETRY"}));

 					break;

 				case SWT.IGNORE:

-					textWidget.append (instance.getResourceString("Result") + "SWT.IGNORE");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.IGNORE"}));

 					break;

 				default:

-					textWidget.append(instance.getResourceString("Result") + result);

+					textWidget.append(instance.getResourceString("Result", new String [] {"" + result}));

 					break;

 			}

 			textWidget.append (Text.DELIMITER + Text.DELIMITER);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
index 8b362fc42a..d89bf0a7e6 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
@@ -109,7 +109,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			RGB result = dialog.open ();

 			textWidget.append (instance.getResourceString("ColorDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -119,7 +119,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			String result = dialog.open ();

 			textWidget.append (instance.getResourceString("DirectoryDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -131,7 +131,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			String result = dialog.open();

 			textWidget.append (instance.getResourceString("FileDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 		

@@ -140,7 +140,7 @@ class DialogTab extends Tab {
 			dialog.setText (instance.getResourceString("Title"));

 			FontData result = dialog.open ();

 			textWidget.append (instance.getResourceString("FontDialog") + Text.DELIMITER);

-			textWidget.append (instance.getResourceString("Result") + " " + result + Text.DELIMITER + Text.DELIMITER);

+			textWidget.append (instance.getResourceString("Result", new String [] {"" + result}) + Text.DELIMITER + Text.DELIMITER);

 			return;

 		}

 	

@@ -156,28 +156,28 @@ class DialogTab extends Tab {
 			 */

 			switch (result) {

 				case SWT.OK:

-					textWidget.append (instance.getResourceString("Result") + "SWT.OK");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.OK"}));

 					break;

 				case SWT.YES:

-					textWidget.append (instance.getResourceString("Result") + "SWT.YES");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.YES"}));

 					break;

 				case SWT.NO:

-					textWidget.append (instance.getResourceString("Result") + "SWT.NO");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.NO"}));

 					break;

 				case SWT.CANCEL:

-					textWidget.append (instance.getResourceString("Result") + "SWT.CANCEL");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.CANCEL"}));

 					break;

 				case SWT.ABORT: 

-					textWidget.append (instance.getResourceString("Result") + "SWT.ABORT");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.ABORT"}));

 					break;

 				case SWT.RETRY:

-					textWidget.append (instance.getResourceString("Result") + "SWT.RETRY");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.RETRY"}));

 					break;

 				case SWT.IGNORE:

-					textWidget.append (instance.getResourceString("Result") + "SWT.IGNORE");

+					textWidget.append (instance.getResourceString("Result", new String [] {"SWT.IGNORE"}));

 					break;

 				default:

-					textWidget.append(instance.getResourceString("Result") + result);

+					textWidget.append(instance.getResourceString("Result", new String [] {"" + result}));

 					break;

 			}

 			textWidget.append (Text.DELIMITER + Text.DELIMITER);