From 478b960bfbe4f7b22e4971109b0f1ab27b0e3810 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Mon, 27 May 2013 17:05:21 +0200
Subject: [PATCH] SONAR-4292 Delete ReviewsPerDeveloperWidget in favor of
 UnresolvedIssuesPerAssigneeWidget (same key is now used)

---
 .../org/sonar/plugins/core/CorePlugin.java    |  6 ++--
 .../dashboards/ProjectIssuesDashboard.java    |  2 +-
 .../UnresolvedIssuesPerAssigneeWidget.java    |  2 +-
 .../reviews/ReviewsPerDeveloperWidget.java    | 30 -------------------
 .../resources/org/sonar/l10n/core.properties  |  8 ++---
 .../unresolved_issues_per_assignee.html.erb   |  6 ++--
 6 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/reviews/ReviewsPerDeveloperWidget.java

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 321ae296a0e..aaf5040048d 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
@@ -38,7 +38,6 @@ import org.sonar.plugins.core.measurefilters.ProjectFilter;
 import org.sonar.plugins.core.notifications.alerts.NewAlerts;
 import org.sonar.plugins.core.notifications.reviews.ChangesInReviewAssignedToMeOrCreatedByMe;
 import org.sonar.plugins.core.notifications.reviews.NewFalsePositiveReview;
-import org.sonar.plugins.core.notifications.violations.NewViolationsOnFirstDifferentialPeriod;
 import org.sonar.plugins.core.security.ApplyProjectRolesDecorator;
 import org.sonar.plugins.core.sensors.*;
 import org.sonar.plugins.core.timemachine.*;
@@ -47,7 +46,9 @@ import org.sonar.plugins.core.web.TestsViewer;
 import org.sonar.plugins.core.widgets.*;
 import org.sonar.plugins.core.widgets.issues.ActionPlansWidget;
 import org.sonar.plugins.core.widgets.issues.*;
-import org.sonar.plugins.core.widgets.reviews.*;
+import org.sonar.plugins.core.widgets.reviews.FalsePositiveReviewsWidget;
+import org.sonar.plugins.core.widgets.reviews.MyReviewsWidget;
+import org.sonar.plugins.core.widgets.reviews.ProjectReviewsWidget;
 
 import java.util.List;
 
@@ -410,7 +411,6 @@ public final class CorePlugin extends SonarPlugin {
       ProjectReviewsWidget.class,
       FalsePositiveReviewsWidget.class,
       FalsePositiveIssuesWidget.class,
-      ReviewsPerDeveloperWidget.class,
       ActionPlansWidget.class,
       org.sonar.plugins.core.widgets.ActionPlansWidget.class,
       UnresolvedIssuesPerAssigneeWidget.class,
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java
index 1f15bdfa86d..28f1da9df36 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectIssuesDashboard.java
@@ -50,7 +50,7 @@ public final class ProjectIssuesDashboard extends DashboardTemplate {
   }
 
   private void addSecondColumn(Dashboard dashboard) {
-    dashboard.addWidget("unresolved_issues_per_assignee", 2);
+    dashboard.addWidget("reviews_per_developer", 2);
     dashboard.addWidget("my_unresolved_issues", 2);
     dashboard.addWidget("false_positive_issues", 2);
   }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/UnresolvedIssuesPerAssigneeWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/UnresolvedIssuesPerAssigneeWidget.java
index f089b1bbc12..49506c35283 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/UnresolvedIssuesPerAssigneeWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/issues/UnresolvedIssuesPerAssigneeWidget.java
@@ -25,6 +25,6 @@ import org.sonar.plugins.core.widgets.CoreWidget;
 @WidgetCategory({"Issues"})
 public class UnresolvedIssuesPerAssigneeWidget extends CoreWidget {
   public UnresolvedIssuesPerAssigneeWidget() {
-    super("unresolved_issues_per_assignee", "Unresolved issues per assignee", "/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb");
+    super("reviews_per_developer", "Unresolved issues per assignee", "/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb");
   }
 }
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/reviews/ReviewsPerDeveloperWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/reviews/ReviewsPerDeveloperWidget.java
deleted file mode 100644
index ee9d838a2aa..00000000000
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/reviews/ReviewsPerDeveloperWidget.java
+++ /dev/null
@@ -1,30 +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.reviews;
-
-import org.sonar.api.web.WidgetCategory;
-import org.sonar.plugins.core.widgets.CoreWidget;
-
-@WidgetCategory({"Reviews"})
-public class ReviewsPerDeveloperWidget extends CoreWidget {
-  public ReviewsPerDeveloperWidget() {
-    super("reviews_per_developer", "Active reviews per developer", "/org/sonar/plugins/core/widgets/reviews/reviews_per_developer.html.erb");
-  }
-}
\ No newline at end of file
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 334b150b4b3..dc067cc3e9f 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
@@ -1068,14 +1068,10 @@ widget.false_positive_issues.description=Shows all the false positives found on
 widget.false_positive_issues.property.numberOfLines.name=Number of lines
 widget.false_positive_issues.property.numberOfLines.desc=Maximum number of issues displayed at the same time.
 
-widget.reviews_per_developer.name=Active reviews per developer
-widget.reviews_per_developer.description=Shows the number of open/reopened reviews per developer.
+widget.reviews_per_developer.name=Unresolved issues per assignee
+widget.reviews_per_developer.description=Shows the number of unresolved issues per assignee.
 widget.reviews_per_developer.not_assigned=Not assigned
 
-widget.unresolved_issues_per_assignee.name=Unresolved issues per assignee
-widget.unresolved_issues_per_assignee.description=Shows the number of unresolved issues per assignee.
-widget.unresolved_issues_per_assignee.not_assigned=Not assigned
-
 widget.unresolved_issues_statuses.name=Unresolved issue statuses
 widget.unresolved_issues_statuses.description=Display the number of unresolved issues according to their status : Open, Reopened and Confirmed.
 
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
index e8aa7cafb25..46662763c63 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
@@ -32,10 +32,10 @@
     end
 %>
 
-<h3><%= message('widget.unresolved_issues_per_assignee.name') -%></h3>
+<h3><%= message('widget.reviews_per_developer.name') -%></h3>
 
 <% if assignees.size ==0 %>
-  <span class="empty_widget"><%= message('widget.unresolved_issues_per_assignee.name') -%></span>
+  <span class="empty_widget"><%= message('widget.reviews_per_developer.name') -%></span>
 
 <% else %>
 <div id="<%= div_id -%>">
@@ -72,7 +72,7 @@
       %>
         <tr class="<%= cycle 'even', 'odd', :name => (div_id) -%>">
           <td class="max-width">
-            <%= link_to message('widget.unresolved_issues_per_assignee.not_assigned'),
+            <%= link_to message('widget.reviews_per_developer.not_assigned'),
                         {:controller => 'issues', :action => 'search', :assigned => 'false'}.merge(options) -%>
           </td>
           <td class="nowrap">
-- 
2.39.5