[xstream-scm] [2325] branches/v-1.4.x: Merge ignoreUnknownElements from trunk.

Tue, 10 Feb 2015 14:55:59 -0800

Title: [2325] branches/v-1.4.x: Merge ignoreUnknownElements from trunk.
Revision
2325
Author
joehni
Date
2015-02-10 16:55:26 -0600 (Tue, 10 Feb 2015)

Log Message

Merge ignoreUnknownElements from trunk.

Modified Paths



Property Changed

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285,2291-2292,2294,2298-2299,2301,2303,2306-2310,2312,2314,2316-2318,2320,2322,2324

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java (2324 => 2325)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-10 22:39:05 UTC (rev 2324)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-10 22:55:26 UTC (rev 2325)
@@ -1968,7 +1968,7 @@
      * @param pattern the name pattern as regular _expression_
      * @since 1.4.5
      */
-    private void ignoreUnknownElements(Pattern pattern) {
+    public void ignoreUnknownElements(final Pattern pattern) {
         if (fieldAliasingMapper == null) {
             throw new com.thoughtworks.xstream.InitializationException("No "
                 + FieldAliasingMapper.class.getName()

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


--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-02-10 22:39:05 UTC (rev 2324)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-02-10 22:55:26 UTC (rev 2325)
@@ -56,6 +56,7 @@
     <ul>
     	<li>Added c.t.x.util.JVM.is19().</li>
     	<li>Added c.t.x.converter.reflection.LambdaConverter and c.t.x.mapper.LambdaMapper.</li>
+    	<li>Declare c.t.x.XStream.ignoreUnknownElements(Pattern) as public.</li>
     	<li>c.t.x.converters.reflection.AbstractReflectionConverter.readResolve() is protected now.</li>
     	<li>c.t.x.mapper.AbstractAttributeAliasingMapper.readResolve() is protected now.</li>
     	<li>Deprecated c.t.x.converters.extended.StackTraceElementFactory, it is an internal helper class.</li>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to