Change the names of the setting properties as decided in the PR discu…

…ssion. Cleanup settings ui #212
SonarOpenCommunity · May 16, 2014 · eb3f797 · eb3f797
1 parent 5fde6ae
commit eb3f797
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 18 deletions.
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
@@ -57,9 +57,9 @@ public final class CxxPlugin extends SonarPlugin {
   static final String SOURCE_FILE_SUFFIXES_KEY = "sonar.cxx.suffixes.sources";
   static final String HEADER_FILE_SUFFIXES_KEY = "sonar.cxx.suffixes.headers";
   public static final String DEFINES_KEY = "sonar.cxx.defines";
-  public static final String INCLUDE_DIRECTORIES_KEY = "sonar.cxx.include_directories";
+  public static final String INCLUDE_DIRECTORIES_KEY = "sonar.cxx.includeDirectories";
   public static final String ERROR_RECOVERY_KEY = "sonar.cxx.errorRecoveryEnabled";
-  public static final String FORCE_INCLUDE_FILES_KEY = "sonar.cxx.force_includes";
+  public static final String FORCE_INCLUDE_FILES_KEY = "sonar.cxx.forceIncludes";
 
   public static List<PropertyDefinition> generalProperties() {
     String subcateg = "(1) General";

diff --git a/...cxx-plugin/src/main/java/org/sonar/plugins/cxx/compiler/CxxCompilerGccRuleRepository.java b/...cxx-plugin/src/main/java/org/sonar/plugins/cxx/compiler/CxxCompilerGccRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public final class CxxCompilerGccRuleRepository extends CxxAbstractRuleRepository {
   static final String KEY = "compiler-gcc";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.compiler-gcc";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.compiler-gcc.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/...-cxx-plugin/src/main/java/org/sonar/plugins/cxx/compiler/CxxCompilerVcRuleRepository.java b/...-cxx-plugin/src/main/java/org/sonar/plugins/cxx/compiler/CxxCompilerVcRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public final class CxxCompilerVcRuleRepository extends CxxAbstractRuleRepository {
   public static final String KEY = "compiler-vc";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.compiler-vc";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.compiler-vc.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CxxCppCheckRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/cppcheck/CxxCppCheckRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public final class CxxCppCheckRuleRepository extends CxxAbstractRuleRepository {
   public static final String KEY = "cppcheck";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.cppcheck";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.cppcheck.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java b/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java
@@ -35,8 +35,8 @@
  */
 public class CxxExternalRuleRepository extends RuleRepository {
 
-  public static final String KEY = "cxxexternal";
-  public static final String RULES_KEY = "sonar.cxx.externalrules.rules";
+  public static final String KEY = "other";
+  public static final String RULES_KEY = "sonar.cxx.other.rules";
   public final Settings settings;
   private final XMLRuleParser xmlRuleParser;
 

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
@@ -41,7 +41,7 @@
  */
 public class CxxExternalRulesSensor extends CxxReportSensor {
 
-  public static final String REPORT_PATH_KEY = "sonar.cxx.externalrules.reportPath";
+  public static final String REPORT_PATH_KEY = "sonar.cxx.other.reportPath";
   private static final String DEFAULT_REPORT_PATH = "externalrules-reports/externalrules-result-*.xml";
   private final RulesProfile profile;
 

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/pclint/CxxPCLintRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/pclint/CxxPCLintRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public final class CxxPCLintRuleRepository extends CxxAbstractRuleRepository {
   public static final String KEY = "pclint";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.pclint";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.pclint.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/rats/CxxRatsRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/rats/CxxRatsRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public class CxxRatsRuleRepository extends CxxAbstractRuleRepository {
   public static final String KEY = "rats";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.rats";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.rats.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/valgrind/CxxValgrindRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/valgrind/CxxValgrindRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public class CxxValgrindRuleRepository extends CxxAbstractRuleRepository {
   static final String KEY = "valgrind";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.valgrind";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.valgrind.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/veraxx/CxxVeraxxRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/veraxx/CxxVeraxxRuleRepository.java
@@ -29,7 +29,7 @@
  */
 public class CxxVeraxxRuleRepository extends CxxAbstractRuleRepository {
   static final String KEY = "vera++";
-  public static final String CUSTOM_RULES_KEY = "sonar.cxx.customRules.vera++";
+  public static final String CUSTOM_RULES_KEY = "sonar.cxx.vera++.customRules";
 
   /**
    * {@inheritDoc}

diff --git a/sonar-cxx-plugin/src/samples/SampleProject2/sonar-project.properties b/sonar-cxx-plugin/src/samples/SampleProject2/sonar-project.properties
@@ -22,4 +22,4 @@ sonar.cxx.vera.reportPath=build/vera++-report.xml
 sonar.cxx.rats.reportPath=build/rats-report.xml
 sonar.cxx.xunit.reportPath=build/xunit-report.xml
 
-sonar.cxx.include_directories=/usr/include/c++/4.8,/usr/include/i386-linux-gnu/c++/4.8,/usr/include,/usr/include/c++/4.8/tr1,/usr/include/linux,src
+sonar.cxx.includeDirectories=/usr/include/c++/4.8,/usr/include/i386-linux-gnu/c++/4.8,/usr/include,/usr/include/c++/4.8/tr1,/usr/include/linux,src
diff --git a/...n/src/test/resources/org/sonar/plugins/cxx/force-include-project/sonar-project.properties b/...n/src/test/resources/org/sonar/plugins/cxx/force-include-project/sonar-project.properties
@@ -7,5 +7,5 @@ sonar.language=c++
 # path to source directories (required)
 sonar.sources=src
 
-sonar.cxx.include_directories=include
-sonar.cxx.force_includes=force1.hh,subfolder/force2.hh
+sonar.cxx.includeDirectories=include
+sonar.cxx.forceIncludes=force1.hh,subfolder/force2.hh
diff --git a/...test/resources/org/sonar/plugins/cxx/include-directories-project/sonar-project.properties b/...test/resources/org/sonar/plugins/cxx/include-directories-project/sonar-project.properties
@@ -7,5 +7,5 @@ sonar.language=c++
 # path to source directories (required)
 sonar.sources=src
 
-sonar.cxx.include_directories=include
+sonar.cxx.includeDirectories=include
 
diff --git a/...ugin/src/test/resources/org/sonar/plugins/cxx/smoketest_project1/sonar-project.properties b/...ugin/src/test/resources/org/sonar/plugins/cxx/smoketest_project1/sonar-project.properties
@@ -15,5 +15,3 @@ sonar.cxx.coverage.itReportPath=build/gcovr-report*.xml
 sonar.cxx.coverage.overallReportPath=build/gcovr-report*.xml
 sonar.cxx.valgrind.reportPath=build/valgrind-report.xml
 sonar.cxx.xunit.reportPath=build/xunit-report.xml
-
-#sonar.cxx.include_directories=/usr/include/c++/4.8,/usr/include/i386-linux-gnu/c++/4.8,/usr/include,/usr/include/c++/4.8/tr1,/usr/include/linux,src