SONAR-7135 SONAR-7129 base component is returned in the response

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 83619f1b501ce9df56972187390ff1b6f469199f..09a7efdb496faee941a96d8414964994ee9a053e 100644 (file)
--- 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 37fbaec12c1e0ea6578e94903554eb63cdda787f..7f903223247d3b21dc75263bc33423fa1cf98650 100644 (file)
--- 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)