svn commit: r596255 - /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java

[bo...@apache.org]

Author: bommel
Date: Mon Nov 19 02:21:43 2007
New Revision: 596255

URL: http://svn.apache.org/viewvc?rev=596255&view=rev
Log:
(TOBAGO-542) FileUpload does not work in Facelets

Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=596255&r1=596254&r2=596255&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Mon Nov 19 02:21:43 2007
@@ -143,7 +143,7 @@
     }
 
     // reset responseWriter and render page
-    facesContext.setResponseWriter((ResponseWriter) writer);
+    facesContext.setResponseWriter(writer);
 
     ResponseUtils.ensureNoCacheHeader(facesContext.getExternalContext());
 
@@ -173,9 +173,12 @@
 
     writer.startElement(HtmlConstants.HTML, null);
     writer.startElement(HtmlConstants.HEAD, null);
+    final boolean debugMode =
+            ClientProperties.getInstance(facesContext.getViewRoot()).isDebugMode();
 
+    //if (debugMode) {
     writer.writeJavascript("var TbgHeadStart = new Date();");
-
+    //}
     // meta
     // TODO duplicate; see PageTag.doStartTag()
 //    writer.startElement(HtmlConstants.META, null);
@@ -249,9 +252,7 @@
 
     int clientLogSeverity = 2;
     boolean hideClientLogging = true;
-    final boolean debugMode =
-        ClientProperties.getInstance(facesContext.getViewRoot()).isDebugMode();
-//        true; hideClientLogging = false;
+    //        true; hideClientLogging = false;
     if (debugMode) {
       String severity = (String) facesContext.getExternalContext().getRequestMap().get(CLIENT_DEBUG_SEVERITY);
       LOG.info("get " + CLIENT_DEBUG_SEVERITY + " = " + severity);
@@ -354,7 +355,9 @@
       final String[] jsCommand = new String[]{"new LOG.LogArea({hide: " + hideClientLogging + "});"};
       HtmlRendererUtil.writeScriptLoader(facesContext, jsFiles, jsCommand);
     }
+    //if (debugMode)  {
     writer.writeJavascript("TbgTimer.startBody = new Date();");
+    //}
 
     writer.startElement(HtmlConstants.FORM, page);
     writer.writeNameAttribute(
@@ -362,7 +365,12 @@
     writer.writeAttribute(HtmlAttributes.ACTION, formAction, true);
     writer.writeIdAttribute(page.getFormId(facesContext));
     writer.writeAttribute(HtmlAttributes.METHOD, getMethod(page), false);
-    writer.writeAttributeFromComponent(HtmlAttributes.ENCTYPE, ATTR_ENCTYPE);
+    String enctype = (String) facesContext.getExternalContext().getRequestMap().get(UIPage.ENCTYPE_KEY);
+    if (enctype != null) {
+      writer.writeAttribute(HtmlAttributes.ENCTYPE, enctype, false); 
+    } else {
+      writer.writeAttributeFromComponent(HtmlAttributes.ENCTYPE, ATTR_ENCTYPE);
+    }
     // TODO: enable configuration of  'accept-charset'
     writer.writeAttribute(HtmlAttributes.ACCEPT_CHARSET, FORM_ACCEPT_CHARSET, false);
 
@@ -444,7 +452,9 @@
           logMessages.toArray(new String[logMessages.size()]));
     }
 
+    //if (debugMode) {
     writer.writeJavascript("TbgTimer.endBody = new Date();");
+    //}
     writer.endElement(HtmlConstants.BODY);
     writer.endElement(HtmlConstants.HTML);