Fix some quality flaws

3 files changed, 16 insertions, 14 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java
index df2fc4d9768..128152622f2 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java
@@ -19,8 +19,8 @@
  */
 package org.sonar.plugins.core.filters;
 
+import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.web.Criterion;
-
 import org.sonar.api.web.Filter;
 import org.sonar.api.web.FilterColumn;
 import org.sonar.api.web.FilterTemplate;
@@ -42,12 +42,11 @@ public class MyFavouritesFilter extends FilterTemplate {
     filter.setDisplayAs(Filter.LIST);
     filter.setFavouritesOnly(true);
     filter.add(Criterion.createForQualifier("VW", "SVW", "TRK", "BRC", "DIR", "PAC", "FIL", "CLA", "UTS", "LIB"));
-    filter.add(FilterColumn.create("metric", "alert_status", FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false));
     filter.add(FilterColumn.create("name", null, FilterColumn.ASC, false));
-    filter.add(FilterColumn.create("metric", "ncloc", FilterColumn.DESC, false));
-    filter.add(FilterColumn.create("metric", "violations_density", FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.VIOLATIONS_DENSITY_KEY, FilterColumn.DESC, false));
     filter.add(FilterColumn.create("date", null, FilterColumn.DESC, false));
-    
     return filter;
   }
 }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java
index 189d85d0ec2..c9e635881d9 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.plugins.core.filters;
 
+import org.sonar.api.measures.CoreMetrics;
+import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.web.Criterion;
 import org.sonar.api.web.Filter;
 import org.sonar.api.web.FilterColumn;
@@ -39,12 +41,12 @@ public class ProjectFilter extends FilterTemplate {
   public Filter createFilter() {
     Filter filter = Filter.create();
     filter.setDisplayAs(Filter.LIST);
-    filter.add(Criterion.createForQualifier("TRK"));
-    filter.add(FilterColumn.create("metric", "alert_status", FilterColumn.DESC, false));
+    filter.add(Criterion.createForQualifier(Qualifiers.PROJECT));
+    filter.add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false));
     filter.add(FilterColumn.create("name", null, FilterColumn.ASC, false));
     filter.add(FilterColumn.create("version", null, FilterColumn.DESC, false));
-    filter.add(FilterColumn.create("metric", "ncloc", FilterColumn.DESC, false));
-    filter.add(FilterColumn.create("metric", "violations_density", FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.VIOLATIONS_DENSITY_KEY, FilterColumn.DESC, false));
     filter.add(FilterColumn.create("date", null, FilterColumn.DESC, false));
     filter.add(FilterColumn.create("links", null, FilterColumn.DESC, false));
     
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java
index 0d5cb7a863f..985bb434b65 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java
@@ -19,8 +19,9 @@
  */
 package org.sonar.plugins.core.filters;
 
+import org.sonar.api.measures.CoreMetrics;
+import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.web.Criterion;
-
 import org.sonar.api.web.Filter;
 import org.sonar.api.web.FilterColumn;
 import org.sonar.api.web.FilterTemplate;
@@ -40,11 +41,11 @@ public class TreeMapFilter extends FilterTemplate {
   public Filter createFilter() {
     Filter filter = Filter.create();
     filter.setDisplayAs(Filter.TREEMAP);
-    filter.add(Criterion.createForQualifier("TRK"));
+    filter.add(Criterion.createForQualifier(Qualifiers.PROJECT));
     filter.add(FilterColumn.create("name", null, FilterColumn.ASC, false));
-    filter.add(FilterColumn.create("metric", "ncloc", FilterColumn.DESC, false));
-    filter.add(FilterColumn.create("metric", "violations_density", FilterColumn.DESC, false));
-    
+    filter.add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false));
+    filter.add(FilterColumn.create("metric", CoreMetrics.VIOLATIONS_DENSITY_KEY, FilterColumn.DESC, false));
+
     return filter;
   }
 }