Add support for adding initial namespace context to an XmlBufferReader.

pdvrieze · Mar 1, 2024 · b7327c6 · b7327c6
1 parent 3440f6b
commit b7327c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/api/android/core.api b/core/api/android/core.api
@@ -264,6 +264,7 @@ public final class nl/adaptivity/xmlutil/XMLConstants {
 
 public final class nl/adaptivity/xmlutil/XmlBufferReader : nl/adaptivity/xmlutil/XmlReader {
 	public fun <init> (Ljava/util/List;)V
+	public fun <init> (Ljava/util/List;Lnl/adaptivity/xmlutil/IterableNamespaceContext;)V
 	public fun close ()V
 	public fun getAttributeCount ()I
 	public fun getAttributeLocalName (I)Ljava/lang/String;

diff --git a/core/api/jvm/core.api b/core/api/jvm/core.api
@@ -287,6 +287,7 @@ public final class nl/adaptivity/xmlutil/XMLConstants {
 
 public final class nl/adaptivity/xmlutil/XmlBufferReader : nl/adaptivity/xmlutil/XmlReader {
 	public fun <init> (Ljava/util/List;)V
+	public fun <init> (Ljava/util/List;Lnl/adaptivity/xmlutil/IterableNamespaceContext;)V
 	public fun close ()V
 	public fun getAttributeCount ()I
 	public fun getAttributeLocalName (I)Ljava/lang/String;

diff --git a/core/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlBufferReader.kt b/core/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlBufferReader.kt
@@ -28,10 +28,19 @@ import nl.adaptivity.xmlutil.core.impl.NamespaceHolder
  * A reader that presents a list of events as an xml reader. This is designed to work together with
  * [XmlBufferedWriter].
  */
-public class XmlBufferReader(private val buffer: List<XmlEvent>) : XmlReader {
+public class XmlBufferReader private constructor(
+    private val buffer: List<XmlEvent>,
+    private val namespaceHolder: NamespaceHolder
+) : XmlReader {
     private var currentPos = -1
 
-    private val namespaceHolder = NamespaceHolder()
+    public constructor(buffer: List<XmlEvent>): this(buffer, NamespaceHolder())
+    public constructor(buffer: List<XmlEvent>, initialContext: IterableNamespaceContext): this(
+        buffer,
+        NamespaceHolder().also {
+            initialContext.forEach { ns -> it.addPrefixToContext(ns) }
+        }
+    )
 
     override val eventType: EventType get() = buffer[currentPos].eventType