SONAR-4960 Remove Extra Metric 3

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/PieChartWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/PieChartWidget.java
index 4c5943d6f24dbc7fcfd8cf61c42cd38ec1a2837c..b2dbcbfe3cce33d743c03745ba4ea91efc403912 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/PieChartWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/PieChartWidget.java
@@ -32,8 +32,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL;
   @WidgetProperty(key = "filter", type = WidgetPropertyType.FILTER, optional = false),
   @WidgetProperty(key = "mainMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.TECHNICAL_DEBT_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}),
   @WidgetProperty(key = "extraMetric1", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.NCLOC_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}),
-  @WidgetProperty(key = "extraMetric2", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COMPLEXITY_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}),
-  @WidgetProperty(key = "extraMetric3", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COVERAGE_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS})
+  @WidgetProperty(key = "extraMetric2", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COMPLEXITY_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS})
 })
 public class PieChartWidget extends CoreWidget {
 

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 49b5eb0581f36e4ad2870dc33aa80414824d233f..114ccb7a9a587d74eff46eebde50807bf8561984 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1113,7 +1113,6 @@ widget.pie_chart.property.filter.name=Filter
 widget.pie_chart.property.mainMetric.name=Main Metric
 widget.pie_chart.property.extraMetric1.name=Extra Metric 1
 widget.pie_chart.property.extraMetric2.name=Extra Metric 2
-widget.pie_chart.property.extraMetric3.name=Extra Metric 3
 
 widget.cloud.name=Measure Filter as Word Cloud
 widget.cloud.description=Displays the result of a pre-configured measure filter as a word cloud.

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/pie_chart.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/pie_chart.html.erb
index c0f2ae4220603f5298d3bbe42bfe6812931f9942..04f414a5465868896355223cd95152194d0b875f 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/pie_chart.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/pie_chart.html.erb
@@ -21,8 +21,7 @@
     var metrics = [
           '<%= widget_properties["mainMetric"].name %>',
           '<%= widget_properties["extraMetric1"].name %>',
-          '<%= widget_properties["extraMetric2"].name %>',
-          '<%= widget_properties["extraMetric3"].name %>'
+          '<%= widget_properties["extraMetric2"].name %>'
         ],
         query = [
           'filter=<%= filterId %>',