[jbosstools-commits] JBoss Tools SVN: r6843 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2008-03-11 10:27:53 -0400 (Tue, 11 Mar 2008)
New Revision: 6843

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322

Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java	2008-03-11 14:23:43 UTC (rev 6842)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java	2008-03-11 14:27:53 UTC (rev 6843)
@@ -34,6 +34,7 @@
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -47,11 +48,11 @@
 import org.jboss.tools.seam.core.SeamProjectsSet;
 import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
+import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
 import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
 import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
 import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
 import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
@@ -124,7 +125,6 @@
 				if (value instanceof Boolean) {
 					boolean v = ((Boolean) value).booleanValue();
 					setEnabledSeamSuport(v);
-					validate();
 				}
 			}
 		});
@@ -142,7 +142,6 @@
 				} else {
 					setRuntimeIsSelected(false);
 				}
-				validate();
 			}
 		});
 		registerEditor(seamRuntimeEditor, generalGroup);
@@ -157,12 +156,7 @@
 
 		registerEditor(projectNameEditor, generalGroup);
 
-		IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), new IValidator() {
-			public Map<String, String> validate(Object value, Object context) {
-				SeamSettingsPreferencePageNew.this.validate();
-				return ValidatorFactory.NO_ERRORS;
-			}
-		});
+		IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR);
 		registerEditor(connProfileEditor, generalGroup);
 
 		Group deploymentGroup = createGroup(
@@ -297,6 +291,8 @@
 		setEnabledSeamSuport(warSeamProject!=null);
 		setRuntimeIsSelected(getSeamRuntimeName().length()>0);
 
+		validate();
+
 		return root;
 	}
 
@@ -417,20 +413,31 @@
 	}
 
 	private void validate() {
-//		if(getSeamSupport() && (runtime.getValue()== null || "".equals(runtime.getValue()))) { //$NON-NLS-1$
-////			setValid(false);
-//			setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
-////			setErrorMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED);
-//		} else {
-//			setValid(true);
-//			String value = runtime.getValueAsString();
-//			if(Boolean.TRUE.equals(seamEnablement.getValue()) && SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
-//				setErrorMessage("Runtime " + value + " does not exist.");
-//			} else {
-//				setErrorMessage(null);
-//				setMessage(null, IMessageProvider.WARNING);
-//			}
-//		}
+		boolean warning = false;
+
+		if(!isSeamSupported()) {
+			setValid(true);
+			setErrorMessage(null);
+			setMessage(null, IMessageProvider.WARNING);
+			return;
+		}
+		if(!runtimeIsSelected) {
+			setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
+			warning = true;
+		} else {
+			String value = getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
+			if(SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
+				setErrorMessage("Runtime " + value + " does not exist.");
+				setValid(false);
+				return;
+			}
+		}
+
+		setValid(true);
+		setErrorMessage(null);
+		if(!warning) {
+			setMessage(null, IMessageProvider.WARNING);
+		}
 	}
 
 	private String getSeamRuntimeName() {
@@ -456,11 +463,13 @@
 	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
 	 */
 	public void propertyChange(PropertyChangeEvent evt) {
+		validate();
 	}
 
 	private void registerEditor(IFieldEditor editor, Composite parent) {
 		editorRegistry.put(editor.getName(), editor);
 		editor.doFillIntoGrid(parent);
+		editor.addPropertyChangeListener(this);
 	}
 
 	/*