From 8a6242007e9743b7e49cbd448d1bafef5e91d2c5 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 9 Jan 2014 10:34:18 +0100 Subject: [PATCH] SONAR-3113 Revert on the Cloud Widget --- .../org/sonar/plugins/core/CorePlugin.java | 2 - .../measures/MeasureFilterAsCloudWidget.java | 46 --------------- .../resources/org/sonar/l10n/core.properties | 11 ---- .../measures/measure_filter_cloud.html.erb | 59 ------------------- 4 files changed, 118 deletions(-) delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java delete mode 100644 plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index f9d2f9ece9e..79df113891e 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -49,7 +49,6 @@ import org.sonar.plugins.core.web.TestsViewer; import org.sonar.plugins.core.widgets.*; import org.sonar.plugins.core.widgets.issues.*; import org.sonar.plugins.core.widgets.measures.MeasureFilterAsBubbleChartWidget; -import org.sonar.plugins.core.widgets.measures.MeasureFilterAsCloudWidget; import org.sonar.plugins.core.widgets.measures.MeasureFilterAsHistogramWidget; import org.sonar.plugins.core.widgets.measures.MeasureFilterAsPieChartWidget; @@ -252,7 +251,6 @@ public final class CorePlugin extends SonarPlugin { DuplicationsWidget.class, TechnicalDebtPyramidWidget.class, MeasureFilterAsPieChartWidget.class, - MeasureFilterAsCloudWidget.class, MeasureFilterAsHistogramWidget.class, MeasureFilterAsBubbleChartWidget.class, diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java deleted file mode 100644 index bd54931fdf5..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/measures/MeasureFilterAsCloudWidget.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2013 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.plugins.core.widgets.measures; - -import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.*; -import org.sonar.plugins.core.widgets.CoreWidget; -import org.sonar.plugins.core.widgets.WidgetConstants; - -import static org.sonar.api.web.WidgetScope.GLOBAL; - -@WidgetCategory({"Filters", "Global"}) -@WidgetScope(GLOBAL) -@WidgetProperties({ - @WidgetProperty(key = "chartTitle", type = WidgetPropertyType.STRING), - @WidgetProperty(key = "chartHeight", type = WidgetPropertyType.INTEGER, defaultValue = "300"), - @WidgetProperty(key = "filter", type = WidgetPropertyType.FILTER, optional = false), - @WidgetProperty(key = "colorMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.TECHNICAL_DEBT_KEY, options = "type:PERCENT"), - @WidgetProperty(key = "sizeMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COMPLEXITY_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}), - @WidgetProperty(key = "maxItems", type = WidgetPropertyType.INTEGER, defaultValue = "50"), - @WidgetProperty(key = "reverseColor", type = WidgetPropertyType.BOOLEAN, defaultValue = "false") -}) -public class MeasureFilterAsCloudWidget extends CoreWidget { - - public MeasureFilterAsCloudWidget() { - super("measure_filter_cloud", "Measure Filter as Cloud", "/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb"); - } - -} 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 299e00258f7..572f3a64999 100644 --- 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 @@ -1118,17 +1118,6 @@ widget.measure_filter_pie_chart.property.extraMetric2.name=Extra Metric 2 widget.measure_filter_pie_chart.property.maxItems.name=Max components widget.measure_filter_pie_chart.property.maxItems.desc=Maximum number of components to show -widget.measure_filter_cloud.name=Measure Filter as Word Cloud -widget.measure_filter_cloud.description=Displays the result of a pre-configured measure filter as a word cloud. -widget.measure_filter_cloud.property.chartTitle.name=Chart Title -widget.measure_filter_cloud.property.chartHeight.name=Chart Height -widget.measure_filter_cloud.property.filter.name=Filter -widget.measure_filter_cloud.property.colorMetric.name=Color Metric -widget.measure_filter_cloud.property.sizeMetric.name=Size Metric -widget.measure_filter_cloud.property.maxItems.name=Max components -widget.measure_filter_cloud.property.maxItems.desc=Maximum number of components to show -widget.measure_filter_cloud.property.reverseColor.name=Reverse order on color - widget.measure_filter_histogram.name=Measure Filter as Histogram widget.measure_filter_histogram.description=Displays the result of a pre-configured measure filter as a histogram. widget.measure_filter_histogram.property.chartTitle.name=Chart Title diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb deleted file mode 100644 index 5761881fef4..00000000000 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb +++ /dev/null @@ -1,59 +0,0 @@ -<% - containerId = 'pie-chart-widget' + widget.id.to_s - chartTitle = widget_properties["chartTitle"] - filterId = widget_properties["filter"].to_i - maxItems = widget_properties["maxItems"].to_i - reverseColor = widget_properties["reverseColor"] - - filter = MeasureFilter.find_by_id(filterId.to_i) - @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'list'} -%> - -
- - - - <% if chartTitle %> -

<%= h(chartTitle) -%>

- <% end %> - -
- - - - - - - - -- 2.39.5