Browse Source

fix build compatibility with Java 1.5

tags/2.6
simonbrandhof 13 years ago
parent
commit
4400a7bd88

+ 27
- 0
sonar-check-api/src/main/java/org/sonar/check/Cardinality.java View File

@@ -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
}

+ 2
- 6
sonar-check-api/src/main/java/org/sonar/check/Rule.java View File

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

+ 4
- 3
sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java View File

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

+ 1
- 1
sonar-plugin-api/src/main/java/org/sonar/api/rules/XMLRuleParser.java View File

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

+ 2
- 1
sonar-plugin-api/src/test/java/org/sonar/api/rules/XMLRuleParserTest.java View File

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

Loading…
Cancel
Save