From 2ffe52ce00e4528d5d7675ba57ba137f142fe0f8 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 17 Apr 2009 20:36:18 +0000
Subject: [PATCH] expose HTML to be rendered

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@17244 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../main/java/hudson/util/FormValidation.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java
index 48f9ae9f7f..cb176973ae 100644
--- a/core/src/main/java/hudson/util/FormValidation.java
+++ b/core/src/main/java/hudson/util/FormValidation.java
@@ -36,6 +36,7 @@ import hudson.model.BuildListener;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.Stapler;
 
 import javax.servlet.ServletException;
 import java.io.File;
@@ -186,11 +187,11 @@ public abstract class FormValidation extends IOException implements HttpResponse
         if(message==null)
             return ok();
         return new FormValidation(kind) {
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            public String renderHtml() {
                 // 1x16 spacer needed for IE since it doesn't support min-height
-                respond(rsp,"<div class="+ kind.name().toLowerCase() +"><img src='"+
-                        req.getContextPath()+ Hudson.RESOURCE_PATH+"/images/none.gif' height=16 width=1>"+
-                        message+"</div>");
+                return "<div class="+ kind.name().toLowerCase() +"><img src='"+
+                        Stapler.getCurrentRequest().getContextPath()+ Hudson.RESOURCE_PATH+"/images/none.gif' height=16 width=1>"+
+                        message+"</div>";
             }
         };
     }
@@ -200,8 +201,8 @@ public abstract class FormValidation extends IOException implements HttpResponse
      */
     public static FormValidation respond(Kind kind, final String html) {
         return new FormValidation(kind) {
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
-                respond(rsp,html);
+            public String renderHtml() {
+                return html;
             }
         };
     }
@@ -393,6 +394,12 @@ public abstract class FormValidation extends IOException implements HttpResponse
         this.kind = kind;
     }
 
+    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        respond(rsp, renderHtml());
+    }
+
+    public abstract String renderHtml();
+
     /**
      * Sends out an arbitrary HTML fragment as the output.
      */
-- 
GitLab