Revert fixes for controls drawing with light grey background in Dark theme, the changes somehow caused a dark grey background to draw for the controls on Windows when in Light theme, making the controls appear disabled.

Change-Id: I200fbf146400b417916f49f5c2576a8290e81b67
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/AttributeInfoEditComponent.java b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/AttributeInfoEditComponent.java
index 0eb5574..9905358 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/AttributeInfoEditComponent.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/AttributeInfoEditComponent.java
@@ -261,20 +261,16 @@
         visiComposite.setEnabled(!isReadOnly);
         visiComposite.setLayout(layout);
         visiComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-        publicButton = new Button(visiComposite, SWT.RADIO);
-        publicButton.setText("Public");
+        publicButton = toolkit.createButton(visiComposite, "Public", SWT.RADIO);
         publicButton.setEnabled(!isReadOnly);
         publicButton.addSelectionListener(adapter);
-        protectedButton = new Button(visiComposite, SWT.RADIO);
-        protectedButton.setText("Protected");
+        protectedButton = toolkit.createButton(visiComposite, "Protected", SWT.RADIO);
         protectedButton.setEnabled(!isReadOnly);
         protectedButton.addSelectionListener(adapter);
-        privateButton = new Button(visiComposite, SWT.RADIO);
-        privateButton.setText("Private");
+        privateButton = toolkit.createButton(visiComposite, "Private", SWT.RADIO);
         privateButton.setEnabled(!isReadOnly);
         privateButton.addSelectionListener(adapter);
-        packageButton = new Button(visiComposite, SWT.RADIO);
-        packageButton.setText("Package");
+        packageButton = toolkit.createButton(visiComposite, "Package", SWT.RADIO);
         packageButton.setEnabled(!isReadOnly);
         packageButton.addSelectionListener(adapter);
 
@@ -297,16 +293,13 @@
             optionalButton.addSelectionListener(adapter);
         }
 
-        readonlyButton = new Button(opComposite, SWT.CHECK);
-        readonlyButton.setText("Readonly");
+        readonlyButton = toolkit.createButton(opComposite, "Readonly", SWT.CHECK);
         readonlyButton.setEnabled(!isReadOnly);
         readonlyButton.addSelectionListener(adapter);
-        orderedButton = new Button(opComposite, SWT.CHECK);
-        orderedButton.setText("Ordered");
+        orderedButton = toolkit.createButton(opComposite, "Ordered", SWT.CHECK);
         orderedButton.setEnabled(!isReadOnly);
         orderedButton.addSelectionListener(adapter);
-        uniqueButton = new Button(opComposite, SWT.CHECK);
-        uniqueButton.setText("Unique");
+        uniqueButton = toolkit.createButton(opComposite, "Unique", SWT.CHECK);
         uniqueButton.setEnabled(!isReadOnly);
         uniqueButton.addSelectionListener(adapter);
 
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/ConstantInfoEditComponent.java b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/ConstantInfoEditComponent.java
index eb5bd12..a4f5630 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/ConstantInfoEditComponent.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/ConstantInfoEditComponent.java
@@ -153,16 +153,13 @@
         visiComposite.setEnabled(!isReadOnly);
         visiComposite.setLayout(layout);
         visiComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-        publicButton = new Button(visiComposite, SWT.RADIO);
-        publicButton.setText("Public");
+        publicButton = toolkit.createButton(visiComposite, "Public", SWT.RADIO);
         publicButton.setEnabled(!isReadOnly);
         publicButton.addSelectionListener(adapter);
-        protectedButton = new Button(visiComposite, SWT.RADIO);
-        protectedButton.setText("Protected");
+        protectedButton = toolkit.createButton(visiComposite, "Protected", SWT.RADIO);
         protectedButton.setEnabled(!isReadOnly);
         protectedButton.addSelectionListener(adapter);
-        privateButton = new Button(visiComposite, SWT.RADIO);
-        privateButton.setText("Private");
+        privateButton = toolkit.createButton(visiComposite, "Private", SWT.RADIO);
         privateButton.setEnabled(!isReadOnly);
         privateButton.addSelectionListener(adapter);
 
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/MethodInfoEditComponent.java b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/MethodInfoEditComponent.java
index 2260259..9641304 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/MethodInfoEditComponent.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/utils/MethodInfoEditComponent.java
@@ -200,21 +200,18 @@
         layout.topMargin = layout.bottomMargin = 0;
         buttonsClient.setLayout(layout);
 
-        addAnno = new Button(buttonsClient, SWT.PUSH);
-        addAnno.setText("Add");
+        addAnno = toolkit.createButton(buttonsClient, "Add", SWT.PUSH);
         // Support for testing
         addAnno.setData("name", "Add_Stereotype_Attribute");
         addAnno.setEnabled(!isReadOnly);
         addAnno.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
 
