[xstream-scm] [2173] branches/v-1.4.x: Merge XSTR-747 from trunk.

Tue, 03 Dec 2013 14:33:00 -0800

Title: [2173] branches/v-1.4.x: Merge XSTR-747 from trunk.

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java (2172 => 2173)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java	2013-12-03 22:27:42 UTC (rev 2172)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java	2013-12-03 22:32:10 UTC (rev 2173)
@@ -12,6 +12,7 @@
 
 import com.bea.xml.stream.MXParserFactory;
 import com.bea.xml.stream.XMLOutputFactoryBase;
+import com.thoughtworks.xstream.io.naming.NameCoder;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
@@ -28,18 +29,38 @@
         super();
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #BEAStaxDriver(QNameMap, NameCoder)}
+     */
     public BEAStaxDriver(QNameMap qnameMap, XmlFriendlyNameCoder nameCoder) {
         super(qnameMap, nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public BEAStaxDriver(QNameMap qnameMap, NameCoder nameCoder) {
+        super(qnameMap, nameCoder);
+    }
+
     public BEAStaxDriver(QNameMap qnameMap) {
         super(qnameMap);
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #BEAStaxDriver(NameCoder)}
+     */
     public BEAStaxDriver(XmlFriendlyNameCoder nameCoder) {
         super(nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public BEAStaxDriver(NameCoder nameCoder) {
+        super(nameCoder);
+    }
+
     protected XMLInputFactory createInputFactory() {
         return new MXParserFactory();
     }

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java (2172 => 2173)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java	2013-12-03 22:27:42 UTC (rev 2172)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java	2013-12-03 22:32:10 UTC (rev 2173)
@@ -12,6 +12,7 @@
 
 import com.thoughtworks.xstream.core.JVM;
 import com.thoughtworks.xstream.io.StreamException;
+import com.thoughtworks.xstream.io.naming.NameCoder;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
@@ -37,18 +38,38 @@
         super();
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #StandardStaxDriver(QNameMap, NameCoder)}
+     */
     public StandardStaxDriver(QNameMap qnameMap, XmlFriendlyNameCoder nameCoder) {
         super(qnameMap, nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public StandardStaxDriver(QNameMap qnameMap, NameCoder nameCoder) {
+        super(qnameMap, nameCoder);
+    }
+
     public StandardStaxDriver(QNameMap qnameMap) {
         super(qnameMap);
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #StandardStaxDriver(NameCoder)}
+     */
     public StandardStaxDriver(XmlFriendlyNameCoder nameCoder) {
         super(nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public StandardStaxDriver(NameCoder nameCoder) {
+        super(nameCoder);
+    }
+
     protected XMLInputFactory createInputFactory() {
         Exception exception = null;
         try {

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java (2172 => 2173)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java	2013-12-03 22:27:42 UTC (rev 2172)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java	2013-12-03 22:32:10 UTC (rev 2173)
@@ -12,6 +12,7 @@
 
 import com.ctc.wstx.stax.WstxInputFactory;
 import com.ctc.wstx.stax.WstxOutputFactory;
+import com.thoughtworks.xstream.io.naming.NameCoder;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
@@ -28,18 +29,38 @@
         super();
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #WstxDriver(QNameMap, NameCoder)}
+     */
     public WstxDriver(QNameMap qnameMap, XmlFriendlyNameCoder nameCoder) {
         super(qnameMap, nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public WstxDriver(QNameMap qnameMap, NameCoder nameCoder) {
+        super(qnameMap, nameCoder);
+    }
+
     public WstxDriver(QNameMap qnameMap) {
         super(qnameMap);
     }
 
+    /**
+     * @deprecated As of upcoming use {@link #WstxDriver(NameCoder)}
+     */
     public WstxDriver(XmlFriendlyNameCoder nameCoder) {
         super(nameCoder);
     }
 
+    /**
+     * @since upcoming
+     */
+    public WstxDriver(NameCoder nameCoder) {
+        super(nameCoder);
+    }
+
     protected XMLInputFactory createInputFactory() {
         return new WstxInputFactory();
     }

Modified: branches/v-1.4.x/xstream-distribution/src/content/changes.html (2172 => 2173)


--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2013-12-03 22:27:42 UTC (rev 2172)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2013-12-03 22:32:10 UTC (rev 2173)
@@ -68,13 +68,19 @@
     <h2>Minor changes</h2>
     
     <ul>
-    	<li>JIRA:XSTR-739 and JIRA:XSTR-746: OrderRetainingMap fails if HashMap.putAll(Map) of Java Runtime is not
-    	implemented calling put for every element within the map.</li>
+    	<li>JIRA:XSTR-747: All constructors of StaxDriver derived classes take erroneously a XmlFriendlyNameCoder
+    	instead of a plain NameCoder.</li>
     </ul>
 
     <h2>API changes</h2>
 
     <ul>
+    	<li>Added constructors to c.t.x.io.xml.StandardStaxDriver taking NameCoder instead of XmlFriendlyNameCoder.</li>
+    	<li>Deprecated constructors of c.t.x.io.xml.StandardStaxDriver taking a XmlFriendlyNameCoder.</li>
+    	<li>Added constructors to c.t.x.io.xml.BEAStaxDriver taking NameCoder instead of XmlFriendlyNameCoder.</li>
+    	<li>Deprecated constructors of c.t.x.io.xml.BEAStaxDriver taking a XmlFriendlyNameCoder.</li>
+    	<li>Added constructors to c.t.x.io.xml.WstxDriver taking NameCoder instead of XmlFriendlyNameCoder.</li>
+    	<li>Deprecated constructors of c.t.x.io.xml.WstxDriver taking a XmlFriendlyNameCoder.</li>
     	<li>Added method canAccess to c.t.x.converter.reflection.AbstractReflectionConverter.</li>
     	<li>Added static method canCreateDerivedObjectOutputStream to c.t.x.core.JVM.</li>
     	<li>Deprecated unused member c.t.x.converter.javabean.BeanProvider.NO_PARAMS.</li>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to