Author: bpoussin Date: 2012-03-11 18:22:05 +0100 (Sun, 11 Mar 2012) New Revision: 1454 Url: http://nuiton.org/repositories/revision/wikitty/1454 Log: change accessor for extension allowed tag value Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.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-03-11 17:21:28 UTC (rev 1453) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-03-11 17:22:05 UTC (rev 1454) @@ -296,7 +296,15 @@ /** * @see #TAG_EXTENSION_ALLOWED */ - public List<List<String>> getExtensionAllowed() { + public String getExtensionAllowed() { + String allowed = getTagValue(TAG_EXTENSION_ALLOWED); + return allowed; + } + /** + * @return list or null if not spcified allowed extension + * @see #TAG_EXTENSION_ALLOWED + */ + public List<List<String>> getExtensionAllowedAsList() { List<List<String>> result = null; if (isExtensionRestrited()) { result = new ArrayList<List<String>>(); @@ -316,7 +324,7 @@ * @see #TAG_EXTENSION_ALLOWED */ public boolean isExtensionRestrited() { - String allowed = getTagValue(TAG_EXTENSION_ALLOWED); - return allowed != null; + boolean result = StringUtils.isNotBlank(getExtensionAllowed()); + return result; } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-03-11 17:21:28 UTC (rev 1453) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-03-11 17:22:05 UTC (rev 1454) @@ -199,7 +199,7 @@ wikittyField.getExtensionNames(); boolean authorized = false; - List<List<String>> allowed = type.getExtensionAllowed(); + List<List<String>> allowed = type.getExtensionAllowedAsList(); for (List<String> l : allowed) { if (extensionNames.containsAll(l)) { authorized = true;