geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r370648 - /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
Date Thu, 19 Jan 2006 21:55:57 GMT
Author: sppatel
Date: Thu Jan 19 13:55:54 2006
New Revision: 370648

URL: http://svn.apache.org/viewcvs?rev=370648&view=rev
Log:
ordering of errors/warnings

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java?rev=370648&r1=370647&r2=370648&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
Thu Jan 19 13:55:54 2006
@@ -241,8 +241,21 @@
 			}
 			return;
 		}
-
-		validateDecorators();
+		
+		if (!isValidVM()) {
+			getWizard().setMessage(Messages.jvmWarning,
+					IMessageProvider.WARNING);
+			return;
+		}
+		
+		getWizard().setMessage(null, IMessageProvider.NONE);
+	
+		//validateDecorators();
+	}
+	
+	private boolean isValidVM() {
+		String vmId = getRuntimeDelegate().getVMInstallId();
+		return vmId != null && vmId.startsWith("1.4");
 	}
 
 	private void validateDecorators() {
@@ -302,8 +315,7 @@
 	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#exit()
 	 */
 	public void exit() {
-		// validate to save latest values
-		validateDecorators();
+		validate();
 	}
 
 	private GenericServerRuntime getRuntimeDelegate() {
@@ -354,18 +366,8 @@
 		 * @see org.eclipse.jst.server.generic.ui.internal.GenericServerCompositeDecorator#validate()
 		 */
 		public boolean validate() {
-			if (isValidVM()) {
-				getWizard().setMessage(Messages.jvmWarning,
-						IMessageProvider.WARNING);
-				return true;
-			}
-			getWizard().setMessage(null, IMessageProvider.NONE);
-			return false;
-		}
-
-		private boolean isValidVM() {
-			String vmId = getRuntimeDelegate().getVMInstallId();
-			return vmId == null || !vmId.startsWith("1.4");
+			GeronimoServerRuntimeWizardFragment.this.validate();
+			return true;
 		}
 	}
 



Mime
View raw message