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

Kommentare hinzugefüg 

t

git-svn-id: https://svn.libreccm.org/ccm/trunk@327 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2010-01-15 10:37:35 +00:00
parent 4f9b5435cc
commit 44b1b54e86
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-core/src/com/arsdigita/domain/DomainObjectTraversal.java
View File

@ -253,6 +253,13 @@ public abstract class DomainObjectTraversal {
walk(adapter, obj, "/object", context, null); walk(adapter, obj, "/object", context, null);
} }
// Changed from private to protected because I needed to have access to
// the class ContentBundle from package com.arsdigita.cms. The problem was
// to change RelatedLinks and therefore Link to always link to the corresponding
// ContentBundle instead of the content item. To get the corresponding
// content item during XML generation, I have to test for ContentBundle and
// negotiate the language version. This is not possible in com.arsdigita.ccm.
protected void walk(final DomainObjectTraversalAdapter adapter, protected void walk(final DomainObjectTraversalAdapter adapter,
final DomainObject obj, final DomainObject obj,
final String path, final String path,
@ -272,6 +279,7 @@ public abstract class DomainObjectTraversal {
m_visited.add(visitedKey); m_visited.add(visitedKey);
} }
// If needed, open a surrounding tag
beginObject(obj, path); beginObject(obj, path);
if (linkObject != null) { if (linkObject != null) {
@ -286,6 +294,7 @@ public abstract class DomainObjectTraversal {
ObjectType type = obj.getObjectType(); ObjectType type = obj.getObjectType();
// Test all properties against the traversal xml
for (Iterator i = type.getProperties(); i.hasNext(); ) { for (Iterator i = type.getProperties(); i.hasNext(); ) {
Property prop = (Property) i.next(); Property prop = (Property) i.next();
String propName = prop.getName(); String propName = prop.getName();
@ -314,6 +323,8 @@ public abstract class DomainObjectTraversal {
if (prop.isAttribute()) { if (prop.isAttribute()) {
handleAttribute(obj, path, prop); handleAttribute(obj, path, prop);
// Property is a DataObject, so start recursion
} else if (propValue instanceof DataObject) { } else if (propValue instanceof DataObject) {
if( s_log.isDebugEnabled() ) { if( s_log.isDebugEnabled() ) {
s_log.debug( prop.getName() + " is a DataObject" ); s_log.debug( prop.getName() + " is a DataObject" );
@ -387,6 +398,7 @@ public abstract class DomainObjectTraversal {
} }
} }
// If needed, close a surrounding tag
endObject(obj, path); endObject(obj, path);
} }