[richfaces-svn-commits] JBoss Rich Faces SVN: r15977 - branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-11-23 09:40:44 -0500 (Mon, 23 Nov 2009)
New Revision: 15977

Modified:
   branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-8001calendar: initialization failed if any facet defined and day markup is default(not redefined).

Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2009-11-23 13:51:13 UTC (rev 15976)
+++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2009-11-23 14:40:44 UTC (rev 15977)
@@ -382,30 +382,11 @@
         ResponseWriter clonedWriter = writer.cloneWithWriter(dumpingWriter);
         context.setResponseWriter(clonedWriter);
 
-        TemplateComponent templateComponent = null;
-        if (component instanceof TemplateComponent) {
-            templateComponent = (TemplateComponent) component;
-	}
+        writeScriptBody(context, component, children);
 
-        try {
-            if (templateComponent != null) {
-                templateComponent.startTemplateEncode();
-            }
+        clonedWriter.flush();
+        context.setResponseWriter(writer);
 
-            if (children) {
-                this.renderChildren(context, component);
-            } else {
-                this.renderChild(context, component);
-            }
-        } finally {
-            if (templateComponent != null) {
-                templateComponent.endTemplateEncode();
-            }
-
-            clonedWriter.flush();
-            context.setResponseWriter(writer);
-        }
-
         return dumpingWriter.toString();
     }
 
@@ -482,7 +463,7 @@
         addFacetMarkupScriptBody(context, component, jsonMap, "footer");
 
         context.getResponseWriter().write(new JSONObject(jsonMap).toString());
-		}
+    }
 
     private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, String> jsonMap, String facetName) throws IOException {
         String res = getOptionalFacetMarkupScriptBody(context, component, facetName);