November 2010 - Wikitty-commits - mailman.cloud.codelutin.com

r526 - trunk/wikitty-api/src/test/java
by bpoussin＠users.nuiton.org 26 Nov '10

26 Nov '10

Author: bpoussin Date: 2010-11-26 14:57:08 +0100 (Fri, 26 Nov 2010) New Revision: 526 Url: http://nuiton.org/repositories/revision/wikitty/526 Log: rename method 'Wikitty.replace' to 'Wikitty.replaceWith' rename class 'WikittyServiceImpl' to 'WikittyServiceStorage' move bad package test entities to right place add test on Wikitty.replaceWith method fix bug in Wikitty.replaceWith method Removed: trunk/wikitty-api/src/test/java/entities/

1 0

r525 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org 26 Nov '10

26 Nov '10

Author: jcouteau Date: 2010-11-26 12:25:30 +0100 (Fri, 26 Nov 2010) New Revision: 525 Url: http://nuiton.org/repositories/revision/wikitty/525 Log: Add needed import in DTO Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-11-25 17:11:08 UTC (rev 524) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-11-26 11:25:30 UTC (rev 525) @@ -566,6 +566,7 @@ copyFromBody = addCopyFromAttributes(entity, copyFromBody); addImport(dtoClass, "org.nuiton.wikitty.WikittyException"); + addImport(dtoClass, "org.nuiton.wikitty.entities.BusinessEntity"); setOperationBody(copyFrom, copyFromBody); } @@ -600,6 +601,7 @@ protected String copyFromAttributesOfClass(ObjectModelClass businessEntity, String methodBody){ + for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { if (attribute.isNavigable()) { // needed below, in templates

1 0

r524 - trunk/wikitty-api
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 18:11:08 +0100 (Thu, 25 Nov 2010) New Revision: 524 Url: http://nuiton.org/repositories/revision/wikitty/524 Log: Add commons-beanutils missing dependency Modified: trunk/wikitty-api/pom.xml Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-11-25 17:10:19 UTC (rev 523) +++ trunk/wikitty-api/pom.xml 2010-11-25 17:11:08 UTC (rev 524) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>

1 0

r523 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 18:10:19 +0100 (Thu, 25 Nov 2010) New Revision: 523 Url: http://nuiton.org/repositories/revision/wikitty/523 Log: add tests not to generate intHelper or voidHelper Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-11-25 17:09:41 UTC (rev 522) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-11-25 17:10:19 UTC (rev 523) @@ -44,7 +44,9 @@ @Override public void transformFromClass(ObjectModelClass clazz) { - + + if (WikittyTransformerUtil.isBusinessEntity(clazz) ||(WikittyTransformerUtil.isMetaExtension(clazz))) { + ObjectModelClass helper = createClass(WikittyTransformerUtil.businessEntityToHelperName(clazz), clazz.getPackageName()); @@ -80,6 +82,8 @@ if ( WikittyTransformerUtil.isMetaExtension(clazz)) { createOperationForMetaExtension(clazz, helper); } + + } } /** add operation if input model element has stereotype "entity" */

1 0

r522 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 18:09:41 +0100 (Thu, 25 Nov 2010) New Revision: 522 Url: http://nuiton.org/repositories/revision/wikitty/522 Log: Only one loop to run through model Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-11-25 16:42:39 UTC (rev 521) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-11-25 17:09:41 UTC (rev 522) @@ -77,9 +77,6 @@ if (WikittyTransformerUtil.isBusinessEntity(clazz)) { processEntity(clazz); } - } - - for (ObjectModelClass clazz : model.getClasses()) { if (WikittyTransformerUtil.isMetaExtension(clazz)) { processMetaExtension(clazz); }

1 0

r521 - trunk/wikitty-dto
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 17:42:39 +0100 (Thu, 25 Nov 2010) New Revision: 521 Url: http://nuiton.org/repositories/revision/wikitty/521 Log: Ignore PutObjectDirHere in svn Modified: trunk/wikitty-dto/ Property changes on: trunk/wikitty-dto ___________________________________________________________________ Modified: svn:ignore - target *.iml *.iws *.ipr + target PutObjectStoreDirHere *.iml *.iws *.ipr

1 0

