Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent 91eb2644ad
commit 12769c2923
830 changed files with 142534 additions and 142534 deletions

View File

@@ -1,45 +1,45 @@
package org.alfresco.repo.transfer;
import org.alfresco.service.cmr.transfer.TransferVersion;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* This is an implementation of TransferVersionChecker.
*
* It allows transfer to the same edition/major/minor but ignores revision.
*/
public class TransferVersionCheckerImpl implements TransferVersionChecker
{
private static Log logger = LogFactory.getLog(TransferVersionCheckerImpl.class);
public boolean checkTransferVersions(TransferVersion from, TransferVersion to)
{
logger.debug("checkTransferVersions from:" + from + ", to:" + to);
if(from == null || to == null || to.getEdition() == null || to.getVersionMajor() == null || to.getVersionMinor() == null)
{
return false;
}
if(!from.getEdition().equalsIgnoreCase(to.getEdition()))
{
return false;
}
if(!from.getVersionMajor().equalsIgnoreCase(to.getVersionMajor()))
{
return false;
}
if(!from.getVersionMinor().equalsIgnoreCase(to.getVersionMinor()))
{
return false;
}
// ignore revisions
return true;
}
}
package org.alfresco.repo.transfer;
import org.alfresco.service.cmr.transfer.TransferVersion;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* This is an implementation of TransferVersionChecker.
*
* It allows transfer to the same edition/major/minor but ignores revision.
*/
public class TransferVersionCheckerImpl implements TransferVersionChecker
{
private static Log logger = LogFactory.getLog(TransferVersionCheckerImpl.class);
public boolean checkTransferVersions(TransferVersion from, TransferVersion to)
{
logger.debug("checkTransferVersions from:" + from + ", to:" + to);
if(from == null || to == null || to.getEdition() == null || to.getVersionMajor() == null || to.getVersionMinor() == null)
{
return false;
}
if(!from.getEdition().equalsIgnoreCase(to.getEdition()))
{
return false;
}
if(!from.getVersionMajor().equalsIgnoreCase(to.getVersionMajor()))
{
return false;
}
if(!from.getVersionMinor().equalsIgnoreCase(to.getVersionMinor()))
{
return false;
}
// ignore revisions
return true;
}
}