From c65f0e4c995b5d007f70842dc8bd7f9b0c3f3ec9 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 10 Nov 2015 10:45:13 +0100
Subject: [PATCH] SONAR-6952 apply feedback

---
 .../java/org/sonar/server/issue/ws/SearchAction.java | 12 ++++++++----
 .../templates/api-documentation-action.hbs           |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index b75e8d2c3bd..37efbb73513 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -176,7 +176,8 @@ public class SearchAction implements IssuesWsAction {
         "If this parameter is set, componentUuids must not be set.")
       .setExampleValue("org.apache.struts:struts:org.apache.struts.Action");
     action.createParam(IssueFilterParameters.COMPONENTS)
-      .setDescription("Deprecated since 5.1. If used, will have the same meaning as componentKeys AND onComponentOnly=true.");
+      .setDeprecatedSince("5.1")
+      .setDescription("If used, will have the same meaning as componentKeys AND onComponentOnly=true.");
     action.createParam(IssueFilterParameters.COMPONENT_UUIDS)
       .setDescription("To retrieve issues associated to a specific list of components their sub-components (comma-separated list of component UUIDs). " +
         INTERNAL_PARAMETER_DISCLAIMER +
@@ -185,12 +186,15 @@ public class SearchAction implements IssuesWsAction {
       .setExampleValue("584a89f2-8037-4f7b-b82c-8b45d2d63fb2");
 
     action.createParam(IssueFilterParameters.COMPONENT_ROOTS)
-      .setDescription("Deprecated since 5.1. If used, will have the same meaning as componentKeys AND onComponentOnly=false.");
+      .setDeprecatedSince("5.1")
+      .setDescription("If used, will have the same meaning as componentKeys AND onComponentOnly=false.");
     action.createParam(IssueFilterParameters.COMPONENT_ROOT_UUIDS)
-      .setDescription("Deprecated since 5.1. If used, will have the same meaning as componentUuids AND onComponentOnly=false.");
+      .setDeprecatedSince("5.1")
+      .setDescription("If used, will have the same meaning as componentUuids AND onComponentOnly=false.");
 
     action.createParam(IssueFilterParameters.PROJECTS)
-      .setDescription("Deprecated since 5.1. See projectKeys");
+      .setDeprecatedSince("5.1")
+      .setDescription("See projectKeys");
     action.createParam(IssueFilterParameters.PROJECT_KEYS)
       .setDescription("To retrieve issues associated to a specific list of projects (comma-separated list of project keys). " +
         INTERNAL_PARAMETER_DISCLAIMER +
diff --git a/server/sonar-web/src/main/js/apps/api-documentation/templates/api-documentation-action.hbs b/server/sonar-web/src/main/js/apps/api-documentation/templates/api-documentation-action.hbs
index 1a51f37bcf6..19e44bef5d7 100644
--- a/server/sonar-web/src/main/js/apps/api-documentation/templates/api-documentation-action.hbs
+++ b/server/sonar-web/src/main/js/apps/api-documentation/templates/api-documentation-action.hbs
@@ -10,7 +10,7 @@
     {{#if deprecatedSince}}
       <span class="spacer-right">
         <span class="badge badge-danger" data-toggle="tooltip"
-              title="{{t 'api_documentation.deprecation_tooltip'}}">deprecated since {{deprecatedSince}}</span>
+              title="{{t 'api_documentation.deprecation_tooltip'}}">Deprecated since {{deprecatedSince}}</span>
       </span>
     {{/if}}
     {{#if since}}
@@ -36,6 +36,10 @@
           {{#if since}}
             <div class="note">since {{since}}</div>
           {{/if}}
+          {{#if deprecatedSince}}
+            <span class="badge badge-danger little-spacer-top" data-toggle="tooltip"
+                  title="{{t 'api_documentation.deprecation_tooltip'}}">Deprecated since {{deprecatedSince}}</span>
+          {{/if}}
         </td>
         <td>
           <div class="markdown">{{{description}}}</div>
-- 
2.39.5