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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions

View File

@@ -1,49 +1,49 @@
package org.alfresco.repo.site;
import java.util.Comparator;
import java.util.Map;
/* package scope */class RoleComparatorImpl implements Comparator<String>
{
private Map<String, Integer> rolePrecedence;
public RoleComparatorImpl()
{
}
public RoleComparatorImpl(Map<String, Integer> rolePrecedence)
{
this.setRolePrecedence(rolePrecedence);
}
public int compare(String first, String second)
{
int firstRank = 0;
int secondRank = 0;
if (getRolePrecedence().containsKey(first))
{
firstRank = getRolePrecedence().get(first);
}
if (getRolePrecedence().containsKey(second))
{
secondRank = getRolePrecedence().get(second);
}
return secondRank > firstRank ? 1 : secondRank < firstRank ? -1 : 0;
}
public void init()
{
}
public void setRolePrecedence(Map<String, Integer> rolePrecedence)
{
this.rolePrecedence = rolePrecedence;
}
public Map<String, Integer> getRolePrecedence()
{
return rolePrecedence;
}
}
package org.alfresco.repo.site;
import java.util.Comparator;
import java.util.Map;
/* package scope */class RoleComparatorImpl implements Comparator<String>
{
private Map<String, Integer> rolePrecedence;
public RoleComparatorImpl()
{
}
public RoleComparatorImpl(Map<String, Integer> rolePrecedence)
{
this.setRolePrecedence(rolePrecedence);
}
public int compare(String first, String second)
{
int firstRank = 0;
int secondRank = 0;
if (getRolePrecedence().containsKey(first))
{
firstRank = getRolePrecedence().get(first);
}
if (getRolePrecedence().containsKey(second))
{
secondRank = getRolePrecedence().get(second);
}
return secondRank > firstRank ? 1 : secondRank < firstRank ? -1 : 0;
}
public void init()
{
}
public void setRolePrecedence(Map<String, Integer> rolePrecedence)
{
this.rolePrecedence = rolePrecedence;
}
public Map<String, Integer> getRolePrecedence()
{
return rolePrecedence;
}
}