fix build compatibility with Java 1.5

diff --git a/sonar-check-api/src/main/java/org/sonar/check/Cardinality.java b/sonar-check-api/src/main/java/org/sonar/check/Cardinality.java
new file mode 100644 (file)
index 0000000..deaa4f3
--- /dev/null
+++ b/sonar-check-api/src/main/java/org/sonar/check/Cardinality.java
@@ -0,0 +1,27 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.check;
+
+/**
+ * @since 2.3
+ */
+public enum Cardinality {
+  SINGLE, MULTIPLE
+}

diff --git a/sonar-check-api/src/main/java/org/sonar/check/Rule.java b/sonar-check-api/src/main/java/org/sonar/check/Rule.java
index 8c49e303add89baa316dad82bde6a9e64bdc2cc6..20c4cb0e34cf470f9445234732e828032d0ed51f 100644 (file)
--- a/sonar-check-api/src/main/java/org/sonar/check/Rule.java
+++ b/sonar-check-api/src/main/java/org/sonar/check/Rule.java
@@ -56,9 +56,5 @@ public @interface Rule {
    */
   IsoCategory isoCategory();
 
-  CARDINALITY cardinality() default CARDINALITY.SINGLE;
-
-  public static enum CARDINALITY {
-    SINGLE, MULTIPLE
-  }
-}
+  Cardinality cardinality() default Cardinality.SINGLE;
+}
\ No newline at end of file

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 2cfbad4734807ff26d7a51eae859d9c4732ef9d2..a2999a8452bbb00b8b93ff8eafc13841e9399952 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,6 +24,7 @@ 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
@@ -71,7 +72,7 @@ public final class Rule {
 \r
   @Enumerated(EnumType.STRING)\r
   @Column(name = "cardinality", updatable = true, nullable = false)\r
-  private org.sonar.check.Rule.CARDINALITY cardinality = org.sonar.check.Rule.CARDINALITY.SINGLE;\r
+  private Cardinality cardinality = Cardinality.SINGLE;\r
 \r
   @ManyToOne(fetch = FetchType.EAGER)\r
   @JoinColumn(name = "parent_id", updatable = true, nullable = true)\r
@@ -331,11 +332,11 @@ public final class Rule {
     return setRepositoryKey(repositoryKey).setKey(key).setConfigKey(key);\r
   }\r
 \r
-  public org.sonar.check.Rule.CARDINALITY getCardinality() {\r
+  public Cardinality getCardinality() {\r
     return cardinality;\r
   }\r
 \r
-  public Rule setCardinality(org.sonar.check.Rule.CARDINALITY c) {\r
+  public Rule setCardinality(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 46f6ff4874582da87f2fef6bda9bb7b9442be38b..760e246396451aff55e05c1e95137eadba78fe1a 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.Rule.CARDINALITY.valueOf(StringUtils.trim(cursor.collectDescendantText(false))));
+        rule.setCardinality(org.sonar.check.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 df56311968a5f4bbaacb840b2741b179d3d44a86..c444fdda875147acc6350bae9d5ded5302b6a49f 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,6 +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 java.io.StringReader;
 import java.util.List;
@@ -42,7 +43,7 @@ public class XMLRuleParserTest {
     assertThat(rule.getName(), is("Local Variable Name"));
     assertThat(rule.getDescription(), is("Checks that local, non-final variable names conform to a format specified by the format property."));
     assertThat(rule.getPriority(), Is.is(RulePriority.BLOCKER));
-    assertThat(rule.getCardinality(), Is.is(org.sonar.check.Rule.CARDINALITY.MULTIPLE));
+    assertThat(rule.getCardinality(), Is.is(Cardinality.MULTIPLE));
     assertThat(rule.getConfigKey(), is("Checker/TreeWalker/LocalVariableName"));
 
     assertThat(rule.getParams().size(), is(2));