From: <die...@us...> - 2012-03-15 11:21:30
|
Revision: 3807 http://openutils.svn.sourceforge.net/openutils/?rev=3807&view=rev Author: diego_schivo Date: 2012-03-15 11:21:19 +0000 (Thu, 15 Mar 2012) Log Message: ----------- MgnlActionResolver Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-15 11:07:59 UTC (rev 3806) +++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java 2012-03-15 11:21:19 UTC (rev 3807) @@ -19,6 +19,12 @@ package it.openutils.magnoliastripes; +import info.magnolia.objectfactory.Components; +import info.magnolia.registry.RegistrationException; +import info.magnolia.rendering.template.TemplateDefinition; +import info.magnolia.rendering.template.configured.ConfiguredTemplateDefinition; +import info.magnolia.rendering.template.registry.TemplateDefinitionProvider; +import info.magnolia.rendering.template.registry.TemplateDefinitionRegistry; import it.openutils.magnoliastripes.annotations.Dialog; import java.util.HashSet; @@ -49,7 +55,7 @@ /** * Configured Stripes paragraphs. */ - private static Set<Paragraph> paragraphs = new HashSet<Paragraph>(); + private static Set<TemplateDefinition> paragraphs = new HashSet<TemplateDefinition>(); /** * {@inheritDoc} @@ -120,31 +126,57 @@ */ private void collectStripesParagraphs(String paragraphName, String dialogName, String binding) { - Paragraph paragraph = new Paragraph(); + final ConfiguredTemplateDefinition paragraph = new ConfiguredTemplateDefinition(); paragraph.setName(paragraphName); paragraph.setTitle("paragraph." + paragraphName + ".title"); paragraph.setDescription("paragraph." + paragraphName + ".description"); paragraph.setDialog(dialogName); - paragraph.setTemplatePath(binding); - paragraph.setType("stripes"); + paragraph.setTemplateScript(binding); + paragraph.setRenderType("stripes"); paragraph.setI18nBasename(StripesModule.getInstance().getI18nbasename()); paragraphs.add(paragraph); log.info("Registering stripes paragraph {} with dialog {}", paragraph.getName(), paragraph.getDialog()); //$NON-NLS-1$ /$NON-NLS-2$ - ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + // ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + Components.getComponent(TemplateDefinitionRegistry.class).register(new TemplateDefinitionProvider() + { + + public TemplateDefinition getTemplateDefinition() throws RegistrationException + { + return paragraph; + } + + public String getId() + { + return paragraph.getName(); + } + }); } public static void registerParagraphs() { - for (Paragraph paragraph : paragraphs) + for (final TemplateDefinition paragraph : paragraphs) { log.info("Registering stripes paragraph {}", paragraph.getName()); //$NON-NLS-1$ - ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + // ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph); + Components.getComponent(TemplateDefinitionRegistry.class).register(new TemplateDefinitionProvider() + { + + public TemplateDefinition getTemplateDefinition() throws RegistrationException + { + return paragraph; + } + + public String getId() + { + return paragraph.getName(); + } + }); } } - public static Set<Paragraph> getParagraphs() + public static Set<TemplateDefinition> getParagraphs() { return paragraphs; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |