Merge pull request #7 from cordisvictor/v1.4.1

v1.4.1: fix XMLWriter text driver empty line when pretty printing

Author: cordisvictor

README.md

@@ -9,11 +9,20 @@ EasyML
   (http://sourceforge.net/projects/kxml/files/kxml2/2.3.0/kxml2-min-2.3.0.jar/download)
 
 
+!Release 1.4.1
+- bugfix: XMLWriter text driver empty line when pretty printing.
+
+
 !Release 1.4.0
 - NON-BACKWARD COMPATIBLE refactor: EasyML now immutable(removed setters).
 - feature: EasyMLBuilder for easyml customization.
 
 
+!Release 1.3.10
+- bugfix: XMLWriter text driver empty line when pretty printing.
+- javadoc: improvements.
+
+
 !Release 1.3.9
 - feature: EasyML, XMLReader, XMLWriter custom XML root tag setting.
 - refactor: source level 1.7 warnings fixed.

easyml/src/net/sourceforge/easyml/XMLWriter.java

@@ -80,7 +80,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.0
- * @version 1.3.9
+ * @version 1.4.1
  */
 public class XMLWriter implements Flushable, Closeable {
 
@@ -335,13 +335,13 @@ public String toString() {
      */
     public static abstract class Driver implements CompositeWriter, Flushable, Closeable {
 
-        protected static final int STATE_INITIAL = 0;
-        protected static final int STATE_START = 1;
-        protected static final int STATE_VALUE = 2;
-        protected static final int STATE_VALUE_END = 3;
+        protected static final byte STATE_INITIAL = 0;
+        protected static final byte STATE_START = 1;
+        protected static final byte STATE_VALUE = 2;
+        protected static final byte STATE_VALUE_END = 3;
         private final XMLWriter target;
         private String oneTimeUniqueId;
-        protected int state;
+        protected byte state;
 
         /**
          * Creates a new instance to be used by the <code>target</code>

easyml/src/net/sourceforge/easyml/XMLWriterTextDriver.java

@@ -34,7 +34,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.1.0
- * @version 1.3.9
+ * @version 1.4.1
  */
 /* default */ final class XMLWriterTextDriver extends XMLWriter.Driver {
 
@@ -100,15 +100,16 @@ private void writeAttrEqValue(String attr, String value) throws IOException {
     @Override
     public void startElement(String name) {
         try {
-            if (this.state == XMLWriter.Driver.STATE_INITIAL) {
-                this.state = XMLWriter.Driver.STATE_VALUE;
-            } else if (this.state == XMLWriter.Driver.STATE_START) {
+            if (this.state == XMLWriter.Driver.STATE_START) {
                 this.writer.write('>');
-                this.state = XMLWriter.Driver.STATE_VALUE;
+                writeIndentedLt();
+            } else if (this.state == XMLWriter.Driver.STATE_INITIAL) {
+                this.writer.write('<');
             } else if (this.state != XMLWriter.Driver.STATE_VALUE) {
                 throw new IllegalStateException("cannot write element start");
+            } else {
+                writeIndentedLt();
             }
-            writeIndentedLt();
             this.writer.write(name);
             if (this.hasOneTimeUniqueId()) {
                 writeAttrEqValue(DTD.ATTRIBUTE_ID, this.oneTimeUniqueId());