r520 - in trunk: . wikitty-api wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/test/java/entities wikitty-dto wikitty-dto/src/test/java/org/nuiton/wikitty/dto
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 17:40:54 +0100 (Thu, 25 Nov 2010) New Revision: 520 Url: http://nuiton.org/repositories/revision/wikitty/520 Log: Fix poms for EUGene generation in api and dto modules (finally) Fix some license headers Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java trunk/wikitty-dto/pom.xml trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -569,8 +569,16 @@ <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${eugeneVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> + </pluginManagement> </build> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -63,11 +63,6 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> @@ -149,35 +144,6 @@ </resource> </resources> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> -  - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.entities; import java.lang.annotation.ElementType; Modified: trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java =================================================================== --- trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package entities; Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-dto/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -20,14 +20,8 @@ <dependencies>  - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> @@ -51,12 +45,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - -  <dependency> <groupId>junit</groupId> @@ -89,35 +77,14 @@ <build> <plugins> -  <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters> - org.nuiton.processor.filters.GeneratorTemplatesFilter - </filters> - </configuration> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> <id>api-dto-generation</id> - <phase>generate-test-sources</phase> + <phase>generate-sources</phase> <configuration> - <testPhase>true</testPhase> <inputs> <input>classpath:model:/:wikitty.objectmodel</input> </inputs> @@ -139,13 +106,6 @@ </goals> </execution> </executions> -  </plugin>  Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: dto + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin, Jean Couteau + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.dto; import org.junit.Test; @@ -8,7 +32,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.entities.WikittyLabelDTO; import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.services.WikittyServiceInMemory;

1 0

r519 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: jcouteau Date: 2010-11-25 17:24:27 +0100 (Thu, 25 Nov 2010) New Revision: 519 Url: http://nuiton.org/repositories/revision/wikitty/519 Log: Manage copyFrom method on DTOs Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-11-25 16:01:04 UTC (rev 518) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-11-25 16:24:27 UTC (rev 519) @@ -186,16 +186,22 @@ if (WikittyTransformerUtil.isAttributeCollection(attribute)) { // attribute is a collection, we will generate operations // get, add, remove and clear + + //calculate template parameters + String attributeTypeInSet = WikittyTransformerUtil.generateResultType(attribute, true); + String attributeTypeInSetImpl = null; String collectionType = WikittyTransformerUtil.getCollectionTypeName(attribute); if (collectionType.equals("Set")){ addImport(abstractClass, Set.class); + addImport(abstractClass, "java.util.HashSet"); + attributeTypeInSetImpl = "HashSet<String>"; } if (collectionType.equals("List")){ addImport(abstractClass, List.class); - + addImport(abstractClass, "java.util.ArrayList"); + attributeTypeInSetImpl = "ArrayList<String>"; } - String attributeTypeInSet = WikittyTransformerUtil.generateResultType(attribute, true); //adding the attribute ObjectModelAttribute modelAttribute = addAttribute(abstractClass, attributeName, attributeTypeInSet); @@ -221,7 +227,11 @@ addParameter(setter, attributeTypeInSet, attributeName); String setterBody = "" /*{ - this.<%=attributeName%>=<%=attributeName%>; + if (<%=attributeName%> == null){ + this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); + } else { + this.<%=attributeName%>=<%=attributeName%>; + } }*/; setOperationBody(setter, setterBody); @@ -232,6 +242,9 @@ addParameter(adder, attributeType, "element"); String adderBody = "" /*{ + if (<%=attributeName%> == null){ + this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); + } <%=attributeName%>.add(element); }*/; setOperationBody(adder, adderBody); @@ -547,77 +560,81 @@ <%=entityName%> sourceCopy = (<%=entityName%>)source; - this.setWikittyVersion(sourceCopy.getWikittyVersion()); + setWikittyVersion(sourceCopy.getWikittyVersion()); }*/; - copyFromBody = addCopyFromAttributes(entity, dtoClass, copyFromBody); + copyFromBody = addCopyFromAttributes(entity, copyFromBody); addImport(dtoClass, "org.nuiton.wikitty.WikittyException"); setOperationBody(copyFrom, copyFromBody); } + /** + * Generate the copyFrom method. This method set all fields of the class + * from all the fields of another instance of the same class. + * @param businessEntity + * @param methodBody + * @return + */ protected String addCopyFromAttributes(ObjectModelClass businessEntity, - ObjectModelClass dtoClass, String methodBody){ - // generating operations with bodies to realize contract + methodBody=copyFromAttributesOfClass(businessEntity, methodBody); + + // add attributes inherited from super classes + for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { + + // process super classes first (for multi-level inheritance) + methodBody=copyFromAttributesOfClass(superClass, methodBody); + + if (WikittyTransformerUtil.isBusinessEntity(superClass)) { + + methodBody=copyFromAttributesOfClass(businessEntity, methodBody); + } + } + + return methodBody; + + } + + protected String copyFromAttributesOfClass(ObjectModelClass businessEntity, + String methodBody){ for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { if (attribute.isNavigable()) { // needed below, in templates String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); String attributeName = attribute.getName(); + String attributeTypeInSetImpl = null; + String collectionType = WikittyTransformerUtil.getCollectionTypeName(attribute); + if (collectionType.equals("Set")) { + attributeTypeInSetImpl = "HashSet<String>"; + } + if (collectionType.equals("List")) { + attributeTypeInSetImpl = "ArrayList<String>"; + } - //If alternative name, use it if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); } - String capitalizedAttributeName = StringUtils.capitalize(attributeName); - methodBody += "" + + if (WikittyTransformerUtil.isAttributeCollection(attribute)) { + methodBody += "" /*{ - this.set<%=capitalizedAttributeName%>(sourceCopy.get<%=capitalizedAttributeName%>()); + set<%=capitalizedAttributeName%>(new <%=attributeTypeInSetImpl%>(sourceCopy.get<%=capitalizedAttributeName%>())); }*/; - } - } - - - // add attributes and methods inherited from super classes - for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { - - // process super classes first, so we will get inherited operations from superclass - addCopyFromAttributes(superClass, dtoClass, methodBody); - - if (WikittyTransformerUtil.isBusinessEntity(superClass)) { - - // generating operations with bodies to realize contract - for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { - if (attribute.isNavigable()) { - // needed below, in templates - String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); - String attributeName = attribute.getName(); - - - //If alternative name, use it - if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { - attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); - } - - String capitalizedAttributeName = StringUtils.capitalize(attributeName); - - methodBody+="" + } else { + methodBody += "" /*{ - this.set<%=capitalizedAttributeName%>(source.get<%=capitalizedAttributeName%>()); + set<%=capitalizedAttributeName%>(sourceCopy.get<%=capitalizedAttributeName%>()); }*/; - } } } } - return methodBody; - } protected void addModelOperations(ObjectModelClass businessEntity, ObjectModelClass dtoClass){

