You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/07/05 11:08:26 UTC
svn commit: r1142933 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/ toba...
Author: lofwyr
Date: Tue Jul 5 09:08:25 2011
New Revision: 1142933
URL: http://svn.apache.org/viewvc?rev=1142933&view=rev
Log:
Code Style: Renaming ResponseWriters
- Every name should contain "ResponseWriter" in the name, the type should be the prefix and not in the middle of the name.
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java (contents, props changed)
- copied, changed from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java (contents, props changed)
- copied, changed from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java (contents, props changed)
- copied, changed from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java (contents, props changed)
- copied, changed from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java (contents, props changed)
- copied, changed from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java?rev=1142933&r1=1142932&r2=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java Tue Jul 5 09:08:25 2011
@@ -22,7 +22,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.lifecycle.TobagoLifecycle;
import org.apache.myfaces.tobago.internal.util.ResponseUtils;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseJsonWriterImpl;
+import org.apache.myfaces.tobago.internal.webapp.JsonResponseWriter;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.EncodeAjaxCallback;
import org.apache.myfaces.tobago.util.RequestUtils;
@@ -103,7 +103,7 @@ public class AjaxResponseRenderer {
private void renderComponent(FacesContext facesContext, RenderKit renderKit, String clientId, UIComponent component)
throws IOException {
final PrintWriter writer = getPrintWriter(facesContext);
- final TobagoResponseJsonWriterImpl jsonWriter = getJsonResponseWriter(renderKit, writer);
+ final JsonResponseWriter jsonWriter = getJsonResponseWriter(renderKit, writer);
facesContext.setResponseWriter(jsonWriter);
@@ -206,14 +206,14 @@ public class AjaxResponseRenderer {
throw new IOException("No ResponseWriter found for ExternalContext " + externalContext);
}
- private TobagoResponseJsonWriterImpl getJsonResponseWriter(RenderKit renderKit, PrintWriter writer) {
+ private JsonResponseWriter getJsonResponseWriter(RenderKit renderKit, PrintWriter writer) {
ResponseWriter newWriter = renderKit.createResponseWriter(writer, CONTENT_TYPE, null);
- if (newWriter instanceof TobagoResponseJsonWriterImpl) {
- return (TobagoResponseJsonWriterImpl) newWriter;
+ if (newWriter instanceof JsonResponseWriter) {
+ return (JsonResponseWriter) newWriter;
} else {
// with different RenderKit we got not the correct class
- return new TobagoResponseJsonWriterImpl(newWriter, CONTENT_TYPE, newWriter.getCharacterEncoding());
+ return new JsonResponseWriter(newWriter, CONTENT_TYPE, newWriter.getCharacterEncoding());
}
}
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java (from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java&r1=1140983&r2=1142933&rev=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java Tue Jul 5 09:08:25 2011
@@ -32,15 +32,15 @@ import java.io.Writer;
import java.util.EmptyStackException;
import java.util.Stack;
-public class DebugTobagoResponseWriterWrapper extends TobagoResponseWriter {
+public class DebugResponseWriterWrapper extends TobagoResponseWriter {
private Stack<String> stack = new Stack<String>();
- private static final Logger LOG = LoggerFactory.getLogger(DebugTobagoResponseWriterWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugResponseWriterWrapper.class);
private final TobagoResponseWriter responseWriter;
- public DebugTobagoResponseWriterWrapper(TobagoResponseWriter responseWriter) {
+ public DebugResponseWriterWrapper(TobagoResponseWriter responseWriter) {
this.responseWriter = responseWriter;
}
@@ -62,7 +62,7 @@ public class DebugTobagoResponseWriterWr
}
public ResponseWriter cloneWithWriter(Writer writer) {
- return new DebugTobagoResponseWriterWrapper((TobagoResponseWriter) responseWriter.cloneWithWriter(writer));
+ return new DebugResponseWriterWrapper((TobagoResponseWriter) responseWriter.cloneWithWriter(writer));
}
@Deprecated
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java (from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java&r1=1140983&r2=1142933&rev=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java Tue Jul 5 09:08:25 2011
@@ -28,14 +28,14 @@ import java.io.IOException;
import java.io.Writer;
import java.util.Map;
-public class TobagoResponseWriterImpl extends TobagoResponseWriterBase {
+public class HtmlResponseWriter extends TobagoResponseWriterBase {
private static final String HTML_DOCTYPE =
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">";
private final HtmlWriterUtils helper;
- public TobagoResponseWriterImpl(
+ public HtmlResponseWriter(
Writer writer, String contentType, String characterEncoding) {
super(writer, contentType, characterEncoding);
this.helper = new HtmlWriterUtils(writer, characterEncoding);
@@ -73,7 +73,7 @@ public class TobagoResponseWriterImpl ex
}
public ResponseWriter cloneWithWriter(final Writer originalWriter) {
- return new TobagoResponseWriterImpl(
+ return new HtmlResponseWriter(
originalWriter, getContentType(), getCharacterEncoding());
}
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java (from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java&r1=1140983&r2=1142933&rev=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java Tue Jul 5 09:08:25 2011
@@ -17,23 +17,23 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
import org.apache.myfaces.tobago.internal.util.FastStringWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import java.io.IOException;
import java.io.Writer;
-public class TobagoResponseJsonWriterImpl extends TobagoResponseWriterImpl {
+public class JsonResponseWriter extends HtmlResponseWriter {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseWriterImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HtmlResponseWriter.class);
private Writer javascriptWriter;
private boolean javascriptMode;
- public TobagoResponseJsonWriterImpl(Writer writer, String contentType, String characterEncoding) {
+ public JsonResponseWriter(Writer writer, String contentType, String characterEncoding) {
super(writer, contentType, characterEncoding);
this.javascriptWriter = new FastStringWriter();
}
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/JsonResponseWriter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java (from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java&r1=1140983&r2=1142933&rev=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseXmlWriterImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java Tue Jul 5 09:08:25 2011
@@ -27,9 +27,9 @@ import java.io.IOException;
import java.io.Writer;
import java.util.Arrays;
-public final class TobagoResponseXmlWriterImpl extends TobagoResponseWriterBase {
+public final class XmlResponseWriter extends TobagoResponseWriterBase {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseXmlWriterImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlResponseWriter.class);
private static final String XHTML_DOCTYPE =
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
@@ -38,7 +38,7 @@ public final class TobagoResponseXmlWrit
public static final String XML_VERSION_1_0_ENCODING_UTF_8 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
public static final int XML_VERSION_1_0_ENCODING_UTF_8_LENGTH = XML_VERSION_1_0_ENCODING_UTF_8.length();
- public TobagoResponseXmlWriterImpl(
+ public XmlResponseWriter(
Writer writer, String contentType, String characterEncoding) {
super(writer, contentType, characterEncoding);
}
@@ -71,7 +71,7 @@ public final class TobagoResponseXmlWrit
}
public ResponseWriter cloneWithWriter(final Writer originalWriter) {
- return new TobagoResponseXmlWriterImpl(
+ return new XmlResponseWriter(
originalWriter, getContentType(), getCharacterEncoding());
}
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java?rev=1142933&r1=1142932&r2=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java Tue Jul 5 09:08:25 2011
@@ -20,10 +20,10 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Capability;
-import org.apache.myfaces.tobago.internal.webapp.DebugTobagoResponseWriterWrapper;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseJsonWriterImpl;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterImpl;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseXmlWriterImpl;
+import org.apache.myfaces.tobago.internal.webapp.DebugResponseWriterWrapper;
+import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
+import org.apache.myfaces.tobago.internal.webapp.JsonResponseWriter;
+import org.apache.myfaces.tobago.internal.webapp.XmlResponseWriter;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -95,7 +95,7 @@ public class TobagoRenderKit extends Ren
contentType = "text/fo";
LOG.warn("patching content type from " + contentTypeList + " to " + contentType + "'");
} else if (contentTypeList.indexOf("application/json") > -1) {
- return new TobagoResponseJsonWriterImpl(writer, "application/json", characterEncoding);
+ return new JsonResponseWriter(writer, "application/json", characterEncoding);
} else {
contentType = "text/html";
LOG.warn("Content-Type '" + contentTypeList + "' not supported! Using text/html");
@@ -120,12 +120,12 @@ public class TobagoRenderKit extends Ren
TobagoResponseWriter responseWriter;
if (xml) {
- responseWriter = new TobagoResponseXmlWriterImpl(writer, contentType, characterEncoding);
+ responseWriter = new XmlResponseWriter(writer, contentType, characterEncoding);
} else {
- responseWriter = new TobagoResponseWriterImpl(writer, contentType, characterEncoding);
+ responseWriter = new HtmlResponseWriter(writer, contentType, characterEncoding);
}
if (TobagoConfig.getInstance(FacesContext.getCurrentInstance()).getProjectStage() == ProjectStage.Development) {
- responseWriter = new DebugTobagoResponseWriterWrapper(responseWriter);
+ responseWriter = new DebugResponseWriterWrapper(responseWriter);
}
return responseWriter;
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java?rev=1142933&r1=1142932&r2=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java Tue Jul 5 09:08:25 2011
@@ -18,7 +18,7 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.myfaces.tobago.internal.mock.faces.AbstractTobagoTestBase;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseXmlWriterImpl;
+import org.apache.myfaces.tobago.internal.webapp.XmlResponseWriter;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +34,7 @@ public class ResponseWriterDividerUnitTe
public void test() throws IOException {
StringWriter stringWriter = new StringWriter();
- getFacesContext().setResponseWriter(new TobagoResponseXmlWriterImpl(stringWriter, "text/xml", "ISO-8859-1"));
+ getFacesContext().setResponseWriter(new XmlResponseWriter(stringWriter, "text/xml", "ISO-8859-1"));
DefaultMutableTreeNode root = new DefaultMutableTreeNode("Root");
DefaultMutableTreeNode colors = new DefaultMutableTreeNode("Colors");
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java?rev=1142933&r1=1142932&r2=1142933&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java Tue Jul 5 09:08:25 2011
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.webapp
* limitations under the License.
*/
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterImpl;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseXmlWriterImpl;
+import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
+import org.apache.myfaces.tobago.internal.webapp.XmlResponseWriter;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.junit.Assert;
@@ -36,7 +36,7 @@ public class TobagoResponseWriterUnitTes
@Before
public void setUp() throws Exception {
stringWriter = new StringWriter();
- writer = new TobagoResponseWriterImpl(stringWriter, "", "UTF-8");
+ writer = new HtmlResponseWriter(stringWriter, "", "UTF-8");
}
@Test
@@ -115,7 +115,7 @@ public class TobagoResponseWriterUnitTes
@Test
public void testNonUtf8() throws IOException {
- TobagoResponseWriter writer1 = new TobagoResponseWriterImpl(stringWriter, "", "ISO-8859-1");
+ TobagoResponseWriter writer1 = new HtmlResponseWriter(stringWriter, "", "ISO-8859-1");
writer1.startElement(HtmlElements.INPUT, null);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein über 100 â¬.", null);
writer1.writeAttribute(HtmlAttributes.READONLY, true);
@@ -127,7 +127,7 @@ public class TobagoResponseWriterUnitTes
@Test
public void testCharArray() throws IOException {
- TobagoResponseWriter writer = new TobagoResponseXmlWriterImpl(stringWriter, "text/xml", "ISO-8859-1");
+ TobagoResponseWriter writer = new XmlResponseWriter(stringWriter, "text/xml", "ISO-8859-1");
writer.writeText("123".toCharArray(), 0, 3);
Assert.assertEquals("123", stringWriter.toString());
}
Copied: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java (from r1140983, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java&r1=1140983&r2=1142933&rev=1142933&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL