[121583] empty path message

4 files changed, 30 insertions, 10 deletions

diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
index 232f356d5..2f238c69d 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
@@ -25,7 +25,7 @@ public interface GenericServerCompositeDecorator
 	 * Called if all the fields are valid. This gives subclasses opportunity to
 	 * validate and take necessary actions.
 	 * 
-	 * @return
+	 * @return boolean
 	 */
 	public abstract boolean validate();
 }
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
index be0866ab0..e238062c5 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
@@ -37,5 +37,7 @@ public class GenericServerUIMessages extends NLS{
 		  NLS.initializeMessages(RESOURCE_BUNDLE, GenericServerUIMessages.class);
 	}
 
+	public static String emptyPath;
+
 
 }
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
index 32c952297..6a7c68163 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
@@ -19,4 +19,5 @@ installServerButton=Install Server
 installationDirectory=Select installation directory
 jre_select_label= &JRE:
 defaultJRE = Default JRE
-invalidPath = {0} is not valid
\ No newline at end of file
+invalidPath = {0} is not valid
+emptyPath=Specify a valid path
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
index 786086674..9ea43f83b 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jst.server.generic.servertype.definition.Property;
 import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -56,8 +57,14 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
 	private final class PathModifyListener implements ModifyListener {
 		public void modifyText(ModifyEvent e) {
 			String path = ((Text) e.widget).getText();
-			if(!pathExist(path)){
-				fLastMessage = GenericServerUIMessages.bind(GenericServerUIMessages.invalidPath,path);
+			
+			if(path.length()<1)
+			{
+				fLastMessage = GenericServerUIMessages.emptyPath;
+				fWizard.setMessage(fLastMessage,IMessageProvider.ERROR);
+			}
+			else if(!pathExist(path)){
+				fLastMessage = NLS.bind(GenericServerUIMessages.invalidPath,path);
 				fWizard.setMessage(fLastMessage,IMessageProvider.ERROR);
 			}else{
 				if(fLastMessage!=null && fLastMessage.equals(fWizard.getMessage())){
@@ -73,7 +80,14 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
 		}
 	}
 
-	
+	/**
+	 * Constructor
+	 * 
+	 * @param definition
+	 * @param initialProperties
+	 * @param context
+	 * @param handle
+	 */
 	public ServerTypeDefinitionDecorator(ServerRuntime definition, Map initialProperties, String context, IWizardHandle handle) {
 		super();
 		fDefinition = definition;
@@ -82,6 +96,9 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
 		fWizard = handle;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jst.server.generic.ui.internal.GenericServerCompositeDecorator#decorate(org.eclipse.jst.server.generic.ui.internal.GenericServerComposite)
+	 */
 	public void decorate(GenericServerComposite composite) {
 
 		List properties =null; 
@@ -114,7 +131,7 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
     		str.setData(property);
     		registerControl(str);
        	} else if( Property.TYPE_BOOLEAN.equals(property.getType())) {
-    	    Button bool =createLabeledCheck(property.getLabel(),("true".equals( getPropertyValue(property))),	parent);
+    	    Button bool =createLabeledCheck(property.getLabel(),("true".equals( getPropertyValue(property))),	parent); //$NON-NLS-1$
     		bool.setData(property);
     		registerControl(bool);
        	}else if(Property.TYPE_SELECT.equals(property.getType())) {
@@ -143,7 +160,7 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
     	gridData.horizontalSpan = 2;
     	combo.setLayoutData(gridData);
     	
-		StringTokenizer tokenizer = new StringTokenizer(property.getDefault(),",");
+		StringTokenizer tokenizer = new StringTokenizer(property.getDefault(),","); //$NON-NLS-1$
 		while(tokenizer.hasMoreTokens()){
 			combo.add(tokenizer.nextToken());
 		}
@@ -171,11 +188,11 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
     	fButton.setSelection(value);
     	fButton.addSelectionListener(new SelectionListener() {
             public void widgetSelected(SelectionEvent e) {
-              
+             //nothing to do 
             }
 
             public void widgetDefaultSelected(SelectionEvent e) {
-  
+            // nothing to do
             }
         });
     	
@@ -279,7 +296,7 @@ public abstract class ServerTypeDefinitionDecorator implements GenericServerComp
 
    /**
     * Returns the property name/value pairs.
-    * @return
+    * @return Map containing the values collected from the user
     */
 	public Map getValues(){
 		Map propertyMap = new HashMap();