mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323 12826: Fix for ETHREEOH-37 and ETHREEOH-176. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -37,6 +37,8 @@ import org.alfresco.service.cmr.repository.ContentData;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.version.Version;
|
||||
import org.alfresco.service.cmr.version.VersionType;
|
||||
import org.alfresco.service.namespace.NamespacePrefixResolver;
|
||||
import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.namespace.QNameMap;
|
||||
import org.alfresco.util.URLEncoder;
|
||||
@@ -47,7 +49,7 @@ import org.alfresco.util.URLEncoder;
|
||||
*
|
||||
* @author Kevin Roast
|
||||
*/
|
||||
public class VersionHistoryNode extends BaseContentNode
|
||||
public class VersionHistoryNode extends BaseContentNode implements NamespacePrefixResolverProvider
|
||||
{
|
||||
private QNameMap<String, Serializable> properties;
|
||||
private boolean propsRetrieved = false;
|
||||
@@ -77,7 +79,7 @@ public class VersionHistoryNode extends BaseContentNode
|
||||
this.version = version;
|
||||
this.parent = parent;
|
||||
this.services = services;
|
||||
this.properties = new QNameMap<String, Serializable>(parent.services.getNamespaceService());
|
||||
this.properties = new QNameMap<String, Serializable>(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -264,6 +266,12 @@ public class VersionHistoryNode extends BaseContentNode
|
||||
}
|
||||
|
||||
|
||||
public NamespacePrefixResolver getNamespacePrefixResolver()
|
||||
{
|
||||
return this.services.getNamespaceService();
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Content API
|
||||
|
||||
|
Reference in New Issue
Block a user