1 0

r518 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: bpoussin Date: 2010-11-25 17:01:04 +0100 (Thu, 25 Nov 2010) New Revision: 518 Url: http://nuiton.org/repositories/revision/wikitty/518 Log: better exception message to find bug easily ;) (again :)) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-11-25 15:53:44 UTC (rev 517) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-11-25 16:01:04 UTC (rev 518) @@ -462,9 +462,18 @@ public Object getFieldAsObject(String ext, String fieldName) { if (!hasField(ext, fieldName)) { WikittyExtension extension = extensions.get(ext); + String type; + Collection list; + if (extension == null) { + type = "extension"; + list = getExtensionNames(); + } else { + type = "fieldname"; + list = extension.getFieldNames(); + } throw new WikittyException(String.format( - "field '%s' is not a valid field. acceptable fieldname are: %s", - ext + "." + fieldName, extension.getFieldNames())); + "field '%s' is not a valid field. acceptable %s are: %s", + ext + "." + fieldName, type, list)); } String key = ext + "." + fieldName; Object result = fieldValue.get(key);

1 0

r517 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: bpoussin Date: 2010-11-25 16:53:44 +0100 (Thu, 25 Nov 2010) New Revision: 517 Url: http://nuiton.org/repositories/revision/wikitty/517 Log: better exception message to find bug easily ;) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-11-24 17:33:00 UTC (rev 516) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-11-25 15:53:44 UTC (rev 517) @@ -40,6 +40,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; @@ -55,6 +57,9 @@ */ public class WikittyImpl implements Wikitty { + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyImpl.class); + /** serialVersionUID. */ private static final long serialVersionUID = 4910886672760691052L; @@ -456,9 +461,10 @@ @Override public Object getFieldAsObject(String ext, String fieldName) { if (!hasField(ext, fieldName)) { + WikittyExtension extension = extensions.get(ext); throw new WikittyException(String.format( - "field '%s' is not a valid field", - ext + "." + fieldName)); + "field '%s' is not a valid field. acceptable fieldname are: %s", + ext + "." + fieldName, extension.getFieldNames())); } String key = ext + "." + fieldName; Object result = fieldValue.get(key);

1 0