Author: henning
Date: Tue Oct 22 00:45:36 2013
New Revision: 1534429
URL: http://svn.apache.org/r1534429
Log:
fix checkstyle errors
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/MapConfiguration.java
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/MapConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/MapConfiguration.java?rev=1534429&r1=1534428&r2=1534429&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/MapConfiguration.java
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/MapConfiguration.java
Tue Oct 22 00:45:36 2013
@@ -265,8 +265,10 @@ public class MapConfiguration extends Ab
public Set<Map.Entry<String, Object>> entrySet()
{
Set<Map.Entry<String, Object>> entries = new
HashSet<Map.Entry<String, Object>>();
- for (final Map.Entry<Object, Object> propertyEntry :
props.entrySet()) {
- if (propertyEntry.getKey() instanceof String) {
+ for (final Map.Entry<Object, Object> propertyEntry :
props.entrySet())
+ {
+ if (propertyEntry.getKey() instanceof String)
+ {
entries.add(new Map.Entry<String, Object>() {
public String getKey()
Modified:
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/XMLConfiguration.java?rev=1534429&r1=1534428&r2=1534429&view=diff
==============================================================================
---
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
(original)
+++
commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
Tue Oct 22 00:45:36 2013
@@ -636,7 +636,11 @@ public class XMLConfiguration extends Ab
constructHierarchy(childNode, child, elemRefs,
trimFlag);
node.addChild(childNode);
Collection<String> attrSpace = attrmap.remove(ATTR_SPACE);
- Boolean childTrim = CollectionUtils.isEmpty(attrSpace) ?
Boolean.FALSE : Boolean.valueOf(attrSpace.iterator().next());
+
+ Boolean childTrim = CollectionUtils.isEmpty(attrSpace)
+ ? Boolean.FALSE
+ : Boolean.valueOf(attrSpace.iterator().next());
+
handleDelimiters(node, childNode, childTrim.booleanValue(),
attrmap);
}
else if (w3cNode instanceof Text)
