From a1ce9d37f072a7ea522c88bfb7fb82565e991514 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Fri, 2 Sep 2011 11:46:48 +0000
Subject: [PATCH] When two events are on at exactly the same time, sort the
 first to be created earlier in the list (helps keep order, and makes tests
 simpler)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/calendar/CalendarServiceImpl.java | 2 ++
 .../cannedqueries/GetCalendarEntriesCannedQueryFactory.java  | 2 ++
 source/java/org/alfresco/repo/wiki/WikiServiceImpl.java      | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java b/source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
index 58d391236d..0536ac3eb0 100644
--- a/source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
+++ b/source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
@@ -255,9 +255,11 @@ public class CalendarServiceImpl implements CalendarService
        }
        
        // Build our sorting, by date
+       // Sort by start date, then end date, then created at for two events with matching times 
        List<Pair<QName,Boolean>> sort = new ArrayList<Pair<QName, Boolean>>();
        sort.add(new Pair<QName, Boolean>(CalendarModel.PROP_FROM_DATE, true)); 
        sort.add(new Pair<QName, Boolean>(CalendarModel.PROP_TO_DATE, true));
+       sort.add(new Pair<QName, Boolean>(ContentModel.PROP_CREATED, true)); 
        
        // We only want calendar entries
        Set<QName> types = new HashSet<QName>();
diff --git a/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java b/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
index 640867d776..db643ff083 100644
--- a/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
+++ b/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
@@ -124,9 +124,11 @@ public class GetCalendarEntriesCannedQueryFactory extends AbstractQNameAwareCann
     
     protected CannedQuerySortDetails createCQSortDetails()
     {
+        // Sort by start date, then end date, then created at for two events with matching times 
         List<Pair<? extends Object,SortOrder>> sort = new ArrayList<Pair<? extends Object, SortOrder>>();
         sort.add(new Pair<QName, SortOrder>(CalendarModel.PROP_FROM_DATE, SortOrder.ASCENDING)); 
         sort.add(new Pair<QName, SortOrder>(CalendarModel.PROP_TO_DATE, SortOrder.ASCENDING));
+        sort.add(new Pair<QName, SortOrder>(ContentModel.PROP_CREATED, SortOrder.ASCENDING));
         
         return new CannedQuerySortDetails(sort);
     }
diff --git a/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java b/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
index 07dbe97d2f..9b5036f37d 100644
--- a/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
+++ b/source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
@@ -134,7 +134,10 @@ public class WikiServiceImpl implements WikiService
              siteService, transactionService, taggingService);
     }
     
-    private String buildName(String title)
+    /**
+     * Turns a Title into a Page Name.
+     */
+    private static String buildName(String title)
     {
        // The name is based on the title, but with underscores
        String name = title.replace(' ', '_');