Mehrsprachige RelatedLinks
für Navigation git-svn-id: https://svn.libreccm.org/ccm/trunk@326 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
4366671f9c
commit
4f9b5435cc
|
|
@ -25,7 +25,7 @@ import com.arsdigita.cms.ContentBundle;
|
||||||
import com.arsdigita.cms.ContentItem;
|
import com.arsdigita.cms.ContentItem;
|
||||||
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
||||||
import com.arsdigita.dispatcher.DispatcherHelper;
|
import com.arsdigita.dispatcher.DispatcherHelper;
|
||||||
import com.arsdigita.domain.DomainObjectXMLRenderer;
|
import com.arsdigita.cms.ContentItemXMLRenderer;
|
||||||
import com.arsdigita.kernel.ACSObject;
|
import com.arsdigita.kernel.ACSObject;
|
||||||
import com.arsdigita.persistence.OID;
|
import com.arsdigita.persistence.OID;
|
||||||
import com.arsdigita.xml.Element;
|
import com.arsdigita.xml.Element;
|
||||||
|
|
@ -198,7 +198,7 @@ public class ContentList extends AbstractComponent {
|
||||||
// output the XML
|
// output the XML
|
||||||
ContentItem item;
|
ContentItem item;
|
||||||
Element itemElement;
|
Element itemElement;
|
||||||
DomainObjectXMLRenderer renderer;
|
ContentItemXMLRenderer renderer;
|
||||||
String itemIdString;
|
String itemIdString;
|
||||||
Iterator classes = items.keySet().iterator();
|
Iterator classes = items.keySet().iterator();
|
||||||
String className;
|
String className;
|
||||||
|
|
@ -229,7 +229,7 @@ public class ContentList extends AbstractComponent {
|
||||||
itemElement.addAttribute("sortKey", ""+sortKeys.get(item.getID().toString()));
|
itemElement.addAttribute("sortKey", ""+sortKeys.get(item.getID().toString()));
|
||||||
|
|
||||||
|
|
||||||
renderer = new DomainObjectXMLRenderer(itemElement);
|
renderer = new ContentItemXMLRenderer(itemElement);
|
||||||
// not sure these are necessary
|
// not sure these are necessary
|
||||||
renderer.setWrapAttributes(true);
|
renderer.setWrapAttributes(true);
|
||||||
renderer.setWrapRoot(false);
|
renderer.setWrapRoot(false);
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@ import org.apache.log4j.Logger;
|
||||||
import com.arsdigita.cms.CMS;
|
import com.arsdigita.cms.CMS;
|
||||||
import com.arsdigita.cms.ContentBundle;
|
import com.arsdigita.cms.ContentBundle;
|
||||||
import com.arsdigita.cms.ContentItem;
|
import com.arsdigita.cms.ContentItem;
|
||||||
|
import com.arsdigita.cms.ContentItemXMLRenderer;
|
||||||
import com.arsdigita.cms.SecurityManager;
|
import com.arsdigita.cms.SecurityManager;
|
||||||
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
||||||
import com.arsdigita.domain.DomainObjectXMLRenderer;
|
|
||||||
import com.arsdigita.kernel.Kernel;
|
import com.arsdigita.kernel.Kernel;
|
||||||
import com.arsdigita.kernel.Party;
|
import com.arsdigita.kernel.Party;
|
||||||
import com.arsdigita.kernel.permissions.PermissionDescriptor;
|
import com.arsdigita.kernel.permissions.PermissionDescriptor;
|
||||||
|
|
@ -105,8 +105,8 @@ public class GreetingItem extends AbstractComponent {
|
||||||
Element itemEl = content.newChildElement("cms:item",
|
Element itemEl = content.newChildElement("cms:item",
|
||||||
CMS.CMS_XML_NS);
|
CMS.CMS_XML_NS);
|
||||||
|
|
||||||
DomainObjectXMLRenderer renderer =
|
ContentItemXMLRenderer renderer =
|
||||||
new DomainObjectXMLRenderer(itemEl);
|
new ContentItemXMLRenderer(itemEl);
|
||||||
|
|
||||||
renderer.setWrapAttributes( true );
|
renderer.setWrapAttributes( true );
|
||||||
renderer.setWrapRoot( false );
|
renderer.setWrapRoot( false );
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,9 @@ package com.arsdigita.london.navigation.ui;
|
||||||
import com.arsdigita.cms.CMS;
|
import com.arsdigita.cms.CMS;
|
||||||
import com.arsdigita.cms.ContentBundle;
|
import com.arsdigita.cms.ContentBundle;
|
||||||
import com.arsdigita.cms.ContentItem;
|
import com.arsdigita.cms.ContentItem;
|
||||||
|
import com.arsdigita.cms.ContentItemXMLRenderer;
|
||||||
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
|
||||||
import com.arsdigita.domain.DomainObjectXMLRenderer;
|
|
||||||
import com.arsdigita.london.navigation.Navigation;
|
import com.arsdigita.london.navigation.Navigation;
|
||||||
import com.arsdigita.london.navigation.ui.AbstractComponent;
|
|
||||||
import com.arsdigita.xml.Element;
|
import com.arsdigita.xml.Element;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
@ -75,7 +74,7 @@ public class NavigationRootIndexItem extends AbstractComponent {
|
||||||
}
|
}
|
||||||
indexItem = indexItem.getLiveVersion();
|
indexItem = indexItem.getLiveVersion();
|
||||||
Element itemElement = parentElement.newChildElement(TAG_ITEM, CMS.CMS_XML_NS);
|
Element itemElement = parentElement.newChildElement(TAG_ITEM, CMS.CMS_XML_NS);
|
||||||
DomainObjectXMLRenderer renderer = new DomainObjectXMLRenderer(itemElement);
|
ContentItemXMLRenderer renderer = new ContentItemXMLRenderer(itemElement);
|
||||||
// not sure these are necessary
|
// not sure these are necessary
|
||||||
renderer.setWrapAttributes(true);
|
renderer.setWrapAttributes(true);
|
||||||
renderer.setWrapRoot(false);
|
renderer.setWrapRoot(false);
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ import com.arsdigita.persistence.Filter;
|
||||||
import com.arsdigita.persistence.FilterFactory;
|
import com.arsdigita.persistence.FilterFactory;
|
||||||
import com.arsdigita.persistence.SessionManager;
|
import com.arsdigita.persistence.SessionManager;
|
||||||
import com.arsdigita.domain.DomainCollection;
|
import com.arsdigita.domain.DomainCollection;
|
||||||
import com.arsdigita.domain.DomainObjectXMLRenderer;
|
|
||||||
import com.arsdigita.kernel.ACSObject;
|
import com.arsdigita.kernel.ACSObject;
|
||||||
import com.arsdigita.kernel.Kernel;
|
import com.arsdigita.kernel.Kernel;
|
||||||
import com.arsdigita.kernel.Party;
|
import com.arsdigita.kernel.Party;
|
||||||
|
|
@ -43,6 +42,7 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.arsdigita.categorization.Category;
|
import com.arsdigita.categorization.Category;
|
||||||
|
import com.arsdigita.cms.ContentItemXMLRenderer;
|
||||||
|
|
||||||
public class QuickLinks extends AbstractComponent {
|
public class QuickLinks extends AbstractComponent {
|
||||||
|
|
||||||
|
|
@ -94,7 +94,7 @@ public class QuickLinks extends AbstractComponent {
|
||||||
while (links.next()) {
|
while (links.next()) {
|
||||||
Element objEl = Navigation.newElement("quickLink");
|
Element objEl = Navigation.newElement("quickLink");
|
||||||
|
|
||||||
DomainObjectXMLRenderer xr = new DomainObjectXMLRenderer(objEl);
|
ContentItemXMLRenderer xr = new ContentItemXMLRenderer(objEl);
|
||||||
xr.setNamespace(Navigation.NAV_PREFIX,
|
xr.setNamespace(Navigation.NAV_PREFIX,
|
||||||
Navigation.NAV_NS);
|
Navigation.NAV_NS);
|
||||||
xr.setWrapRoot(false);
|
xr.setWrapRoot(false);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue