MoveToAttribute* Fix 'if' brackets.

[mono.git] / mcs / class / System.XML / System.Xml / XmlTextWriter.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriter.cs b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
index 4df230e6b4d4bdd2b23c7033d8663a019ddcbfe6..5d0de250549ceb11fe6bcb3a735506b3770aa021 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
@@ -24,15 +24,15 @@ namespace System.Xml
                protected bool openStartElement = false;
                protected bool openStartAttribute = false;
                protected bool documentStarted = false;
-               protected bool namespaces = true;
+               private bool namespaces = true;
                protected bool openAttribute = false;
                protected bool attributeWrittenForElement = false;
                protected Stack openElements = new Stack ();
-               protected Formatting formatting = Formatting.None;
-               protected int indentation = 2;
-               protected char indentChar = ' ';
+               private Formatting formatting = Formatting.None;
+               private int indentation = 2;
+               private char indentChar = ' ';
                protected string indentChars = "  ";
-               protected char quoteChar = '\"';
+               private char quoteChar = '\"';
                protected int indentLevel = 0;
                protected string indentFormatting;
                protected Stream baseStream = null;
@@ -197,19 +197,26 @@ namespace System.Xml
 
                public override void Close ()
                {
-                       while (openElements.Count > 0) {
-                               WriteEndElement();
-                       }
+                       CloseOpenAttributeAndElements ();
 
                        w.Close();
                        ws = WriteState.Closed;
                        openWriter = false;
                }
 
+               private void CloseOpenAttributeAndElements ()
+               {
+                       if (openAttribute)
+                               WriteEndAttribute ();
+
+                       while (openElements.Count > 0) {
+                               WriteEndElement();
+                       }
+               }
+
                private void CloseStartElement ()
                {
-                       if (openStartElement) 
-                       {
+                       if (openStartElement) {
                                w.Write(">");
                                ws = WriteState.Content;
                                openStartElement = false;
@@ -322,13 +329,22 @@ namespace System.Xml
                        openAttribute = false;
                }
 
-               [MonoTODO]
                public override void WriteEndDocument ()
                {
-                       throw new NotImplementedException ();
+                       if ((ws == WriteState.Start) || (ws == WriteState.Prolog))
+                               throw new ArgumentException ("This document does not have a root element.");
+
+                       CloseOpenAttributeAndElements ();
+
+                       ws = WriteState.Start;
                }
 
                public override void WriteEndElement ()
+               {
+                       WriteEndElementInternal (false);
+               }
+
+               private void WriteEndElementInternal (bool fullEndElement)
                {
                        if (openElements.Count == 0)
                                throw new InvalidOperationException("There was no XML start tag open.");
@@ -338,11 +354,17 @@ namespace System.Xml
                        CheckState ();
 
                        if (openStartElement) {
-                               w.Write (" />");
+                               if (openAttribute)
+                                       WriteEndAttribute ();
+
+                               if (fullEndElement)
+                                       w.Write ("></{0}>", ((XmlTextWriterOpenElement)openElements.Peek ()).Name);
+                               else
+                                       w.Write (" />");
+
                                openElements.Pop ();
                                openStartElement = false;
-                       }
-                       else {
+                       } else {
                                w.Write ("{0}</{1}>", indentFormatting, openElements.Pop ());
                        }
 
@@ -355,10 +377,9 @@ namespace System.Xml
                        throw new NotImplementedException ();
                }
 
-               [MonoTODO]
                public override void WriteFullEndElement ()
                {
-                       throw new NotImplementedException ();
+                       WriteEndElementInternal (true);
                }
 
                [MonoTODO]