inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffleInstance.java
View File

@@ -181,15 +181,18 @@ public class ScenarioCreateDeleteRenameShuffleInstance implements ScenarioInstan
{
boolean isRightTarget = false;
int i = deleteName.lastIndexOf('.');
int j = createName.lastIndexOf('.');
if (i > 0)
{
String extension = deleteName.substring(i+1,deleteName.length());
if (extension.startsWith("ppt"))
String deleteExt = deleteName.substring(i + 1, deleteName.length());
String createExt = (j > 0) ? createName.substring(j + 1, createName.length()) : "";
if (deleteExt.startsWith("ppt") && createExt.startsWith("ppt"))
{
isRightTarget = (i < createName.length()) && deleteName.substring(0, i).equalsIgnoreCase(createName.substring(0,i));
isRightTarget = (i < createName.length()) && deleteName.substring(0, i).equalsIgnoreCase(createName.substring(0, i));
}
else if (extension.startsWith("xls"))
else if (deleteExt.startsWith("xls") && createExt.isEmpty())
{
isRightTarget = !deleteName.startsWith("._") && !deleteName.startsWith("~$");
}