Author: kmorin Date: 2009-11-04 17:03:24 +0100 (Wed, 04 Nov 2009) New Revision: 312 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntity.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityBean.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityWikitty.java Log: Add getExtensions method Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntity.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntity.java 2009-11-04 10:20:45 UTC (rev 311) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntity.java 2009-11-04 16:03:24 UTC (rev 312) @@ -40,9 +40,15 @@ public void setWikittyVersion(String version); /** - * Return list of all extension for this object + * Return list of all extensions for this object * @return */ + public Collection<WikittyExtension> getExtensions(); + + /** + * Return list of all extension names for this object + * @return + */ public Collection<String> getExtensionNames(); /** Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityBean.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityBean.java 2009-11-04 10:20:45 UTC (rev 311) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityBean.java 2009-11-04 16:03:24 UTC (rev 312) @@ -61,8 +61,13 @@ public void setWikittyVersion(String version) { this.version = version; } - + @Override + public Collection<WikittyExtension> getExtensions() { + return extensions.values(); + } + + public Collection<String> getExtensionNames() { Collection<String> result = extensions.keySet(); return result; Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityWikitty.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityWikitty.java 2009-11-04 10:20:45 UTC (rev 311) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityWikitty.java 2009-11-04 16:03:24 UTC (rev 312) @@ -62,6 +62,11 @@ getWikitty().setVersion(version); } + @Override + public Collection<WikittyExtension> getExtensions() { + return getWikitty().getExtensions(); + } + public void setWikitty(Wikitty wikitty) { wikitty = upgradeData(wikitty, getStaticExtensions()); for ( WikittyExtension ext : getStaticExtensions() ) { @@ -90,7 +95,32 @@ } public Object getField(String ext, String fieldName) { - Object result = getWikitty().getFieldAsObject(ext, fieldName); + Object result = null; + FieldType type = getFieldType(ext, fieldName); + if(type.isCollection()) { + result = getWikitty().getFieldAsObject(ext, fieldName); + } else { + switch(type.getType()) { + case BOOLEAN: + result = getWikitty().getFieldAsBoolean(ext, fieldName); + break; + case DATE: + result = getWikitty().getFieldAsDate(ext, fieldName); + break; + case NUMERIC: + result = getWikitty().getFieldAsBigDecimal(ext, fieldName); + break; + case STRING: + result = getWikitty().getFieldAsString(ext, fieldName); + break; + case WIKITTY: + result = getWikitty().getFieldAsString(ext, fieldName); + break; + default: + result = getWikitty().getFieldAsObject(ext, fieldName); + break; + } + } return result; }