Issue #451: add EmptyBlock to checkstyle config

Author: Calixte

config/checkstyle-checks.xml

@@ -300,6 +300,24 @@
         <module name="AvoidNestedBlocks">
             <property name="allowInSwitchCase" value="true"/>
         </module>
+        <module name="EmptyBlock">
+            <property name="tokens" value="LITERAL_CATCH"/>
+            <property name="tokens" value="ARRAY_INIT"/>
+            <property name="tokens" value="LITERAL_DEFAULT"/>
+            <property name="tokens" value="LITERAL_CASE"/>
+            <property name="tokens" value="INSTANCE_INIT"/>
+            <property name="tokens" value="LITERAL_DO"/>
+            <property name="tokens" value="LITERAL_ELSE"/>
+            <property name="tokens" value="LITERAL_FINALLY"/>
+            <property name="tokens" value="LITERAL_FOR"/>
+            <property name="tokens" value="LITERAL_IF"/>
+            <property name="tokens" value="LITERAL_SWITCH"/>
+            <property name="tokens" value="LITERAL_SYNCHRONIZED"/>
+            <property name="tokens" value="LITERAL_TRY"/>
+            <property name="tokens" value="LITERAL_WHILE"/>
+            <property name="tokens" value="STATIC_INIT"/>
+            <property name="option" value="text"/>
+        </module>
         <module name="EmptyCatchBlock"/>
         <module name="LeftCurly"/>
         <module name="NeedBraces"/>

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/transformer/CheckstyleSetting.java

@@ -97,14 +97,8 @@ public void addSetting(final CheckstyleSetting setting) {
         String property;
         while (propit.hasNext()) {
           property = propit.next();
-          if (mCheckerModules.get(module).containsKey(property)) {
-            if (!mCheckerModules.get(module).get(property)
-                    .equals(setting.getmCheckerModules().get(module).get(property))) {
-            }
-          } else {
-            mCheckerModules.get(module).put(property,
-                    setting.getmCheckerModules().get(module).get(property));
-          }
+          mCheckerModules.get(module)
+            .putIfAbsent(property, setting.getmCheckerModules().get(module).get(property));
         }
       } else {
         mCheckerModules.put(module, setting.getmCheckerModules().get(module));
@@ -121,14 +115,8 @@ public void addSetting(final CheckstyleSetting setting) {
         String property;
         while (propit.hasNext()) {
           property = propit.next();
-          if (mTreeWalkerModules.get(module).containsKey(property)) {
-            if (!mTreeWalkerModules.get(module).get(property)
-                    .equals(setting.getmTreeWalkerModules().get(module).get(property))) {
-            }
-          } else {
-            mTreeWalkerModules.get(module).put(property,
-                    setting.getmTreeWalkerModules().get(module).get(property));
-          }
+          mTreeWalkerModules.get(module)
+            .putIfAbsent(property, setting.getmTreeWalkerModules().get(module).get(property));
         }
       } else {
         mTreeWalkerModules.put(module, setting.getmTreeWalkerModules().get(module));