Unverified Commit 61fda5c7 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

update regex for terms

parent 6d699e2d

src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_4_4_1_Checker.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -45,8 +45,9 @@ import fr.mines_stetienne.ci.saref.managers.RepositoryManager; 
 */

 */

public class Clause_9_4_4_1_Checker extends AbstractClauseChecker {

public class Clause_9_4_4_1_Checker extends AbstractClauseChecker {





	private static final Pattern PATTERN_LOCAL_NAME = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9]+$");

	private static final Pattern PATTERN_LOCAL_NAME = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9_-]+$");

	private static final Pattern PATTERN_CAMEL_CASE = Pattern.compile("^[A-Z0-9][a-zA-Z0-9]+$");

	private static final Pattern PATTERN_CAMEL_CASE = Pattern.compile("^[A-Z0-9][a-zA-Z0-9]+$");

	private static final Pattern PATTERN_TERM_CAMEL_CASE = Pattern.compile("^[A-Z0-9][a-zA-Z0-9_-]+$");

	private static final Pattern PATTERN_MIXED_CASE = Pattern.compile("^[a-z0-9][a-zA-Z0-9]+$");

	private static final Pattern PATTERN_MIXED_CASE = Pattern.compile("^[a-z0-9][a-zA-Z0-9]+$");





	private static enum MESSAGE {

	private static enum MESSAGE {
@@ -78,7 +79,7 @@ public class Clause_9_4_4_1_Checker extends AbstractClauseChecker { 
			if (model.contains(t, RDF.type, OWL2.Class) && !PATTERN_CAMEL_CASE.matcher(localName).matches()) {

			if (model.contains(t, RDF.type, OWL2.Class) && !PATTERN_CAMEL_CASE.matcher(localName).matches()) {

				classesBadCase.add(t);

				classesBadCase.add(t);

			}

			}

			if (model.contains(t, RDF.type, OWL2.NamedIndividual) && !PATTERN_CAMEL_CASE.matcher(localName).matches()) {

			if (model.contains(t, RDF.type, OWL2.NamedIndividual) && !PATTERN_TERM_CAMEL_CASE.matcher(localName).matches()) {

				namedIndividualsBadCase.add(t);

				namedIndividualsBadCase.add(t);

			}

			}

			if (model.contains(t, RDF.type, OWL2.ObjectProperty) && !PATTERN_MIXED_CASE.matcher(localName).matches()) {

			if (model.contains(t, RDF.type, OWL2.ObjectProperty) && !PATTERN_MIXED_CASE.matcher(localName).matches()) {