Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

104506: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104357: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104292: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104235: MNT-13951 : Please use LinkedHashMap in EnumParameterConstraint.java to take control on selectone.ftl's dropdown list options order
               - Changed collection type from HashMap to LinkedHashMap.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-20 12:00:11 +00:00
parent 5cdfb8b2f7
commit 681ff6b9c4
6 changed files with 12 additions and 13 deletions

View File

@@ -21,7 +21,7 @@ package org.alfresco.repo.action.constraint;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -130,7 +130,7 @@ public class FolderContentsParameterConstraint extends BaseParameterConstraint
rootFolder = nodeRefs.get(0);
}
Map<String, String> result = new HashMap<String, String>(23);
Map<String, String> result = new LinkedHashMap<String, String>(23);
buildMap(result, rootFolder);
return result;
}