Removed unnecessary internationalization.

24 files changed, 190 insertions, 190 deletions

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ButtonTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ButtonTab.java
index 76bd2434ea..81595f3bd3 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ButtonTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ButtonTab.java
@@ -117,17 +117,17 @@ class ButtonTab extends AlignableTab {
 	

 		/* Create the extra widgets */

 		pushButton = new Button (styleGroup, SWT.RADIO);

-		pushButton.setText(ControlExample.getResourceString("SWT_PUSH"));

+		pushButton.setText("SWT.PUSH");

 		checkButton = new Button (styleGroup, SWT.RADIO);

-		checkButton.setText (ControlExample.getResourceString("SWT_CHECK"));

+		checkButton.setText ("SWT.CHECK");

 		radioButton = new Button (styleGroup, SWT.RADIO);

-		radioButton.setText (ControlExample.getResourceString("SWT_RADIO"));

+		radioButton.setText ("SWT.RADIO");

 		toggleButton = new Button (styleGroup, SWT.RADIO);

-		toggleButton.setText (ControlExample.getResourceString("SWT_TOGGLE"));

+		toggleButton.setText ("SWT.TOGGLE");

 		arrowButton = new Button (styleGroup, SWT.RADIO);

-		arrowButton.setText (ControlExample.getResourceString("SWT_ARROW"));

+		arrowButton.setText ("SWT.ARROW");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ComboTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ComboTab.java
index 88ed7db221..0e81248372 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ComboTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ComboTab.java
@@ -78,13 +78,13 @@ class ComboTab extends Tab {
 	

 		/* Create the extra widgets */

 		dropDownButton = new Button (styleGroup, SWT.RADIO);

-		dropDownButton.setText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		dropDownButton.setText ("SWT.DROP_DOWN");

 		simpleButton = new Button (styleGroup, SWT.RADIO);

-		simpleButton.setText(ControlExample.getResourceString("SWT_SIMPLE"));

+		simpleButton.setText("SWT.SIMPLE");

 		readOnlyButton = new Button (styleGroup, SWT.CHECK);

-		readOnlyButton.setText (ControlExample.getResourceString("SWT_READ_ONLY"));

+		readOnlyButton.setText ("SWT.READ_ONLY");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/CoolBarTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/CoolBarTab.java
index 5843469802..5af719c32a 100644
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/CoolBarTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/CoolBarTab.java
@@ -52,20 +52,20 @@ class CoolBarTab extends Tab {
 		ToolBar toolBar = new ToolBar (coolBar, toolBarStyle);

 		ToolItem item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.SEPARATOR);

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));		

