mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merging BRANCHES/DEV/CMIS_10 to HEAD (phase 2 - currently up-to-date with branch):
18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently 18731: SAIL-169: CMIS REST versioning compliance 18732: Fix failing change log test. 18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding). 18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding). 18784: Fix CMIS REST change logging 18785: SAIL-174: CMIS Relationship lookup by association ID 18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings 18823: CMIS WS Bindings were moved to 1.0 cd07 schema. 18838: Update to latest Chemistry TCK. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -15,11 +15,11 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.cmis.changelog;
|
||||
@@ -37,22 +37,30 @@ import org.alfresco.service.cmr.repository.NodeRef;
|
||||
*/
|
||||
public class CMISChangeEventImpl implements CMISChangeEvent
|
||||
{
|
||||
private NodeRef node;
|
||||
private CMISChangeType changeType;
|
||||
private Date changeTime;
|
||||
private NodeRef changedNode;
|
||||
private String objectId;
|
||||
|
||||
|
||||
/**
|
||||
* Construct a CMISChangeEvent using fields
|
||||
* Instantiates a new CMIS change event.
|
||||
*
|
||||
* @param changeType change type
|
||||
* @param node node reference
|
||||
* @param changeTime change time
|
||||
* @param changeType
|
||||
* the change type
|
||||
* @param changeTime
|
||||
* the change time
|
||||
* @param changedNode
|
||||
* the changed node
|
||||
* @param objectId
|
||||
* the object id
|
||||
*/
|
||||
public CMISChangeEventImpl(CMISChangeType changeType, NodeRef node, Date changeTime)
|
||||
public CMISChangeEventImpl(CMISChangeType changeType, Date changeTime, NodeRef changedNode, String objectId)
|
||||
{
|
||||
this.changeType = changeType;
|
||||
this.node = node;
|
||||
this.changeTime = changeTime;
|
||||
this.changedNode = changedNode;
|
||||
this.objectId = objectId;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,14 +71,6 @@ public class CMISChangeEventImpl implements CMISChangeEvent
|
||||
return changeType;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.cmis.CMISChangeEvent#getNode()
|
||||
*/
|
||||
public NodeRef getNode()
|
||||
{
|
||||
return node;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.cmis.CMISChangeEvent#getChangeTime()
|
||||
*/
|
||||
@@ -79,6 +79,23 @@ public class CMISChangeEventImpl implements CMISChangeEvent
|
||||
return changeTime;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @see org.alfresco.cmis.CMISChangeEvent#getChangedNode()
|
||||
*/
|
||||
public NodeRef getChangedNode()
|
||||
{
|
||||
return changedNode;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.cmis.CMISChangeEvent#getObjectId()
|
||||
*/
|
||||
public String getObjectId()
|
||||
{
|
||||
return objectId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see java.lang.Object#equals(java.lang.Object)
|
||||
*/
|
||||
@@ -90,7 +107,7 @@ public class CMISChangeEventImpl implements CMISChangeEvent
|
||||
return false;
|
||||
}
|
||||
CMISChangeEvent converted = (CMISChangeEvent) obj;
|
||||
return same(node, converted.getNode()) && same(changeType, converted.getChangeType()) && same(changeTime, converted.getChangeTime());
|
||||
return same(changedNode, converted.getChangedNode()) && same(changeType, converted.getChangeType()) && same(changeTime, converted.getChangeTime());
|
||||
}
|
||||
|
||||
private boolean same(Object left, Object right)
|
||||
@@ -104,7 +121,7 @@ public class CMISChangeEventImpl implements CMISChangeEvent
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
int result = (null != node) ? (node.hashCode()) : (31);
|
||||
int result = (null != changedNode) ? (changedNode.hashCode()) : (31);
|
||||
return result * 37 + (null != changeType ? changeType.hashCode() : 31) + (null != changeTime ? changeTime.hashCode() : 31);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user