Author: michiel
Date: 2010-05-26 10:30:15 +0200 (Wed, 26 May 2010)
New Revision: 42271
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
Log:
Using utility method
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-05-26 08:29:38 UTC (rev 42270)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-05-26 08:30:15 UTC (rev 42271)
@@ -401,18 +401,9 @@
restriction.setFixed(isFixed);
}
String enforce = DataTypeXml.getAttribute(element,
"enforce").toLowerCase();
- if (enforce.equals("absolute")) {
- restriction.setEnforceStrength(DataType.ENFORCE_ABSOLUTE);
- } else if (enforce.equals("always") || enforce.equals("")) {
- restriction.setEnforceStrength(DataType.ENFORCE_ALWAYS);
- } else if (enforce.equals("onchange")) {
- restriction.setEnforceStrength(DataType.ENFORCE_ONCHANGE);
- } else if (enforce.equals("oncreate")) {
- restriction.setEnforceStrength(DataType.ENFORCE_ONCREATE);
- } else if (enforce.equals("onvalidate")) {
- restriction.setEnforceStrength(DataType.ENFORCE_ONVALIDATE);
- } else if (enforce.equals("never")) {
- restriction.setEnforceStrength(DataType.ENFORCE_NEVER);
+ int strength = DataTypes.getEnforceStrength(enforce);
+ if (strength != -1) {
+ restriction.setEnforceStrength(strength);
} else {
log.warn("Unrecognised value for 'enforce' attribute '" + enforce
+ "' in " + XMLWriter.write(element, true, true));
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