+		item.setToolTipText ("SWT.PUSH");		

 		pushItem = new CoolItem (coolBar, SWT.NULL);

 		pushItem.setControl (toolBar);

 		Point pushSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -76,11 +76,11 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener (new DropDownSelectionListener());

 		item = new ToolItem (toolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener (new DropDownSelectionListener());

 		dropDownItem = new CoolItem (coolBar, SWT.NULL);

 		dropDownItem.setControl (toolBar);

@@ -92,13 +92,13 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		radioItem = new CoolItem (coolBar, SWT.NULL);

 		radioItem.setControl (toolBar);

 		Point radioSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -109,16 +109,16 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		checkItem = new CoolItem (coolBar, SWT.NULL);

 		checkItem.setControl (toolBar);

 		Point checkSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -159,7 +159,7 @@ class CoolBarTab extends Tab {
 	

 		/* Create the extra widget */

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

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 ea5f8f5db8..8b362fc42a 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
@@ -156,25 +156,25 @@ class DialogTab extends Tab {
 			 */

 			switch (result) {

 				case SWT.OK:

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

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

 					break;

 				case SWT.YES:

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

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

 					break;

 				case SWT.NO:

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

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

 					break;

 				case SWT.CANCEL:

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

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

 					break;

 				case SWT.ABORT: 

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

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

 					break;

 				case SWT.RETRY:

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

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

 					break;

 				case SWT.IGNORE:

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

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

 					break;

 				default:

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

@@ -243,19 +243,19 @@ class DialogTab extends Tab {
 	

 		/* Create the button style buttons */

 		okButton = new Button (buttonStyleGroup, SWT.CHECK);

-		okButton.setText (instance.getResourceString("SWT_OK"));

+		okButton.setText ("SWT.OK");

 		cancelButton = new Button (buttonStyleGroup, SWT.CHECK);

-		cancelButton.setText (instance.getResourceString("SWT_CANCEL"));

+		cancelButton.setText ("SWT.CANCEL");

 		yesButton = new Button (buttonStyleGroup, SWT.CHECK);

-		yesButton.setText (instance.getResourceString("SWT_YES"));

+		yesButton.setText ("SWT.YES");

 		noButton = new Button (buttonStyleGroup, SWT.CHECK);

-		noButton.setText (instance.getResourceString("SWT_NO"));

+		noButton.setText ("SWT.NO");

 		retryButton = new Button (buttonStyleGroup, SWT.CHECK);

-		retryButton.setText (instance.getResourceString("SWT_RETRY"));

+		retryButton.setText ("SWT.RETRY");

 		abortButton = new Button (buttonStyleGroup, SWT.CHECK);

-		abortButton.setText (instance.getResourceString("SWT_ABORT"));

+		abortButton.setText ("SWT.ABORT");

 		ignoreButton = new Button (buttonStyleGroup, SWT.CHECK);

-		ignoreButton.setText (instance.getResourceString("SWT_IGNORE"));

+		ignoreButton.setText ("SWT.IGNORE");

 	

 		/* Create a group for the icon style controls */

 		Group iconStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -265,15 +265,15 @@ class DialogTab extends Tab {
 	

 		/* Create the icon style buttons */

 		iconErrorButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconErrorButton.setText (instance.getResourceString("SWT_ICON_ERROR"));

+		iconErrorButton.setText ("SWT.ICON_ERROR");

 		iconInformationButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconInformationButton.setText (instance.getResourceString("SWT_ICON_INFORMATION"));

+		iconInformationButton.setText ("SWT.ICON_INFORMATION");

 		iconQuestionButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconQuestionButton.setText (instance.getResourceString("SWT_ICON_QUESTION"));

+		iconQuestionButton.setText ("SWT.ICON_QUESTION");

 		iconWarningButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconWarningButton.setText (instance.getResourceString("SWT_ICON_WARNING"));

+		iconWarningButton.setText ("SWT.ICON_WARNING");

 		iconWorkingButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconWorkingButton.setText (instance.getResourceString("SWT_ICON_WORKING"));

+		iconWorkingButton.setText ("SWT.ICON_WORKING");

 	

 		/* Create a group for the modal style controls */

 		Group modalStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -283,13 +283,13 @@ class DialogTab extends Tab {
 	

 		/* Create the modal style buttons */

 		modelessButton = new Button (modalStyleGroup, SWT.RADIO);

-		modelessButton.setText (instance.getResourceString("SWT_MODELESS"));

+		modelessButton.setText ("SWT.MODELESS");

 		primaryModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		primaryModalButton.setText (instance.getResourceString("SWT_PRIMARY_MODAL"));

+		primaryModalButton.setText ("SWT.PRIMARY_MODAL");

 		applicationModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		applicationModalButton.setText (instance.getResourceString("SWT_APPLICATION_MODAL"));

+		applicationModalButton.setText ("SWT.APPLICATION_MODAL");

 		systemModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		systemModalButton.setText (instance.getResourceString("SWT_SYSTEM_MODAL"));

+		systemModalButton.setText ("SWT.SYSTEM_MODAL");

 	

 		/* Create a group for the file dialog style controls */

 		Group fileDialogStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -299,9 +299,9 @@ class DialogTab extends Tab {
 	

 		/* Create the file dialog style buttons */

 		saveButton = new Button (fileDialogStyleGroup, SWT.RADIO);

-		saveButton.setText (instance.getResourceString("SWT_SAVE"));

+		saveButton.setText ("SWT.SAVE");

 		openButton = new Button(fileDialogStyleGroup, SWT.RADIO);

-		openButton.setText(instance.getResourceString("SWT_OPEN"));

+		openButton.setText("SWT.OPEN");

 	

 		/* Add the listeners */

 		dialogCombo.addSelectionListener (new SelectionAdapter () {

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/LabelTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/LabelTab.java
index 64363bd151..09e9a858f8 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/LabelTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/LabelTab.java
@@ -86,19 +86,19 @@ class LabelTab extends AlignableTab {
 		

 		/* Create the extra widgets */

 		separatorButton = new Button (styleGroup, SWT.CHECK);

-		separatorButton.setText (ControlExample.getResourceString("SWT_SEPARATOR"));

+		separatorButton.setText ("SWT.SEPARATOR");

 		horizontalButton = new Button (styleGroup, SWT.RADIO);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_HORIZONTAL"));

+		horizontalButton.setText ("SWT.HORIZONTAL");

 		verticalButton = new Button (styleGroup, SWT.RADIO);

-		verticalButton.setText (ControlExample.getResourceString("SWT_VERTICAL"));

+		verticalButton.setText ("SWT.VERTICAL");

 		Group styleSubGroup = new Group (styleGroup, SWT.NULL);

 		styleSubGroup.setLayout (new GridLayout ());

 		shadowInButton = new Button (styleSubGroup, SWT.RADIO);

-		shadowInButton.setText (ControlExample.getResourceString("SWT_SHADOW_IN"));

+		shadowInButton.setText ("SWT.SHADOW_IN");

 		shadowOutButton = new Button (styleSubGroup, SWT.RADIO);

-		shadowOutButton.setText (ControlExample.getResourceString("SWT_SHADOW_OUT"));

+		shadowOutButton.setText ("SWT.SHADOW_OUT");

 		borderButton = new Button(styleGroup, SWT.CHECK);

-		borderButton.setText(ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText("SWT.BORDER");

 	

 		/* Add the listeners */

 		SelectionListener selectionListener = new SelectionAdapter () {

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ProgressBarTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
index 397ff26896..3abf065c10 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
@@ -65,7 +65,7 @@ class ProgressBarTab extends RangeTab {
 	

 		/* Create the extra widgets */

 		smoothButton = new Button (styleGroup, SWT.CHECK);

-		smoothButton.setText (ControlExample.getResourceString("SWT_SMOOTH"));

+		smoothButton.setText ("SWT.SMOOTH");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/RangeTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/RangeTab.java
index a257410f66..cc95179322 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/RangeTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/RangeTab.java
@@ -128,11 +128,11 @@ abstract class RangeTab extends Tab {
 	

 		/* Create the extra widgets */

 		horizontalButton = new Button (styleGroup, SWT.RADIO);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_HORIZONTAL"));

+		horizontalButton.setText ("SWT.HORIZONTAL");

 		verticalButton = new Button (styleGroup, SWT.RADIO);

-		verticalButton.setText (ControlExample.getResourceString("SWT_VERTICAL"));

+		verticalButton.setText ("SWT.VERTICAL");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ScrollableTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ScrollableTab.java
index 5c24c9e04c..e45d85c1a7 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ScrollableTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ScrollableTab.java
@@ -27,17 +27,17 @@ abstract class ScrollableTab extends Tab {
 	

 		/* Create the extra widgets */

 		singleButton = new Button (styleGroup, SWT.RADIO);

-		singleButton.setText (ControlExample.getResourceString("SWT_SINGLE"));

+		singleButton.setText ("SWT.SINGLE");

 		multiButton = new Button (styleGroup, SWT.RADIO);

-		multiButton.setText (ControlExample.getResourceString("SWT_MULTI"));

+		multiButton.setText ("SWT.MULTI");

 		horizontalButton = new Button (styleGroup, SWT.CHECK);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_H_SCROLL"));

+		horizontalButton.setText ("SWT.H_SCROLL");

 		horizontalButton.setSelection(true);

 		verticalButton = new Button (styleGroup, SWT.CHECK);

-		verticalButton.setText (ControlExample.getResourceString("SWT_V_SCROLL"));

+		verticalButton.setText ("SWT.V_SCROLL");

 		verticalButton.setSelection(true);

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ShellTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ShellTab.java
index 28c370c089..5204d737de 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ShellTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ShellTab.java
@@ -137,19 +137,19 @@ class ShellTab extends Tab {
 	

 		/* Create the decoration style buttons */

 		noTrimButton = new Button (decorationStyleGroup, SWT.CHECK);

-		noTrimButton.setText (ControlExample.getResourceString("SWT_NO_TRIM"));

+		noTrimButton.setText ("SWT.NO_TRIM");

 		closeButton = new Button (decorationStyleGroup, SWT.CHECK);

-		closeButton.setText (ControlExample.getResourceString("SWT_CLOSE"));

+		closeButton.setText ("SWT.CLOSE");

 		titleButton = new Button (decorationStyleGroup, SWT.CHECK);

-		titleButton.setText (ControlExample.getResourceString("SWT_TITLE"));

+		titleButton.setText ("SWT.TITLE");

 		minButton = new Button (decorationStyleGroup, SWT.CHECK);

-		minButton.setText (ControlExample.getResourceString("SWT_MIN"));

+		minButton.setText ("SWT.MIN");

 		maxButton = new Button (decorationStyleGroup, SWT.CHECK);

-		maxButton.setText (ControlExample.getResourceString("SWT_MAX"));

+		maxButton.setText ("SWT.MAX");

 		borderButton = new Button (decorationStyleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 		resizeButton = new Button (decorationStyleGroup, SWT.CHECK);

-		resizeButton.setText (ControlExample.getResourceString("SWT_RESIZE"));

+		resizeButton.setText ("SWT.RESIZE");

 	

 		/* Create the "create" and "closeAll" buttons */

 		createButton = new Button (styleGroup, SWT.NULL);

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TableTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TableTab.java
index a07f1bd69c..eed7a2e5e2 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TableTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TableTab.java
@@ -136,7 +136,7 @@ class TableTab extends ScrollableTab {
 		

 		/* Create the extra widgets */

 		fullSelectionButton = new Button (styleGroup, SWT.CHECK);

-		fullSelectionButton.setText (ControlExample.getResourceString("SWT_FULL_SELECTION"));

+		fullSelectionButton.setText ("SWT.FULL_SELECTION");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TextTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TextTab.java
index 9f4dcfadb8..de4cf0acf4 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TextTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/TextTab.java
@@ -80,7 +80,7 @@ class TextTab extends ScrollableTab {
 	

 		/* Create the extra widgets */

 		readOnlyButton = new Button (styleGroup, SWT.CHECK);

-		readOnlyButton.setText (ControlExample.getResourceString("SWT_READ_ONLY"));

+		readOnlyButton.setText ("SWT.READ_ONLY");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ToolBarTab.java
index d93d605552..a84f909d11 100755
--- a/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ToolBarTab.java
+++ b/examples/org.eclipse.swt.examples/org/eclipse/swt/examples/controlexample/ToolBarTab.java
@@ -67,60 +67,60 @@ class ToolBarTab extends Tab {
 		imageToolBar = new ToolBar (imageToolBarGroup, style);

 		ToolItem item = new ToolItem (imageToolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (imageToolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.SEPARATOR);

-		item.setToolTipText(ControlExample.getResourceString("SWT_SEPARATOR"));

+		item.setToolTipText("SWT.SEPARATOR");

 		item = new ToolItem (imageToolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener(new DropDownSelectionListener());

 	

 		/* Create the text tool bar */

 		textToolBar = new ToolBar (textToolBarGroup, style);

 		item = new ToolItem (textToolBar, SWT.PUSH);

 		item.setText (ControlExample.getResourceString("Push"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (textToolBar, SWT.PUSH);

 		item.setText (ControlExample.getResourceString("Push"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.CHECK);

 		item.setText (ControlExample.getResourceString("Check"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText("SWT.CHECK");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.SEPARATOR);

-		item.setToolTipText(ControlExample.getResourceString("SWT_SEPARATOR"));

+		item.setToolTipText("SWT.SEPARATOR");

 		item = new ToolItem (textToolBar, SWT.DROP_DOWN);

 		item.setText (ControlExample.getResourceString("Drop_Down"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText("SWT.DROP_DOWN");

 		item.addSelectionListener(new DropDownSelectionListener());

 	

 		/*

@@ -139,11 +139,11 @@ class ToolBarTab extends Tab {
 	

 		/* Create the extra widgets */

 		flatButton = new Button (styleGroup, SWT.CHECK);

-		flatButton.setText (ControlExample.getResourceString("SWT_FLAT"));

+		flatButton.setText ("SWT.FLAT");

 		wrapButton = new Button (styleGroup, SWT.CHECK);

-		wrapButton.setText (ControlExample.getResourceString("SWT_WRAP"));

+		wrapButton.setText ("SWT.WRAP");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	void disposeExampleWidgets () {

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java
index 76bd2434ea..81595f3bd3 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java
@@ -117,17 +117,17 @@ class ButtonTab extends AlignableTab {
 	

 		/* Create the extra widgets */

 		pushButton = new Button (styleGroup, SWT.RADIO);

-		pushButton.setText(ControlExample.getResourceString("SWT_PUSH"));

+		pushButton.setText("SWT.PUSH");

 		checkButton = new Button (styleGroup, SWT.RADIO);

-		checkButton.setText (ControlExample.getResourceString("SWT_CHECK"));

+		checkButton.setText ("SWT.CHECK");

 		radioButton = new Button (styleGroup, SWT.RADIO);

-		radioButton.setText (ControlExample.getResourceString("SWT_RADIO"));

+		radioButton.setText ("SWT.RADIO");

 		toggleButton = new Button (styleGroup, SWT.RADIO);

-		toggleButton.setText (ControlExample.getResourceString("SWT_TOGGLE"));

+		toggleButton.setText ("SWT.TOGGLE");

 		arrowButton = new Button (styleGroup, SWT.RADIO);

-		arrowButton.setText (ControlExample.getResourceString("SWT_ARROW"));

+		arrowButton.setText ("SWT.ARROW");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
index 88ed7db221..0e81248372 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ComboTab.java
@@ -78,13 +78,13 @@ class ComboTab extends Tab {
 	

 		/* Create the extra widgets */

 		dropDownButton = new Button (styleGroup, SWT.RADIO);

-		dropDownButton.setText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		dropDownButton.setText ("SWT.DROP_DOWN");

 		simpleButton = new Button (styleGroup, SWT.RADIO);

-		simpleButton.setText(ControlExample.getResourceString("SWT_SIMPLE"));

+		simpleButton.setText("SWT.SIMPLE");

 		readOnlyButton = new Button (styleGroup, SWT.CHECK);

-		readOnlyButton.setText (ControlExample.getResourceString("SWT_READ_ONLY"));

+		readOnlyButton.setText ("SWT.READ_ONLY");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
index 5843469802..5af719c32a 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
@@ -52,20 +52,20 @@ class CoolBarTab extends Tab {
 		ToolBar toolBar = new ToolBar (coolBar, toolBarStyle);

 		ToolItem item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.SEPARATOR);

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (toolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));		

+		item.setToolTipText ("SWT.PUSH");		

 		pushItem = new CoolItem (coolBar, SWT.NULL);

 		pushItem.setControl (toolBar);

 		Point pushSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -76,11 +76,11 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener (new DropDownSelectionListener());

 		item = new ToolItem (toolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener (new DropDownSelectionListener());

 		dropDownItem = new CoolItem (coolBar, SWT.NULL);

 		dropDownItem.setControl (toolBar);

@@ -92,13 +92,13 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (toolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		radioItem = new CoolItem (coolBar, SWT.NULL);

 		radioItem.setControl (toolBar);

 		Point radioSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -109,16 +109,16 @@ class CoolBarTab extends Tab {
 		toolBar = new ToolBar (coolBar, toolBarStyle);

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (toolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		checkItem = new CoolItem (coolBar, SWT.NULL);

 		checkItem.setControl (toolBar);

 		Point checkSize = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);

@@ -159,7 +159,7 @@ class CoolBarTab extends Tab {
 	

 		/* Create the extra widget */

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

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 ea5f8f5db8..8b362fc42a 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
@@ -156,25 +156,25 @@ class DialogTab extends Tab {
 			 */

 			switch (result) {

 				case SWT.OK:

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

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

 					break;

 				case SWT.YES:

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

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

 					break;

 				case SWT.NO:

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

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

 					break;

 				case SWT.CANCEL:

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

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

 					break;

 				case SWT.ABORT: 

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

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

 					break;

 				case SWT.RETRY:

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

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

 					break;

 				case SWT.IGNORE:

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

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

 					break;

 				default:

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

@@ -243,19 +243,19 @@ class DialogTab extends Tab {
 	

 		/* Create the button style buttons */

 		okButton = new Button (buttonStyleGroup, SWT.CHECK);

-		okButton.setText (instance.getResourceString("SWT_OK"));

+		okButton.setText ("SWT.OK");

 		cancelButton = new Button (buttonStyleGroup, SWT.CHECK);

-		cancelButton.setText (instance.getResourceString("SWT_CANCEL"));

+		cancelButton.setText ("SWT.CANCEL");

 		yesButton = new Button (buttonStyleGroup, SWT.CHECK);

-		yesButton.setText (instance.getResourceString("SWT_YES"));

+		yesButton.setText ("SWT.YES");

 		noButton = new Button (buttonStyleGroup, SWT.CHECK);

-		noButton.setText (instance.getResourceString("SWT_NO"));

+		noButton.setText ("SWT.NO");

 		retryButton = new Button (buttonStyleGroup, SWT.CHECK);

-		retryButton.setText (instance.getResourceString("SWT_RETRY"));

+		retryButton.setText ("SWT.RETRY");

 		abortButton = new Button (buttonStyleGroup, SWT.CHECK);

-		abortButton.setText (instance.getResourceString("SWT_ABORT"));

+		abortButton.setText ("SWT.ABORT");

 		ignoreButton = new Button (buttonStyleGroup, SWT.CHECK);

-		ignoreButton.setText (instance.getResourceString("SWT_IGNORE"));

+		ignoreButton.setText ("SWT.IGNORE");

 	

 		/* Create a group for the icon style controls */

 		Group iconStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -265,15 +265,15 @@ class DialogTab extends Tab {
 	

 		/* Create the icon style buttons */

 		iconErrorButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconErrorButton.setText (instance.getResourceString("SWT_ICON_ERROR"));

+		iconErrorButton.setText ("SWT.ICON_ERROR");

 		iconInformationButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconInformationButton.setText (instance.getResourceString("SWT_ICON_INFORMATION"));

+		iconInformationButton.setText ("SWT.ICON_INFORMATION");

 		iconQuestionButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconQuestionButton.setText (instance.getResourceString("SWT_ICON_QUESTION"));

+		iconQuestionButton.setText ("SWT.ICON_QUESTION");

 		iconWarningButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconWarningButton.setText (instance.getResourceString("SWT_ICON_WARNING"));

+		iconWarningButton.setText ("SWT.ICON_WARNING");

 		iconWorkingButton = new Button (iconStyleGroup, SWT.RADIO);

-		iconWorkingButton.setText (instance.getResourceString("SWT_ICON_WORKING"));

+		iconWorkingButton.setText ("SWT.ICON_WORKING");

 	

 		/* Create a group for the modal style controls */

 		Group modalStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -283,13 +283,13 @@ class DialogTab extends Tab {
 	

 		/* Create the modal style buttons */

 		modelessButton = new Button (modalStyleGroup, SWT.RADIO);

-		modelessButton.setText (instance.getResourceString("SWT_MODELESS"));

+		modelessButton.setText ("SWT.MODELESS");

 		primaryModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		primaryModalButton.setText (instance.getResourceString("SWT_PRIMARY_MODAL"));

+		primaryModalButton.setText ("SWT.PRIMARY_MODAL");

 		applicationModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		applicationModalButton.setText (instance.getResourceString("SWT_APPLICATION_MODAL"));

+		applicationModalButton.setText ("SWT.APPLICATION_MODAL");

 		systemModalButton = new Button (modalStyleGroup, SWT.RADIO);

-		systemModalButton.setText (instance.getResourceString("SWT_SYSTEM_MODAL"));

+		systemModalButton.setText ("SWT.SYSTEM_MODAL");

 	

 		/* Create a group for the file dialog style controls */

 		Group fileDialogStyleGroup = new Group (controlGroup, SWT.NULL);

@@ -299,9 +299,9 @@ class DialogTab extends Tab {
 	

 		/* Create the file dialog style buttons */

 		saveButton = new Button (fileDialogStyleGroup, SWT.RADIO);

-		saveButton.setText (instance.getResourceString("SWT_SAVE"));

+		saveButton.setText ("SWT.SAVE");

 		openButton = new Button(fileDialogStyleGroup, SWT.RADIO);

-		openButton.setText(instance.getResourceString("SWT_OPEN"));

+		openButton.setText("SWT.OPEN");

 	

 		/* Add the listeners */

 		dialogCombo.addSelectionListener (new SelectionAdapter () {

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
index 64363bd151..09e9a858f8 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/LabelTab.java
@@ -86,19 +86,19 @@ class LabelTab extends AlignableTab {
 		

 		/* Create the extra widgets */

 		separatorButton = new Button (styleGroup, SWT.CHECK);

-		separatorButton.setText (ControlExample.getResourceString("SWT_SEPARATOR"));

+		separatorButton.setText ("SWT.SEPARATOR");

 		horizontalButton = new Button (styleGroup, SWT.RADIO);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_HORIZONTAL"));

+		horizontalButton.setText ("SWT.HORIZONTAL");

 		verticalButton = new Button (styleGroup, SWT.RADIO);

-		verticalButton.setText (ControlExample.getResourceString("SWT_VERTICAL"));

+		verticalButton.setText ("SWT.VERTICAL");

 		Group styleSubGroup = new Group (styleGroup, SWT.NULL);

 		styleSubGroup.setLayout (new GridLayout ());

 		shadowInButton = new Button (styleSubGroup, SWT.RADIO);

-		shadowInButton.setText (ControlExample.getResourceString("SWT_SHADOW_IN"));

+		shadowInButton.setText ("SWT.SHADOW_IN");

 		shadowOutButton = new Button (styleSubGroup, SWT.RADIO);

-		shadowOutButton.setText (ControlExample.getResourceString("SWT_SHADOW_OUT"));

+		shadowOutButton.setText ("SWT.SHADOW_OUT");

 		borderButton = new Button(styleGroup, SWT.CHECK);

-		borderButton.setText(ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText("SWT.BORDER");

 	

 		/* Add the listeners */

 		SelectionListener selectionListener = new SelectionAdapter () {

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
index 397ff26896..3abf065c10 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ProgressBarTab.java
@@ -65,7 +65,7 @@ class ProgressBarTab extends RangeTab {
 	

 		/* Create the extra widgets */

 		smoothButton = new Button (styleGroup, SWT.CHECK);

-		smoothButton.setText (ControlExample.getResourceString("SWT_SMOOTH"));

+		smoothButton.setText ("SWT.SMOOTH");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
index a257410f66..cc95179322 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java
@@ -128,11 +128,11 @@ abstract class RangeTab extends Tab {
 	

 		/* Create the extra widgets */

 		horizontalButton = new Button (styleGroup, SWT.RADIO);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_HORIZONTAL"));

+		horizontalButton.setText ("SWT.HORIZONTAL");

 		verticalButton = new Button (styleGroup, SWT.RADIO);

-		verticalButton.setText (ControlExample.getResourceString("SWT_VERTICAL"));

+		verticalButton.setText ("SWT.VERTICAL");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java
index 5c24c9e04c..e45d85c1a7 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ScrollableTab.java
@@ -27,17 +27,17 @@ abstract class ScrollableTab extends Tab {
 	

 		/* Create the extra widgets */

 		singleButton = new Button (styleGroup, SWT.RADIO);

-		singleButton.setText (ControlExample.getResourceString("SWT_SINGLE"));

+		singleButton.setText ("SWT.SINGLE");

 		multiButton = new Button (styleGroup, SWT.RADIO);

-		multiButton.setText (ControlExample.getResourceString("SWT_MULTI"));

+		multiButton.setText ("SWT.MULTI");

 		horizontalButton = new Button (styleGroup, SWT.CHECK);

-		horizontalButton.setText (ControlExample.getResourceString("SWT_H_SCROLL"));

+		horizontalButton.setText ("SWT.H_SCROLL");

 		horizontalButton.setSelection(true);

 		verticalButton = new Button (styleGroup, SWT.CHECK);

-		verticalButton.setText (ControlExample.getResourceString("SWT_V_SCROLL"));

+		verticalButton.setText ("SWT.V_SCROLL");

 		verticalButton.setSelection(true);

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
index 28c370c089..5204d737de 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ShellTab.java
@@ -137,19 +137,19 @@ class ShellTab extends Tab {
 	

 		/* Create the decoration style buttons */

 		noTrimButton = new Button (decorationStyleGroup, SWT.CHECK);

-		noTrimButton.setText (ControlExample.getResourceString("SWT_NO_TRIM"));

+		noTrimButton.setText ("SWT.NO_TRIM");

 		closeButton = new Button (decorationStyleGroup, SWT.CHECK);

-		closeButton.setText (ControlExample.getResourceString("SWT_CLOSE"));

+		closeButton.setText ("SWT.CLOSE");

 		titleButton = new Button (decorationStyleGroup, SWT.CHECK);

-		titleButton.setText (ControlExample.getResourceString("SWT_TITLE"));

+		titleButton.setText ("SWT.TITLE");

 		minButton = new Button (decorationStyleGroup, SWT.CHECK);

-		minButton.setText (ControlExample.getResourceString("SWT_MIN"));

+		minButton.setText ("SWT.MIN");

 		maxButton = new Button (decorationStyleGroup, SWT.CHECK);

-		maxButton.setText (ControlExample.getResourceString("SWT_MAX"));

+		maxButton.setText ("SWT.MAX");

 		borderButton = new Button (decorationStyleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 		resizeButton = new Button (decorationStyleGroup, SWT.CHECK);

-		resizeButton.setText (ControlExample.getResourceString("SWT_RESIZE"));

+		resizeButton.setText ("SWT.RESIZE");

 	

 		/* Create the "create" and "closeAll" buttons */

 		createButton = new Button (styleGroup, SWT.NULL);

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
index a07f1bd69c..eed7a2e5e2 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TableTab.java
@@ -136,7 +136,7 @@ class TableTab extends ScrollableTab {
 		

 		/* Create the extra widgets */

 		fullSelectionButton = new Button (styleGroup, SWT.CHECK);

-		fullSelectionButton.setText (ControlExample.getResourceString("SWT_FULL_SELECTION"));

+		fullSelectionButton.setText ("SWT.FULL_SELECTION");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
index 9f4dcfadb8..de4cf0acf4 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TextTab.java
@@ -80,7 +80,7 @@ class TextTab extends ScrollableTab {
 	

 		/* Create the extra widgets */

 		readOnlyButton = new Button (styleGroup, SWT.CHECK);

-		readOnlyButton.setText (ControlExample.getResourceString("SWT_READ_ONLY"));

+		readOnlyButton.setText ("SWT.READ_ONLY");

 	}

 	

 	/**

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
index d93d605552..a84f909d11 100755
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
@@ -67,60 +67,60 @@ class ToolBarTab extends Tab {
 		imageToolBar = new ToolBar (imageToolBarGroup, style);

 		ToolItem item = new ToolItem (imageToolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (imageToolBar, SWT.PUSH);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText ("SWT.PUSH");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciOpenFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.CHECK);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText ("SWT.CHECK");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.RADIO);

 		item.setImage (instance.images[ControlExample.ciClosedFolder]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText ("SWT.RADIO");

 		item = new ToolItem (imageToolBar, SWT.SEPARATOR);

-		item.setToolTipText(ControlExample.getResourceString("SWT_SEPARATOR"));

+		item.setToolTipText("SWT.SEPARATOR");

 		item = new ToolItem (imageToolBar, SWT.DROP_DOWN);

 		item.setImage (instance.images[ControlExample.ciTarget]);

-		item.setToolTipText (ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText ("SWT.DROP_DOWN");

 		item.addSelectionListener(new DropDownSelectionListener());

 	

 		/* Create the text tool bar */

 		textToolBar = new ToolBar (textToolBarGroup, style);

 		item = new ToolItem (textToolBar, SWT.PUSH);

 		item.setText (ControlExample.getResourceString("Push"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (textToolBar, SWT.PUSH);

 		item.setText (ControlExample.getResourceString("Push"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_PUSH"));

+		item.setToolTipText("SWT.PUSH");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.CHECK);

 		item.setText (ControlExample.getResourceString("Check"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_CHECK"));

+		item.setToolTipText("SWT.CHECK");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.RADIO);

 		item.setText (ControlExample.getResourceString("Radio"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_RADIO"));

+		item.setToolTipText("SWT.RADIO");

 		item = new ToolItem (textToolBar, SWT.SEPARATOR);

-		item.setToolTipText(ControlExample.getResourceString("SWT_SEPARATOR"));

+		item.setToolTipText("SWT.SEPARATOR");

 		item = new ToolItem (textToolBar, SWT.DROP_DOWN);

 		item.setText (ControlExample.getResourceString("Drop_Down"));

-		item.setToolTipText(ControlExample.getResourceString("SWT_DROP_DOWN"));

+		item.setToolTipText("SWT.DROP_DOWN");

 		item.addSelectionListener(new DropDownSelectionListener());

 	

 		/*

@@ -139,11 +139,11 @@ class ToolBarTab extends Tab {
 	

 		/* Create the extra widgets */

 		flatButton = new Button (styleGroup, SWT.CHECK);

-		flatButton.setText (ControlExample.getResourceString("SWT_FLAT"));

+		flatButton.setText ("SWT.FLAT");

 		wrapButton = new Button (styleGroup, SWT.CHECK);

-		wrapButton.setText (ControlExample.getResourceString("SWT_WRAP"));

+		wrapButton.setText ("SWT.WRAP");

 		borderButton = new Button (styleGroup, SWT.CHECK);

-		borderButton.setText (ControlExample.getResourceString("SWT_BORDER"));

+		borderButton.setText ("SWT.BORDER");

 	}

 	

 	void disposeExampleWidgets () {