in fact Java 1.5 should support enum in annotations if the enum is defined before...

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
index a2999a8452bbb00b8b93ff8eafc13841e9399952..d7aaa4a58a72882bd976e4049736d92451e465d6 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
@@ -24,7 +24,6 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;\r
 import org.apache.commons.lang.builder.ToStringBuilder;\r
 import org.sonar.api.database.DatabaseProperties;\r
-import org.sonar.check.Cardinality;\r
 \r
 import javax.persistence.*;\r
 import java.util.ArrayList;\r
@@ -72,7 +71,7 @@ public final class Rule {
 \r
   @Enumerated(EnumType.STRING)\r
   @Column(name = "cardinality", updatable = true, nullable = false)\r
-  private Cardinality cardinality = Cardinality.SINGLE;\r
+  private org.sonar.check.Rule.Cardinality cardinality = org.sonar.check.Rule.Cardinality.SINGLE;\r
 \r
   @ManyToOne(fetch = FetchType.EAGER)\r
   @JoinColumn(name = "parent_id", updatable = true, nullable = true)\r
@@ -332,11 +331,11 @@ public final class Rule {
     return setRepositoryKey(repositoryKey).setKey(key).setConfigKey(key);\r
   }\r
 \r
-  public Cardinality getCardinality() {\r
+  public org.sonar.check.Rule.Cardinality getCardinality() {\r
     return cardinality;\r
   }\r
 \r
-  public Rule setCardinality(Cardinality c) {\r
+  public Rule setCardinality(org.sonar.check.Rule.Cardinality c) {\r
     this.cardinality = c;\r
     return this;\r
   }\r

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
index 760e246396451aff55e05c1e95137eadba78fe1a..9ff321b0457f1d0e6e68ecce5797d4c484347eb5 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java
@@ -139,7 +139,7 @@ public final class XMLRuleParser implements ServerComponent {
         rule.setRulesCategory(new RulesCategory(category));
 
       } else if (StringUtils.equalsIgnoreCase("cardinality", nodeName)) {
-        rule.setCardinality(org.sonar.check.Cardinality.valueOf(StringUtils.trim(cursor.collectDescendantText(false))));
+        rule.setCardinality(org.sonar.check.Rule.Cardinality.valueOf(StringUtils.trim(cursor.collectDescendantText(false))));
 
       } else if (StringUtils.equalsIgnoreCase("param", nodeName)) {
         processParameter(rule, cursor);

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rules/XMLRuleParserTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/rules/XMLRuleParserTest.java
index c444fdda875147acc6350bae9d5ded5302b6a49f..726596e5a7b358db6481538814ce66d3cd6dc684 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/rules/XMLRuleParserTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/rules/XMLRuleParserTest.java
@@ -22,7 +22,7 @@ package org.sonar.api.rules;
 import org.hamcrest.core.Is;
 import org.junit.Test;
 import org.sonar.api.utils.SonarException;
-import org.sonar.check.Cardinality;
+import org.sonar.check.Rule.Cardinality;
 
 import java.io.StringReader;
 import java.util.List;