cr comment

SonarOpenCommunity · Apr 9, 2016 · f83feea · f83feea
1 parent 7de8cbb
commit f83feea
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 8 deletions.
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/preprocessor/ExpressionEvaluator.java b/cxx-squid/src/main/java/org/sonar/cxx/preprocessor/ExpressionEvaluator.java
@@ -422,9 +422,7 @@ BigInteger evalFunctionlikeMacro(AstNode exprAst) {
     String macroName = exprAst.getChild(0).getTokenValue(); //@toto deprecated
     List<Token> tokens = exprAst.getTokens();
     List<Token> restTokens = tokens.subList(1, tokens.size());
-    String value = "";
-
-    value = preprocessor.expandFunctionLikeMacro(macroName, restTokens);
+    String value = preprocessor.expandFunctionLikeMacro(macroName, restTokens);
 
     if (value == null || "".equals(value)) {
       LOG.error("Undefined functionlike macro '{}' assuming 0", macroName);

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/BullseyeParser.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/BullseyeParser.java
@@ -57,6 +57,7 @@ public BullseyeParser(final String baseDir) {
   @Override
   public void processReport(final Project project, final SensorContext context, File report, final Map<String, CoverageMeasuresBuilder> coverageData)
     throws XMLStreamException {
+    CxxUtils.LOG.debug("Parsing 'Bullseye' format");
     StaxParser topLevelparser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/CoberturaParser.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/CoberturaParser.java
@@ -48,6 +48,7 @@ public CoberturaParser(final String baseDir) {
   @Override
   public void processReport(final Project project, final SensorContext context, File report, final Map<String, CoverageMeasuresBuilder> coverageData)
     throws XMLStreamException {
+    CxxUtils.LOG.debug("Parsing 'Cobertura' format");
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/VisualStudioParser.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/coverage/VisualStudioParser.java
@@ -47,6 +47,7 @@ public VisualStudioParser(final String baseDir) {
   @Override
   public void processReport(final Project project, final SensorContext context, File report, final Map<String, CoverageMeasuresBuilder> coverageData)
     throws XMLStreamException {
+    CxxUtils.LOG.debug("Parsing 'Visual Studio' format");
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CppcheckParserV1.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CppcheckParserV1.java
@@ -49,7 +49,7 @@ public CppcheckParserV1(CxxCppCheckSensor sensor) {
   @Override
   public void processReport(final Project project, final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
-
+    CxxUtils.LOG.debug("Parsing 'Cppcheck V1' format");
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CppcheckParserV2.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CppcheckParserV2.java
@@ -49,7 +49,7 @@ public CppcheckParserV2(CxxCppCheckSensor sensor) {
   @Override
   public void processReport(final Project project, final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
-
+    CxxUtils.LOG.debug("Parsing 'Cppcheck V2' format");
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/...-cxx-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRulesSensor.java b/...-cxx-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRulesSensor.java
@@ -70,7 +70,8 @@ protected String reportPathKey() {
 
   @Override
   protected void processReport(final Project project, final SensorContext context, File report) throws javax.xml.stream.XMLStreamException {
-
+    CxxUtils.LOG.debug("Parsing 'other' format");
+
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
 
       /**

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/pclint/CxxPCLintSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/pclint/CxxPCLintSensor.java
@@ -78,7 +78,8 @@ protected String reportPathKey() {
   @Override
   protected void processReport(final Project project, final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
-
+    CxxUtils.LOG.debug("Parsing 'PC-Lint' format");
+
     StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
       /**
        * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/rats/CxxRatsSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/rats/CxxRatsSensor.java
@@ -68,6 +68,8 @@ protected String reportPathKey() {
   @Override
   protected void processReport(final Project project, final SensorContext context, File report)
     throws org.jdom.JDOMException, java.io.IOException {
+    CxxUtils.LOG.debug("Parsing 'RATS' format");
+
     try {
       SAXBuilder builder = new SAXBuilder(false);
       Element root = builder.build(report).getRootElement();

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/valgrind/CxxValgrindSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/valgrind/CxxValgrindSensor.java
@@ -65,6 +65,7 @@ protected String reportPathKey() {
   @Override
   protected void processReport(final Project project, final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
+    CxxUtils.LOG.debug("Parsing 'Valgrind' format");
     ValgrindReportParser parser = new ValgrindReportParser();
     saveErrors(project, context, parser.processReport(project, context, report));
   }

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/veraxx/CxxVeraxxSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/veraxx/CxxVeraxxSensor.java
@@ -68,7 +68,7 @@ protected String reportPathKey() {
   @Override
   protected void processReport(final Project project, final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
-
+    CxxUtils.LOG.debug("Parsing 'Vera++' format");
     try {
       StaxParser parser = new StaxParser(new StaxParser.XmlStreamHandler() {
         /**