Large set of changes mostly related to: [206100] Enhancements to the WPE Property pages. This is the first checkin. Cleanup and other improvements to come.

   - tabbed property page changes
   - MDChanges
   - temporary translation of old sybase MD to current form
   - new AttrValueRuntimeTypes

9 files changed, 20 insertions, 10 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
index 11828162d..582634e13 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
@@ -130,7 +130,7 @@ public class ComboDialogField extends DialogFieldBase implements
 	 * @return the custom combo control
 	 */
 	public CCombo getComboControl(FormToolkit toolkit, Composite parent) {
-		if (_comboControl == null) {
+		if (_comboControl == null || _comboControl.isDisposed()) {
 			assertCompositeNotNull(parent);
 			_modifyListener = new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
index 379e0a728..0ff86f78c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
@@ -25,7 +25,7 @@ public interface DialogField {
 	/**
 	 * this method must be called directly after constructor, in this case,
 	 * system will create a hyper link label, and when the hyper link is
-	 * clicked, the corresponding method on the listene will be called. A
+	 * clicked, the corresponding method on the listener will be called. A
 	 * RuntimeException will throw out if this method is called after the label
 	 * has been created.
 	 * 
@@ -58,7 +58,7 @@ public interface DialogField {
 	// ------- focus management
 	/**
 	 * Tries to set the focus to the dialog field. Returns <code>true</code>
-	 * if the dialog field can take focus. To be reimplemented by dialog field
+	 * if the dialog field can take focus. To be re-implemented by dialog field
 	 * implementors.
 	 * @return true if dialog field can take focus
 	 */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
index f6e2de841..431dae4d4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
@@ -282,7 +282,7 @@ public class DialogFieldBase implements DialogField {
 	 */
 	public Control getLabelControl(FormToolkit _formToolkit, Composite parent) {
 		Control control = null;
-		if (_label == null && _hyperlink == null) {
+		if ((_label == null || _label.isDisposed()) && (_hyperlink == null  || _hyperlink.isDisposed())) {
 			assertCompositeNotNull(parent);
 
 			String label = null;
@@ -330,7 +330,7 @@ public class DialogFieldBase implements DialogField {
 	 */
 	public Control getRequiredLabelControl(FormToolkit _formToolkit,
 			Composite parent) {
-		if (_requiredLabel == null) {
+		if (_requiredLabel == null || _requiredLabel.isDisposed()) {
 			if (_formToolkit == null) {
 				_requiredLabel = new Label(parent, SWT.LEFT | SWT.WRAP);
 			} else {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
index 2e4c5bcbb..0ed7b3a66 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
@@ -103,4 +103,11 @@ public abstract class DialogFieldGroup {
 	 * @return could return null. or an array containing null elements.
 	 */
 	public abstract IStatus[] validateDialogFields();
+	
+	/**
+	 * Intended to allow subclasses to recreate controls.  Default implementation does nothing.
+	 */
+	public void reset(){
+		//do nothing by default	
+	}
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
index 1d2ef3eda..3a6aa5c51 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
@@ -121,7 +121,7 @@ public class RadiosDialogField extends DialogFieldBase {
 	 * @return the group composite
 	 */
 	public Composite getGroup(FormToolkit toolkit, Composite parent) {
-		if (_group == null) {
+		if (_group == null || _group.isDisposed()) {
 			assertCompositeNotNull(parent);
 			if (toolkit != null) {
 				_group = toolkit.createComposite(parent);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
index caf5352f6..f54722a77 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
@@ -106,7 +106,7 @@ public class Separator extends DialogFieldBase {
 	 * @return  the separator
 	 */
 	private Control getSeparator(FormToolkit toolkit, Composite parent) {
-		if (_separator == null) {
+		if (_separator == null || _separator.isDisposed()) {
 			assertCompositeNotNull(parent);
 			if (toolkit != null) {
 				_separator = toolkit.createSeparator(parent, _style);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
index f750dafe1..4ff9eda62 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
@@ -122,7 +122,7 @@ public class StringButtonDialogField extends StringDialogField {
 	 * @return the button
 	 */
 	public Button getChangeControl(FormToolkit toolkit, Composite parent) {
-		if (_browseButton == null) {
+		if (_browseButton == null || _browseButton.isDisposed()) {
 			assertCompositeNotNull(parent);
 			if (toolkit != null) {
 				_browseButton = toolkit.createButton(parent,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
index c38ddb766..c00f3c64f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
@@ -149,7 +149,7 @@ public class StringDialogField extends DialogFieldBase implements
 	 * @return the text control
 	 */
 	public Text getTextControl(FormToolkit toolkit, Composite parent) {
-		if (_textControl == null) {
+		if (_textControl == null || _textControl.isDisposed()) {
 			assertCompositeNotNull(parent);
 			_modifyListener = new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
index f549b716b..93c93320b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
@@ -68,6 +68,8 @@ public class StyleComboDialogField extends DialogFieldBase implements
 	 */
 	public void setDefaultValue(String defaultValue) {
 		this._defaultValue = defaultValue;
+		if (_comboControl != null && ! _comboControl.isDisposed())
+			_comboControl.setDefaultValue(_defaultValue);
 	}
 
 	/**
@@ -83,6 +85,7 @@ public class StyleComboDialogField extends DialogFieldBase implements
 
 	// ------- layout helpers
 
+
 	/*
 	 * @see DialogField#doFillIntoGrid
 	 */
@@ -147,7 +150,7 @@ public class StyleComboDialogField extends DialogFieldBase implements
 	 */
 	public StyleCombo getComboControl(FormToolkit toolkit,
 			final Composite parent) {
-		if (_comboControl == null) {
+		if (_comboControl == null || _comboControl.isDisposed()) {
 			assertCompositeNotNull(parent);
 			_modifyListener = new ModifyListener() {
 				public void modifyText(ModifyEvent e) {