-        editAnno = new Button(buttonsClient, SWT.PUSH);
-        editAnno.setText("Edit");
+        editAnno = toolkit.createButton(buttonsClient, "Edit", SWT.PUSH);
         editAnno.setData("name", "Edit_Stereotype_Attribute");
         editAnno.setEnabled(!isReadOnly);
         editAnno.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
 
-        removeAnno = new Button(buttonsClient, SWT.PUSH);
-        removeAnno.setText("Remove");
+        removeAnno = toolkit.createButton(buttonsClient, "Remove", SWT.PUSH);
         // Support for testing
         removeAnno.setData("name", "Remove_Stereotype_Attribute");
         removeAnno.setEnabled(!isReadOnly);
@@ -327,20 +324,16 @@
         layout.numColumns = 4;
         visiComposite.setLayout(layout);
         visiComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-        publicButton = new Button(visiComposite, SWT.RADIO);
-        publicButton.setText("Public");
+        publicButton = toolkit.createButton(visiComposite, "Public", SWT.RADIO);
         publicButton.setEnabled(!isReadOnly);
         publicButton.addSelectionListener(adapter);
-        protectedButton = new Button(visiComposite, SWT.RADIO);
-        protectedButton.setText("Protected");
+        protectedButton = toolkit.createButton(visiComposite, "Protected", SWT.RADIO);
         protectedButton.setEnabled(!isReadOnly);
         protectedButton.addSelectionListener(adapter);
-        privateButton = new Button(visiComposite, SWT.RADIO);
-        privateButton.setText("Private");
+        privateButton = toolkit.createButton(visiComposite, "Private", SWT.RADIO);
         privateButton.setEnabled(!isReadOnly);
         privateButton.addSelectionListener(adapter);
-        packageButton = new Button(visiComposite, SWT.RADIO);
-        packageButton.setText("Package");
+        packageButton = toolkit.createButton(visiComposite, "Package", SWT.RADIO);
         packageButton.setEnabled(!isReadOnly);
         packageButton.addSelectionListener(adapter);
 
@@ -352,39 +345,34 @@
         layout.numColumns = 5;
         optComposite.setLayout(layout);
         optComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-        abstractButton = new Button(optComposite, SWT.CHECK);
-        abstractButton.setText("Abstract");
+
+        abstractButton = toolkit.createButton(optComposite, "Abstract", SWT.CHECK);
         abstractButton.setEnabled(!isReadOnly);
         abstractButton.addSelectionListener(adapter);
 
-        orderedButton = new Button(optComposite, SWT.CHECK);
-        orderedButton.setText("Ordered");
+        orderedButton = toolkit.createButton(optComposite, "Ordered", SWT.CHECK);
         orderedButton.setEnabled(!isReadOnly);
         orderedButton.addSelectionListener(adapter);
 
-        uniqueButton = new Button(optComposite, SWT.CHECK);
-        uniqueButton.setText("Unique");
+        uniqueButton = toolkit.createButton(optComposite, "Unique", SWT.CHECK);
         uniqueButton.setEnabled(!isReadOnly);
         uniqueButton.addSelectionListener(adapter);
 
         if (prop.getPropertyValue(IOssjLegacySettigsProperty.ENABLE_ISOPTIONAL)) {
-            optionalButton = new Button(optComposite, SWT.CHECK);
-            optionalButton.setText("Optional");
+            optionalButton = toolkit.createButton(optComposite, "Optional", SWT.CHECK);
             optionalButton.setEnabled(!isReadOnly);
             optionalButton.addSelectionListener(adapter);
         }
 
         if (prop.getPropertyValue(IOssjLegacySettigsProperty.ENABLE_INSTANCEMETHOD)) {
-            isInstanceMethodButton = new Button(optComposite, SWT.CHECK);
-            isInstanceMethodButton.setText("Instance");
+            isInstanceMethodButton = toolkit.createButton(optComposite, "Instance", SWT.CHECK);
             isInstanceMethodButton.setEnabled(!isReadOnly);
             isInstanceMethodButton.addSelectionListener(adapter);
         }
 
         toolkit.createLabel(sectionClient, "Method Return: ");
 
-        isVoid = new Button(sectionClient, SWT.CHECK);
-        isVoid.setText("isVoid");
+        isVoid = toolkit.createButton(sectionClient, "isVoid", SWT.CHECK);
         isVoid.setEnabled(!isReadOnly);
         isVoid.addSelectionListener(adapter);
 
@@ -426,8 +414,7 @@
         typeText.setEnabled(!isReadOnly);
         typeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-        typeBrowseButton = new Button(c, SWT.PUSH);
