LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ExtraXML wird jetzt innerhalb von cms:item ausgegeben. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1601 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-04-18 07:14:55 +00:00
parent 67e4b32734
commit 291b599cf2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java
View File

@ -183,7 +183,7 @@ public class SimpleXMLGenerator implements XMLGenerator {
s_log.info("Item is using DomainObjectXMLRenderer"); s_log.info("Item is using DomainObjectXMLRenderer");
// This is the preferred method // This is the preferred method
Element content = startElement(useContext); Element content = startElement(useContext, parent);
ContentItemXMLRenderer renderer = ContentItemXMLRenderer renderer =
new ContentItemXMLRenderer(content); new ContentItemXMLRenderer(content);
@ -195,19 +195,19 @@ public class SimpleXMLGenerator implements XMLGenerator {
renderer.walk(item, ADAPTER_CONTEXT); renderer.walk(item, ADAPTER_CONTEXT);
parent.addContent(content); //parent.addContent(content);
/* /*
* 2011-08-27 jensp: Introduced to remove the annoying special templates * 2011-08-27 jensp: Introduced to remove the annoying special templates
* for MultiPartArticle, SiteProxy and others. The method called * for MultiPartArticle, SiteProxy and others. The method called
* here was already definied but not used. * here was already definied but not used.
* *
* 2011-10-23 jensp: It is not possible to disable the use of * 2011-10-23 jensp: It is now possible to disable the use of
* extra XML. * extra XML.
*/ */
if (useExtraXml) { if (useExtraXml) {
for (ExtraXMLGenerator generator : item.getExtraXMLGenerators()) { for (ExtraXMLGenerator generator : item.getExtraXMLGenerators()) {
generator.generateXML(item, parent, state); generator.generateXML(item, content, state);
} }
} }
} }
@ -236,7 +236,7 @@ public class SimpleXMLGenerator implements XMLGenerator {
Element parent, Element parent,
String useContext) { String useContext) {
Element element = startElement(useContext); Element element = startElement(useContext, parent);
Element additionalAttrs = UDItemElement(useContext); Element additionalAttrs = UDItemElement(useContext);
element.addAttribute("type", UDItem.getContentType().getLabel()); element.addAttribute("type", UDItem.getContentType().getLabel());
@ -266,13 +266,15 @@ public class SimpleXMLGenerator implements XMLGenerator {
} }
//element.addContent(additionalAttrs); //element.addContent(additionalAttrs);
parent.addContent(element); //parent.addContent(element);
} }
private Element startElement(String useContext) { private Element startElement(String useContext, Element parent) {
//Element element = new Element("cms:item", CMS.CMS_XML_NS); //Element element = new Element("cms:item", CMS.CMS_XML_NS);
final Element element = new Element(itemElemName, itemElemNs); //final Element element = new Element(itemElemName, itemElemNs);
final Element element = parent.newChildElement("cms:item",
CMS.CMS_XML_NS);
if (useContext != null) { if (useContext != null) {
element.addAttribute("useContext", useContext); element.addAttribute("useContext", useContext);
} }