Author: mfortun Date: 2011-08-18 15:37:42 +0200 (Thu, 18 Aug 2011) New Revision: 1173 Url: http://nuiton.org/repositories/revision/wikitty/1173 Log: *correct implementation for wikitty service on FS Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-18 13:34:06 UTC (rev 1172) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-18 13:37:42 UTC (rev 1173) @@ -7,8 +7,17 @@ import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyLabel; +import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.publication.entities.WikittyPubData; +import org.nuiton.wikitty.publication.entities.WikittyPubDataImpl; +import org.nuiton.wikitty.publication.entities.WikittyPubText; +import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiled; +import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiledImpl; +import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.operators.And; @@ -538,5 +547,25 @@ return result; } + + @Override + public WikittyExtension restoreExtensionLastVersion(String securityToken, + String name) { + + if (name.equals(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + return WikittyPubTextImpl.extensionWikittyPubText; + } + + if (name.equals(WikittyPubData.EXT_WIKITTYPUBDATA)) { + return WikittyPubDataImpl.extensionWikittyPubData; + } + + if (name.equals(WikittyLabel.EXT_WIKITTYLABEL)) { + return WikittyLabelImpl.extensionWikittyLabel; + } + + return null; + } + } \ No newline at end of file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-18 13:34:06 UTC (rev 1172) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-18 13:37:42 UTC (rev 1173) @@ -287,22 +287,16 @@ public WikittyExtension restoreExtensionLastVersion(String securityToken, String name) { - if (name.equals(WikittyPubText.EXT_WIKITTYPUBTEXT)) { - return WikittyPubTextImpl.extensionWikittyPubText; + WikittyExtension result = super.restoreExtensionLastVersion( + securityToken, name); + if (result != null) { + return result; } if (name.equals(WikittyPubTextCompiled.EXT_WIKITTYPUBTEXTCOMPILED)) { return WikittyPubTextCompiledImpl.extensionWikittyPubTextCompiled; } - - if (name.equals(WikittyPubData.EXT_WIKITTYPUBDATA)) { - return WikittyPubDataImpl.extensionWikittyPubData; - } - - if (name.equals(WikittyLabel.EXT_WIKITTYLABEL)) { - return WikittyLabelImpl.extensionWikittyLabel; - } - + return null; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-18 13:34:06 UTC (rev 1172) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-18 13:37:42 UTC (rev 1173) @@ -542,15 +542,7 @@ } - @Override - public WikittyExtension restoreExtensionLastVersion(String securityToken, - String name) { - // TODO mfortun-2011-04-05 - throw new UnsupportedOperationException("not yet implemented"); - // return null; - } - @Override /** * restore file as wikitty