-        typeBrowseButton.setText("Browse ");
+        typeBrowseButton = toolkit.createButton(c, " Browse ", SWT.PUSH);
         typeBrowseButton.setLayoutData(new GridData(GridData.FILL_VERTICAL));
         typeBrowseButton.setEnabled(!isReadOnly);
         typeBrowseButton.addSelectionListener(adapter);
@@ -451,20 +438,17 @@
             layout.numColumns = 3;
             refComposite.setLayout(layout);
             refComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-            refByValueButton = new Button(refComposite, SWT.RADIO);
-            refByValueButton.setText(IField.refByLabels[IField.REFBY_VALUE]);
+            refByValueButton = toolkit.createButton(refComposite, IField.refByLabels[IField.REFBY_VALUE], SWT.RADIO);
             refByValueButton.addSelectionListener(adapter);
-            refByKeyButton = new Button(refComposite, SWT.RADIO);
-            refByKeyButton.setText(IField.refByLabels[IField.REFBY_KEY]);
+            refByKeyButton = toolkit.createButton(refComposite, IField.refByLabels[IField.REFBY_KEY], SWT.RADIO);
             refByKeyButton.addSelectionListener(adapter);
-            refByKeyResultButton = new Button(refComposite,SWT.RADIO);
-            refByKeyResultButton.setText(IField.refByLabels[IField.REFBY_KEYRESULT]);
+            refByKeyResultButton = toolkit.createButton(refComposite, IField.refByLabels[IField.REFBY_KEYRESULT],
+                    SWT.RADIO);
             refByKeyResultButton.addSelectionListener(adapter);
             toolkit.createLabel(sectionClient, "");
             // Iterator for multiplicity "*"
             toolkit.createLabel(sectionClient, "");
-            iteratorReturnButton = new Button(sectionClient, SWT.CHECK);
-            iteratorReturnButton.setText("Iterator for return");
+            iteratorReturnButton = toolkit.createButton(sectionClient, "Iterator for return", SWT.CHECK);
             iteratorReturnButton.setEnabled(!isReadOnly);
             iteratorReturnButton.addSelectionListener(adapter);
             toolkit.createLabel(sectionClient, "");
@@ -547,34 +531,29 @@
         layout.topMargin = layout.bottomMargin = 0;
         buttonsClient.setLayout(layout);
 
-        addArgButton = new Button(buttonsClient, SWT.PUSH);
-        addArgButton.setText("Add");
+        addArgButton = toolkit.createButton(buttonsClient, "Add", SWT.PUSH);
         // Support for testing
         addArgButton.setData("name", "Add_Argument");
         addArgButton.setEnabled(!isReadOnly);
         addArgButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
         addArgButton.addSelectionListener(adapter);
 
-        editArgButton = new Button(buttonsClient, SWT.PUSH);
-        editArgButton.setText("Edit");
+        editArgButton = toolkit.createButton(buttonsClient, "Edit", SWT.PUSH);
         editArgButton.setEnabled(false);
         editArgButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
         editArgButton.addSelectionListener(adapter);
 
-        upArgButton = new Button(buttonsClient, SWT.PUSH);
-        upArgButton.setText("Up");
+        upArgButton = toolkit.createButton(buttonsClient, "Up", SWT.PUSH);
         upArgButton.setEnabled(false);
         upArgButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
         upArgButton.addSelectionListener(adapter);
 
-        downArgButton = new Button(buttonsClient, SWT.PUSH);
-        downArgButton.setText("Down");
+        downArgButton = toolkit.createButton(buttonsClient, "Down", SWT.PUSH);
         downArgButton.setEnabled(false);
         downArgButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
         downArgButton.addSelectionListener(adapter);
 
-        removeArgButton = new Button(buttonsClient, SWT.PUSH);
-        removeArgButton.setText("Remove");
+        removeArgButton = toolkit.createButton(buttonsClient, "Remove", SWT.PUSH);
         // Support for testing
         removeArgButton.setData("name", "Remove_Argument");
         removeArgButton.setEnabled(false);
@@ -636,16 +615,14 @@
         layout.bottomMargin = 30;
         buttonsClient.setLayout(layout);
 
-        addExceptionButton = new Button(buttonsClient, SWT.PUSH);
-        addExceptionButton.setText("Add");
+        addExceptionButton = toolkit.createButton(buttonsClient, "Add", SWT.PUSH);
         addExceptionButton.setEnabled(!isReadOnly);
         // Support for testing
         addExceptionButton.setData("name", "Add_Exception");
         addExceptionButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
         addExceptionButton.addSelectionListener(adapter);
 
-        removeExceptionButton = new Button(buttonsClient, SWT.PUSH);
-        removeExceptionButton.setText("Remove");
+        removeExceptionButton = toolkit.createButton(buttonsClient, "Remove", SWT.PUSH);
         // Support for testing
         removeExceptionButton.setData("name", "Remove_Exception");
         removeExceptionButton.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));