You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/05/15 15:58:00 UTC
svn commit: r1743919 - in
/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer:
ExtendedContentHandler.java SerializerWriter.java SerializerXmlHandler.java
ToStream.java ToXMLStream.java
Author: veithen
Date: Sun May 15 15:57:59 2016
New Revision: 1743919
URL: http://svn.apache.org/viewvc?rev=1743919&view=rev
Log:
Merge the code in ToXMLStream into ToStream.
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerWriter.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java?rev=1743919&r1=1743918&r2=1743919&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ExtendedContentHandler.java Sun May 15 15:57:59 2016
@@ -92,13 +92,6 @@ public interface ExtendedContentHandler
public void startElement(String qName) throws StreamException;
/**
- * Notify of an entity reference.
- * @param entityName the name of the entity
- * @throws StreamException
- */
- public void entityReference(String entityName) throws StreamException;
-
- /**
* This method is used to set the source locator, which might be used to
* generated an error message.
* @param locator the source locator
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerWriter.java?rev=1743919&r1=1743918&r2=1743919&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerWriter.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerWriter.java Sun May 15 15:57:59 2016
@@ -28,9 +28,9 @@ import org.apache.axiom.core.stream.Stre
* to a {@link ToXMLStream}.
*/
final class SerializerWriter extends Writer {
- private final ToXMLStream serializer;
+ private final ToStream serializer;
- public SerializerWriter(ToXMLStream serializer) {
+ public SerializerWriter(ToStream serializer) {
this.serializer = serializer;
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java?rev=1743919&r1=1743918&r2=1743919&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java Sun May 15 15:57:59 2016
@@ -29,7 +29,7 @@ import org.apache.axiom.core.stream.XmlH
import org.apache.axiom.core.stream.serializer.writer.UnmappableCharacterHandler;
public class SerializerXmlHandler implements XmlHandler {
- private final ToXMLStream serializer;
+ private final ToStream serializer;
private Stack<String> elementNameStack = new Stack<String>();
private String elementURI;
private String elementLocalName;
@@ -38,12 +38,12 @@ public class SerializerXmlHandler implem
private int bufferPos;
public SerializerXmlHandler(Writer writer) {
- this.serializer = new ToXMLStream();
+ this.serializer = new ToStream();
serializer.setWriter(writer);
}
public SerializerXmlHandler(OutputStream out, String encoding) {
- this.serializer = new ToXMLStream();
+ this.serializer = new ToStream();
serializer.setEncoding(encoding);
serializer.setOutputStream(out);
}
@@ -184,11 +184,11 @@ public class SerializerXmlHandler implem
public void processEntityReference(String name, String replacementText) throws StreamException {
serializer.closeStartTag();
- serializer.entityReference(name);
+ serializer.processEntityReference(name);
}
public void completed() throws StreamException {
- serializer.endDocument();
+ serializer.completed();
}
public void flushBuffer() throws StreamException {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java?rev=1743919&r1=1743918&r2=1743919&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java Sun May 15 15:57:59 2016
@@ -43,7 +43,7 @@ import org.apache.axiom.core.stream.seri
*
* @xsl.usage internal
*/
-abstract public class ToStream extends SerializerBase
+final class ToStream extends SerializerBase
{
private static final String COMMENT_BEGIN = "<!--";
@@ -91,7 +91,7 @@ abstract public class ToStream extends S
* Map that tells which characters should have special treatment, and it
* provides character to entity name lookup.
*/
- protected CharInfo m_charInfo;
+ protected CharInfo m_charInfo = CharInfo.getCharInfo(CharInfo.XML_ENTITIES_RESOURCE);
/**
* Add space before '/>' for XHTML.
@@ -1507,4 +1507,19 @@ abstract public class ToStream extends S
throw new StreamException(ex);
}
}
+
+ public void processEntityReference(String name) throws StreamException {
+ try {
+ final XmlWriter writer = m_writer;
+ writer.write('&');
+ writer.write(name);
+ writer.write(';');
+ } catch(IOException ex) {
+ throw new StreamException(ex);
+ }
+ }
+
+ public void completed() throws StreamException {
+ flushBuffer();
+ }
}