You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/07/07 17:42:46 UTC
svn commit: r791874 - in
/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context:
PartialResponseWriter.java ResponseWriter.java ResponseWriterWrapper.java
Author: mconcini
Date: Tue Jul 7 15:42:46 2009
New Revision: 791874
URL: http://svn.apache.org/viewvc?rev=791874&view=rev
Log:
MYFACES-2227
Modified:
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/PartialResponseWriter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriter.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/PartialResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/PartialResponseWriter.java?rev=791874&r1=791873&r2=791874&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/PartialResponseWriter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/PartialResponseWriter.java Tue Jul 7 15:42:46 2009
@@ -77,7 +77,7 @@
{
// Close open <error-message> element.
- endCDATA();
+ _wrapped.endCDATA();
_wrapped.endElement ("error-message");
_wrapped.endElement ("error");
}
@@ -86,7 +86,7 @@
{
// Close open <eval> element.
- endCDATA();
+ _wrapped.endCDATA();
_wrapped.endElement ("eval");
}
@@ -105,7 +105,7 @@
// Close open <insert> element.
- endCDATA();
+ _wrapped.endCDATA();
_wrapped.endElement (insertType);
_wrapped.endElement ("insert");
@@ -114,7 +114,7 @@
public void endUpdate() throws IOException
{
- endCDATA();
+ _wrapped.endCDATA();
_wrapped.endElement ("update");
}
@@ -154,7 +154,7 @@
_wrapped.endElement ("error-name");
_wrapped.startElement ("error-message", null);
- startCDATA();
+ _wrapped.startCDATA();
// Leave open; caller will write message.
}
@@ -164,7 +164,7 @@
startChanges();
_wrapped.startElement ("eval", null);
- startCDATA();
+ _wrapped.startCDATA();
// Leave open; caller will write statements.
}
@@ -207,7 +207,7 @@
_wrapped.startElement ("update", null);
_wrapped.writeAttribute ("id", targetId, null);
- startCDATA();
+ _wrapped.startCDATA();
// Leave open; caller will write content.
}
@@ -257,21 +257,8 @@
_wrapped.startElement ("insert", null);
_wrapped.startElement (insertType, null);
_wrapped.writeAttribute ("id", targetId, null);
- startCDATA();
+ _wrapped.startCDATA();
// Leave open; caller will write content.
}
-
- /*
- * These methods are needed since we can't be sure that the data written by the caller will not
- * contain reserved characters.
- */
-
- private void endCDATA () throws IOException {
- _wrapped.write ("]]>");
- }
-
- private void startCDATA () throws IOException {
- _wrapped.write ("<![CDATA[");
- }
}
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriter.java?rev=791874&r1=791873&r2=791874&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriter.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriter.java Tue Jul 7 15:42:46 2009
@@ -44,7 +44,17 @@
public abstract void startElement(String name, UIComponent component) throws IOException;
public abstract void endElement(String name) throws IOException;
-
+
+ public void startCDATA() throws IOException
+ {
+ // no-op
+ }
+
+ public void endCDATA() throws IOException
+ {
+ // no-op
+ }
+
public abstract void writeAttribute(String name, Object value, String property) throws IOException;
public abstract void writeURIAttribute(String name, Object value, String property) throws IOException;
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java?rev=791874&r1=791873&r2=791874&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java Tue Jul 7 15:42:46 2009
@@ -132,5 +132,16 @@
{
getWrapped().writeText(object, component, string);
}
-
+
+ @Override
+ public void startCDATA() throws IOException
+ {
+ getWrapped().startCDATA();
+ }
+
+ @Override
+ public void endCDATA() throws IOException
+ {
+ getWrapped().endCDATA();
+ }
}