Author: bpoussin Date: 2011-08-13 17:43:34 +0200 (Sat, 13 Aug 2011) New Revision: 1142 Url: http://nuiton.org/repositories/revision/wikitty/1142 Log: Anomalie #1670: Generation error when extension require meta-extension in model Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-08-13 15:27:14 UTC (rev 1141) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-08-13 15:43:34 UTC (rev 1142) @@ -53,6 +53,12 @@ */ protected transient PropertyChangeSupport propertyChangeSupport; + /** + * Only used by meta-extension, but all extension need it, bacause + * extension can require meta-extension, and then this attribute + * the metaExtension operations target this extension, may be null + */ + protected WikittyExtension extensionForMetaExtension; protected Wikitty wikitty; public BusinessEntityImpl(Wikitty wi) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-08-13 15:27:14 UTC (rev 1141) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-08-13 15:43:34 UTC (rev 1142) @@ -105,7 +105,7 @@ // System.out.println("Room Subject:" + info.getSubject()); // Thread t = new Thread(); - Thread.currentThread().sleep(1000*60); +// Thread.currentThread().sleep(1000*60); } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-08-13 15:27:14 UTC (rev 1141) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-08-13 15:43:34 UTC (rev 1142) @@ -588,8 +588,9 @@ String helperClassName = WikittyTransformerUtil.businessEntityToHelperName(metaExtension); - ObjectModelAttribute extension = addAttribute(abstractClassForThisMetaExtension, "extensionForMetaExtension", WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN); - setDocumentation(extension, "the metaExtension operations target this extension, may be null"); + // poussin 20110813 move to BusinessEntityImpl +// ObjectModelAttribute extension = addAttribute(abstractClassForThisMetaExtension, "extensionForMetaExtension", WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN); +// setDocumentation(extension, "the metaExtension operations target this extension, may be null"); ObjectModelOperation setExtensionForMetaExtension = addOperation(abstractClassForThisMetaExtension, "setExtensionForMetaExtension", "void"); addParameter(setExtensionForMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension");