Author: bpoussin Date: 2012-04-05 17:26:48 +0200 (Thu, 05 Apr 2012) New Revision: 1461 Url: http://nuiton.org/repositories/revision/wikitty/1461 Log: petit modif avant changement en commons.lang3 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-04-05 15:25:11 UTC (rev 1460) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-04-05 15:26:48 UTC (rev 1461) @@ -74,7 +74,7 @@ } public String getTagValue(String tag) { - String result = tagValues.get(tag); + String result = StringUtils.defaultIfBlank(tagValues.get(tag), ""); return result; } @@ -254,8 +254,8 @@ * @see #TAG_PATTERN */ public boolean hasPattern() { - String result = getTagValue(TAG_PATTERN); - return result != null; + boolean result = StringUtils.isNotBlank(getTagValue(TAG_PATTERN)); + return result; } /** @@ -270,8 +270,8 @@ * @see #TAG_CRYPT */ public boolean isCrypted() { - String crypt = getTagValue(TAG_CRYPT); - return crypt != null; + boolean result = StringUtils.isNotBlank(getTagValue(TAG_CRYPT)); + return result; } /** @@ -298,6 +298,19 @@ */ public String getSubtype() { String result = getTagValue(TAG_SUBTYPE); + if (StringUtils.isBlank(result)) { + switch(type) { + case DATE: + result = ""; + break; + case NUMERIC: + result = "real"; + break; + case STRING: + result = "monoline"; + break; + } + } return result; } /** @@ -389,6 +402,15 @@ boolean result = StringUtils.isNotBlank(getAllowedQuery()); return result; } + public boolean hasChoice() { + boolean result = StringUtils.isNotBlank(getChoice()); + return result; + } + + public boolean hasChoiceQuery() { + boolean result = StringUtils.isNotBlank(getChoiceQuery()); + return result; + } public boolean hasMin() { boolean result = StringUtils.isNotBlank(getMin()); return result; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-04-05 15:25:11 UTC (rev 1460) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-04-05 15:26:48 UTC (rev 1461) @@ -31,6 +31,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -122,7 +123,7 @@ String renameFrom = fieldType.getTagValue(TAG_RENAME); log.debug("Scan rename migration on " + extName + "." + fieldName + ":" + TAG_RENAME + "=" + renameFrom); - if(renameFrom != null && !renameFrom.isEmpty()) { + if(StringUtils.isNotBlank(renameFrom)) { Object value = wikitty.getFieldAsObject(extName, renameFrom); log.debug("Rename " + extName + "." + fieldName + "=" + value); result.setField(extName, fieldName, value);