From a352a402e4b323dcdcfe42b0b1c7aad8c95127ef Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 29 Jan 2016 12:42:34 +0100
Subject: [PATCH] SONAR-7135 SONAR-7129 base component is returned in the
 response

---
 .../src/main/java/org/sonar/server/component/ws/TreeAction.java | 2 +-
 .../java/org/sonar/server/measure/ws/ComponentTreeAction.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java
index 83619f1b501..09a7efdb496 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/TreeAction.java
@@ -137,7 +137,7 @@ public class TreeAction implements ComponentsWsAction {
       .setDescription("Strategy to search for base component descendants:" +
         "<ul>" +
         "<li>children: return the children components of the base component. Grandchildren components are not returned</li>" +
-        "<li>all: return all the descendants components of the base component. Grandchildren are returned. Base component is not returned.</li>" +
+        "<li>all: return all the descendants components of the base component. Grandchildren are returned.</li>" +
         "<li>leaves: return all the descendant components (files, in general) which don't have other children. They are the leaves of the component tree.</li>" +
         "</ul>")
       .setPossibleValues(STRATEGIES)
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
index 37fbaec12c1..7f903223247 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeAction.java
@@ -147,7 +147,7 @@ public class ComponentTreeAction implements MeasuresWsAction {
       .setDescription("Strategy to search for base component descendants:" +
         "<ul>" +
         "<li>children: return the children components of the base component. Grandchildren components are not returned</li>" +
-        "<li>all: return all the descendants components of the base component. Grandchildren are returned. Base component is not returned.</li>" +
+        "<li>all: return all the descendants components of the base component. Grandchildren are returned.</li>" +
         "<li>leaves: return all the descendant components (files, in general) which don't have other children. They are the leaves of the component tree.</li>" +
         "</ul>")
       .setPossibleValues(STRATEGIES)
-- 
2.39.5