From: simonbrandhof <simon.brandhof@gmail.com>
Date: Mon, 4 Oct 2010 14:34:48 +0000 (+0000)
Subject: quality model API: removeCharacteristic() must support disabled characteristics
X-Git-Tag: 2.6~888
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e871a18725ae45b245a3cface0935206ae35d750;p=sonarqube.git

quality model API: removeCharacteristic() must support disabled characteristics
---

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);
     }