inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Big hunk of merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-06-28 17:31:18 +00:00
parent b55958b062
commit 7d940d08e1
35 changed files with 491 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/importer/view/MetaDataContext.java
View File

@@ -80,4 +80,15 @@ public class MetaDataContext extends ElementContext
return properties;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
public String toString()
{
return "MetaDataContext[properties=" + properties.size() + "]";
}
}

11
source/java/org/alfresco/repo/importer/view/NodeItemContext.java
View File

@@ -49,4 +49,15 @@ public class NodeItemContext extends ElementContext
{
return nodeContext;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
public String toString()
{
return "NodeItemContext[nodeContext=" + nodeContext.toString() + "]";
}
}

12
source/java/org/alfresco/repo/importer/view/ViewParser.java
View File

@@ -197,7 +197,11 @@ public class ViewParser implements Parser
// Handle special view directives
if (defName.equals(VIEW_METADATA))
{
parserContext.elementStack.push(new MetaDataContext(defName, (ElementContext)element));
MetaDataContext metaDataContext = new MetaDataContext(defName, (ElementContext)element);
parserContext.elementStack.push(metaDataContext);
if (logger.isDebugEnabled())
logger.debug(indentLog("Pushed " + metaDataContext, parserContext.elementStack.size() -1));
}
else if (defName.equals(VIEW_ASPECTS) || defName.equals(VIEW_PROPERTIES) || defName.equals(VIEW_ASSOCIATIONS) || defName.equals(VIEW_ACL))
{
@@ -210,7 +214,11 @@ public class ViewParser implements Parser
throw new ImporterException("Element " + defName + " can only be declared within a node");
}
NodeContext node = (NodeContext)element;
parserContext.elementStack.push(new NodeItemContext(defName, node));
NodeItemContext nodeItemContext = new NodeItemContext(defName, node);
parserContext.elementStack.push(nodeItemContext);
if (logger.isDebugEnabled())
logger.debug(indentLog("Pushed " + nodeItemContext, parserContext.elementStack.size() -1));
// process ACL specific attributes
if (defName.equals(VIEW_ACL))