Merge pull request #201 from rcastagno/#194_merging_configfile_with_f…

…ilter

#194 merging configfile with filter

.gitignore

@@ -6,3 +6,4 @@
 /.settings/
 .gradle/**/*
 /build
+.idea/

src/main/java/com/cflint/main/CFLintMain.java

@@ -360,7 +360,10 @@ private void execute() throws IOException, TransformerException, JAXBException,
 		if (includeCodes != null && includeCodes.length > 0) {
 			filter.includeCode(includeCodes);
 		}
-		cflint.getBugs().setFilter(filter);
+
+        mergeConfigFileInFilter(filter);
+
+        cflint.getBugs().setFilter(filter);
 		for (final String scanfolder : folder) {
 			cflint.scan(scanfolder);
 		}
@@ -424,7 +427,26 @@ private void execute() throws IOException, TransformerException, JAXBException,
 		}
 	}
 
-	private void display(final String text) {
+    /**
+     * Merges included and excluded messages in the filter,
+     * as if you specified them in -includeRule and -excludeRule command line parameters
+     *
+     * @param filter
+     */
+    private void mergeConfigFileInFilter(CFLintFilter filter)
+    {
+        CFLintConfig cfg = loadConfig(configfile);
+        for(PluginMessage message : cfg.getIncludes())
+        {
+            filter.includeCode(message.getCode());
+        }
+        for(PluginMessage message : cfg.getExcludes())
+        {
+            filter.excludeCode(message.getCode());
+        }
+    }
+
+    private void display(final String text) {
 		if (verbose) {
 			System.out.println(text);
 		}