Merge pull request #1346 from guwirth/custom-rules

fix custom rules - second try
SonarOpenCommunity · Nov 27, 2017 · 4f84fcd · 4f84fcd
2 parents 77023c7 + f6a4a24
commit 4f84fcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java b/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java
@@ -34,7 +34,6 @@
 import org.sonar.api.platform.ServerFileSystem;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
-import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.sensors.clangtidy.CxxClangTidyRuleRepository;
 import org.sonar.cxx.sensors.clangtidy.CxxClangTidySensor;
 import org.sonar.cxx.sensors.clangsa.CxxClangSARuleRepository;
@@ -616,11 +615,11 @@ public CxxSquidSensorImpl(Configuration settings,
       super(new CLanguage(settings), fileLinesContextFactory, checkFactory);
     }
 
-    public CxxSquidSensorImpl(CxxLanguage language,
+    public CxxSquidSensorImpl(Configuration settings,
       FileLinesContextFactory fileLinesContextFactory,
       CheckFactory checkFactory,
       @Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
-      super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
+      super(new CLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
     }
   }
 

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java
@@ -68,7 +68,6 @@
 
 import com.google.common.collect.ImmutableList;
 import javax.annotation.Nullable;
-import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.sensors.squid.CustomCxxRulesDefinition;
 
 /**
@@ -645,11 +644,11 @@ public CxxSquidSensorImpl(Configuration settings,
       super(new CppLanguage(settings), fileLinesContextFactory, checkFactory);
     }
 
-    public CxxSquidSensorImpl(CxxLanguage language,
+    public CxxSquidSensorImpl(Configuration settings,
       FileLinesContextFactory fileLinesContextFactory,
       CheckFactory checkFactory,
       @Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
-      super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
+      super(new CppLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
     }
   }