diff --git a/source/java/org/alfresco/service/cmr/view/Exporter.java b/source/java/org/alfresco/service/cmr/view/Exporter.java index a9da31d6b2..24fd90985a 100644 --- a/source/java/org/alfresco/service/cmr/view/Exporter.java +++ b/source/java/org/alfresco/service/cmr/view/Exporter.java @@ -17,6 +17,7 @@ package org.alfresco.service.cmr.view; import java.io.InputStream; +import java.util.Collection; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; @@ -162,14 +163,6 @@ public interface Exporter */ public void endProperties(NodeRef nodeRef); - /** - * Export start of value collection - * - * @param nodeRef the node reference - * @param property the property name - */ - public void startValueCollection(NodeRef nodeRef, QName property); - /** * Export single valued property * @@ -180,15 +173,16 @@ public interface Exporter public void value(NodeRef nodeRef, QName property, Object value); /** - * Export end of value collection + * Export multi valued property * * @param nodeRef the node reference * @param property the property name + * @param value the value */ - public void endValueCollection(NodeRef nodeRef, QName property); + public void value(NodeRef nodeRef, QName property, Collection values); /** - * Export content stream property + * Export content stream * * @param nodeRef the node reference * @param property the property name diff --git a/source/java/org/alfresco/tools/Export.java b/source/java/org/alfresco/tools/Export.java index 721c3a699b..61a74b4419 100644 --- a/source/java/org/alfresco/tools/Export.java +++ b/source/java/org/alfresco/tools/Export.java @@ -18,9 +18,10 @@ package org.alfresco.tools; import java.io.File; import java.io.InputStream; +import java.util.Collection; -import org.alfresco.repo.exporter.ACPExportPackageHandler; import org.alfresco.repo.exporter.FileExportPackageHandler; +import org.alfresco.repo.exporter.ACPExportPackageHandler; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NodeRef; @@ -238,7 +239,6 @@ public final class Export extends Tool } catch(ExporterException e) { - e.printStackTrace(); throw new ToolException("Failed to export", e); } } @@ -552,23 +552,16 @@ public final class Export extends Tool } /* (non-Javadoc) - * @see org.alfresco.service.cmr.view.Exporter#startValueCollection(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName) + * @see org.alfresco.service.cmr.view.Exporter#value(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, java.io.Serializable) */ - public void startValueCollection(NodeRef nodeRef, QName property) + public void value(NodeRef nodeRef, QName property, Object value) { } /* (non-Javadoc) - * @see org.alfresco.service.cmr.view.Exporter#endValueCollection(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName) + * @see org.alfresco.service.cmr.view.Exporter#value(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, java.util.Collection) */ - public void endValueCollection(NodeRef nodeRef, QName property) - { - } - - /* (non-Javadoc) - * @see org.alfresco.service.cmr.view.Exporter#value(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, java.io.Serializable) - */ - public void value(NodeRef nodeRef, QName property, Object value) + public void value(NodeRef nodeRef, QName property, Collection values) { } @@ -634,7 +627,10 @@ public final class Export extends Tool */ public void endReference(NodeRef nodeRef) { + // TODO Auto-generated method stub + } + } }