svn commit: r1678604 - in /commons/proper/configuration/trunk: conf/checkstyle-suppressions.xml src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java

[oh...@apache.org]

Author: oheger
Date: Sun May 10 20:09:16 2015
New Revision: 1678604

URL: http://svn.apache.org/r1678604
Log:
Checkstyle.

Also added a suppression for a false positive warning.

Modified:
    commons/proper/configuration/trunk/conf/checkstyle-suppressions.xml
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java

Modified: commons/proper/configuration/trunk/conf/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/conf/checkstyle-suppressions.xml?rev=1678604&r1=1678603&r2=1678604&view=diff
==============================================================================
--- commons/proper/configuration/trunk/conf/checkstyle-suppressions.xml (original)
+++ commons/proper/configuration/trunk/conf/checkstyle-suppressions.xml Sun May 10 20:09:16 2015
@@ -31,5 +31,12 @@
     <suppress checks="DoubleCheckedLocking" files="DynamicCombinedConfiguration.java"
       lines="800-900"/>
 
+    <!-- There is an empty catch block ignoring unsupported operation exceptions
+         from the list delimiter handler. This is okay, then the property is
+         written out in multiple lines.
+    -->
+    <suppress checks="EmptyBlock" files="PropertiesConfiguration.java"
+      lines="1074-1107"/>
+
     <suppress files="FileUtils\.java" checks="[a-zA-Z0-9]*"/>
 </suppressions>

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java?rev=1678604&r1=1678603&r2=1678604&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java Sun May 10 20:09:16 2015
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
 import org.apache.commons.configuration2.convert.ListDelimiterHandler;
 import org.apache.commons.configuration2.convert.ValueTransformer;
 import org.apache.commons.configuration2.event.ConfigurationEvent;
@@ -84,7 +83,9 @@ import org.apache.commons.lang3.text.tra
  *  <li>
  *   The list delimiter facilities provided by {@link AbstractConfiguration}
  *   are supported, too. If an appropriate {@link ListDelimiterHandler} is
- *   set (for instance a {@link DefaultListDelimiterHandler} object configured
+ *   set (for instance
+ *   a {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler D
+ *   efaultListDelimiterHandler} object configured
  *   with a comma as delimiter character), <i>value</i> can contain <em>value
  *   delimiters</em> and will then be interpreted as a list of tokens. So the
  *   following property definition
@@ -893,8 +894,8 @@ public class PropertiesConfiguration ext
          * Commons Lang 3.
          */
         private static final CharSequenceTranslator ESCAPE_PROPERTIES =
-                new AggregateTranslator(new LookupTranslator(new String[][] {
-                    { "\\", "\\\\" }}),
+                new AggregateTranslator(new LookupTranslator(new String[][]{
+                    {"\\", "\\\\"}}),
                         new LookupTranslator(EntityArrays.JAVA_CTRL_CHARS_ESCAPE()),
                         UnicodeEscaper.outsideOf(32, 0x7f));