quality model API: removeCharacteristic() must support disabled characteristics

1 files changed, 8 insertions, 1 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
index fb5b5ad6b43..874d64bf68d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
@@ -177,7 +177,14 @@ public final class Model implements Comparable<Model> {
   }
 
   public Model removeCharacteristic(Characteristic characteristic) {
-    characteristic.setEnabled(false);
+    if (characteristic.getId() == null) {
+      characteristics.remove(characteristic);
+      for (Characteristic parent : characteristic.getParents()) {
+        parent.removeChild(characteristic);
+      }
+    } else {
+      characteristic.setEnabled(false);
+    }
     for (Characteristic child : characteristic.getChildren()) {
       removeCharacteristic(child);
     }