You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/05/02 18:40:09 UTC
cvs commit: incubator-myfaces/src/share/org/apache/myfaces/renderkit/html HtmlResponseWriterImpl.java
svieujot 2005/05/02 09:40:09
Modified: src/components/org/apache/myfaces/custom/buffer
BufferRenderer.java Buffer.java
src/share/org/apache/myfaces/renderkit/html
HtmlResponseWriterImpl.java
Log:
Slight code refactor for x:buffer
Revision Changes Path
1.4 +15 -10 incubator-myfaces/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java
Index: BufferRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/buffer/BufferRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BufferRenderer.java 1 Feb 2005 16:54:07 -0000 1.3
+++ BufferRenderer.java 2 May 2005 16:40:09 -0000 1.4
@@ -31,11 +31,16 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.renderkit.html.util.DummyFormResponseWriter;
+import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
/**
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.4 2005/05/02 16:40:09 svieujot
+ * Slight code refactor for x:buffer
+ *
* Revision 1.3 2005/02/01 16:54:07 svieujot
* Clean up.
*
@@ -69,21 +74,21 @@
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) {
Buffer buffer = (Buffer)uiComponent;
- buffer.fill(bufferWriter, facesContext);
+ buffer.fill(bufferWriter.toString(), facesContext);
+
+ facesContext.setResponseWriter( initialWriter );
if( bufferWriter.getDummyFormParams() != null ){
- // Attempt to add the dummy form params (will not work with Sun RI) using reflexion.
- try {
- Method add = initialWriter.getClass().getDeclaredMethod("addDummyFormParameter", new Class[] {String.class});
- for(Iterator i = bufferWriter.getDummyFormParams().iterator() ; i.hasNext() ;){
- add.invoke(initialWriter, new Object[] {i.next()});
- }
+ try{ // Attempt to add the dummy form params (will not work with Sun RI)
+ DummyFormResponseWriter dummyFormResponseWriter = DummyFormUtils.getDummyFormResponseWriter( facesContext );
+ for(Iterator i = bufferWriter.getDummyFormParams().iterator() ; i.hasNext() ;)
+ dummyFormResponseWriter.addDummyFormParameter( i.next().toString() );
+ if( bufferWriter.isWriteDummyForm() )
+ dummyFormResponseWriter.setWriteDummyForm( true );
} catch (Exception e) {
log.warn("Dummy form parameters are not supported by this JSF implementation.");
}
}
-
- facesContext.setResponseWriter( initialWriter );
}
private static class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl {
1.2 +7 -4 incubator-myfaces/src/components/org/apache/myfaces/custom/buffer/Buffer.java
Index: Buffer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/buffer/Buffer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Buffer.java 4 Jan 2005 15:41:06 -0000 1.1
+++ Buffer.java 2 May 2005 16:40:09 -0000 1.2
@@ -23,6 +23,9 @@
* @author Sylvain Vieujot (latest modification by $Author$)
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.2 2005/05/02 16:40:09 svieujot
+ * Slight code refactor for x:buffer
+ *
* Revision 1.1 2005/01/04 15:41:06 svieujot
* new x:buffer component.
*
@@ -60,7 +63,7 @@
_intoExpression = (String) values[1];
}
- void fill(Object content, FacesContext facesContext){
+ void fill(String content, FacesContext facesContext){
ValueBinding intoVB;
if (_intoExpression == null) {
@@ -70,6 +73,6 @@
intoVB = facesContext.getApplication().createValueBinding( _intoExpression );
}
- intoVB.setValue(facesContext, content.toString());
+ intoVB.setValue(facesContext, content);
}
}
\ No newline at end of file
1.2 +9 -1 incubator-myfaces/src/share/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
Index: HtmlResponseWriterImpl.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/share/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HtmlResponseWriterImpl.java 1 Feb 2005 16:51:48 -0000 1.1
+++ HtmlResponseWriterImpl.java 2 May 2005 16:40:09 -0000 1.2
@@ -38,6 +38,9 @@
* @author Anton Koinov
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.2 2005/05/02 16:40:09 svieujot
+ * Slight code refactor for x:buffer
+ *
* Revision 1.1 2005/02/01 16:51:48 svieujot
* Move the HtmlResponseWriterImpl to the shared sources directory.
*
@@ -526,6 +529,11 @@
// DummyFormResponseWriter support
+ public boolean isWriteDummyForm()
+ {
+ return _writeDummyForm;
+ }
+
public void setWriteDummyForm(boolean writeDummyForm)
{
_writeDummyForm = writeDummyForm;