From 969ba3ab1418256ce515e271c473636fdaeee01d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 28 Sep 2007 14:32:36 +0000 Subject: [PATCH] added a work-around for IE. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4986 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/util/FormFieldValidator.java | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/util/FormFieldValidator.java b/core/src/main/java/hudson/util/FormFieldValidator.java index 38c8fc2056..d350cc067e 100644 --- a/core/src/main/java/hudson/util/FormFieldValidator.java +++ b/core/src/main/java/hudson/util/FormFieldValidator.java @@ -1,6 +1,7 @@ package hudson.util; import hudson.FilePath; +import hudson.Functions; import hudson.Util; import static hudson.Util.fixEmpty; import hudson.model.AbstractProject; @@ -121,7 +122,10 @@ public abstract class FormFieldValidator { ok(); } else { response.setContentType("text/html;charset=UTF-8"); - response.getWriter().print("
"+message+"
"); + // 1x16 spacer needed for IE since it doesn't support min-height + response.getWriter().print("
"+ + message+"
"); } } @@ -202,9 +206,15 @@ public abstract class FormFieldValidator { * @since 1.90. */ public static class WorkspaceFileMask extends FormFieldValidator { + private final boolean errorIfNotExist; public WorkspaceFileMask(StaplerRequest request, StaplerResponse response) { + this(request, response, true); + } + + public WorkspaceFileMask(StaplerRequest request, StaplerResponse response, boolean errorIfNotExist) { super(request, response, false); + this.errorIfNotExist = errorIfNotExist; } protected void check() throws IOException, ServletException { @@ -224,7 +234,9 @@ public abstract class FormFieldValidator { return; } - error(ws.validateAntFileMask(value)); + String msg = ws.validateAntFileMask(value); + if(errorIfNotExist) error(msg); + else warning(msg); } catch (InterruptedException e) { ok(); // coundn't check } @@ -237,9 +249,15 @@ public abstract class FormFieldValidator { * @since 1.116. */ public static class WorkspaceDirectory extends FormFieldValidator { + private final boolean errorIfNotExist; + + public WorkspaceDirectory(StaplerRequest request, StaplerResponse response, boolean errorIfNotExist) { + super(request, response, false); + this.errorIfNotExist = errorIfNotExist; + } public WorkspaceDirectory(StaplerRequest request, StaplerResponse response) { - super(request, response, false); + this(request, response, true); } protected void check() throws IOException, ServletException { @@ -270,8 +288,11 @@ public abstract class FormFieldValidator { ok(); else error(value+" is not a directory"); - } else - error("No such directory: "+value); + } else { + String msg = "No such directory: " + value; + if(errorIfNotExist) error(msg); + else warning(msg); + } } catch (InterruptedException e) { ok(); // coundn't check }