[xstream-scm] [2180] trunk: Merge @since from branch.

[joehni]

Title: [2180] trunk: Merge @since from branch.

Revision

2180

Author

joehni

Date

2013-12-09 17:20:25 -0600 (Mon, 09 Dec 2013)

Log Message

Merge @since from branch.

Modified Paths

• trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/NamedArrayConverter.java
• trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java
• trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
• trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java
• trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java

Property Changed

trunk/

Diff

Property changes: trunk

Added: svn:mergeinfo

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/NamedArrayConverter.java (2179 => 2180)

--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/NamedArrayConverter.java	2013-12-09 23:07:51 UTC (rev 2179)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/NamedArrayConverter.java	2013-12-09 23:20:25 UTC (rev 2180)
@@ -31,7 +31,7 @@
  * </p>
  * 
  * @author J&ouml;rg Schaible
- * @since upcoming
+ * @since 1.4.6
  */
 public class NamedArrayConverter implements Converter {
 
@@ -44,7 +44,7 @@
      * @param arrayType
      * @param mapper
      * @param itemName
-     * @since upcoming
+     * @since 1.4.6
      */
     public NamedArrayConverter(final Class arrayType, final Mapper mapper, final String itemName) {
         if (!arrayType.isArray()) {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java (2179 => 2180)

--- trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2013-12-09 23:07:51 UTC (rev 2179)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2013-12-09 23:20:25 UTC (rev 2180)
@@ -427,7 +427,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public static boolean canCreateDerivedObjectOutputStream() {
         return canCreateDerivedObjectOutputStream;

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java (2179 => 2180)

--- trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java	2013-12-09 23:07:51 UTC (rev 2179)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java	2013-12-09 23:20:25 UTC (rev 2180)
@@ -37,7 +37,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public BEAStaxDriver(QNameMap qnameMap, NameCoder nameCoder) {
         super(qnameMap, nameCoder);
@@ -55,7 +55,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public BEAStaxDriver(NameCoder nameCoder) {
         super(nameCoder);

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java (2179 => 2180)

--- trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java	2013-12-09 23:07:51 UTC (rev 2179)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/StandardStaxDriver.java	2013-12-09 23:20:25 UTC (rev 2180)
@@ -46,7 +46,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public StandardStaxDriver(QNameMap qnameMap, NameCoder nameCoder) {
         super(qnameMap, nameCoder);
@@ -64,7 +64,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public StandardStaxDriver(NameCoder nameCoder) {
         super(nameCoder);

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java (2179 => 2180)

--- trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java	2013-12-09 23:07:51 UTC (rev 2179)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java	2013-12-09 23:20:25 UTC (rev 2180)
@@ -37,7 +37,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public WstxDriver(QNameMap qnameMap, NameCoder nameCoder) {
         super(qnameMap, nameCoder);
@@ -55,7 +55,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.6
      */
     public WstxDriver(NameCoder nameCoder) {
         super(nameCoder);

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email