System Repinned for Case Insensitive Comparator fix

cmsWebApp/src/performa/utils/Utils.java

@@ -103,7 +103,7 @@ public class Utils
     public static List<Job> getJobsSorted(Job[] jobs, JobSortOption jobSortOption, JobStatus jobStatus)
     {
         ObjectTransform transform   =   Job.pipesJob().toObjectCreated();
-        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR;
+        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST;
         
         if(jobSortOption == JobSortOption.OLDEST || jobSortOption == JobSortOption.NEWEST)
         {
@@ -121,8 +121,8 @@ public class Utils
             }
             
             comparator  =   jobSortOption == JobSortOption.OLDEST  ? 
-                                CollectionUtils.DEFAULT_COMPARATOR : 
-                                CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR);
+                                CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST : 
+                                CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST);
         }
         else if(jobSortOption == JobSortOption.CLOSING_SOON)
         {
@@ -132,12 +132,12 @@ public class Utils
         else if(jobSortOption == JobSortOption.ALPHA_A_Z)
         {
             transform   =   Job.pipesJob().toJobTitle();
-            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR;
+            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST;
         }
         else if(jobSortOption == JobSortOption.ALPHA_Z_A)
         {
             transform   =   Job.pipesJob().toJobTitle();
-            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR);
+            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST);
         }
         
         return ObjstoreUtils.sort( Arrays.asList(jobs), 
@@ -149,27 +149,27 @@ public class Utils
     public static List<Client> getClientsSorted(Client[] clients, ClientSortOption clientSortOption)
     {
         ObjectTransform transform   =   Client.pipesClient().toObjectCreated();
-        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR;
+        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST;
         
         if(clientSortOption == ClientSortOption.ALPHA_A_Z)
         {
             transform   =   Client.pipesClient().toClientName();
-            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR;
+            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST;
         }
         else if(clientSortOption == ClientSortOption.ALPHA_Z_A)
         {
             transform   =   Client.pipesClient().toClientName();
-            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR);
+            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST);
         }
         else if(clientSortOption == ClientSortOption.OPEN_JOBS)
         {
             transform   =   new ClientJobCountTransform(JobStatus.OPEN);
-            comparator  =   CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR);
+            comparator  =   CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST);
         }
         else if(clientSortOption == ClientSortOption.FILLED_JOBS)
         {
             transform   =   new ClientJobCountTransform(JobStatus.FILLED);
-            comparator  =   CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR);
+            comparator  =   CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST);
         }
         
         return ObjstoreUtils.sort( Arrays.asList(clients), new ObjectTransform[]{transform}, new Comparator[]{comparator});
@@ -216,7 +216,7 @@ public class Utils
     public static List<JobApplication> getApplicationsSorted(JobApplication[] applications, AppSortOption appSortOption)
     {
         ObjectTransform transform   =   JobApplication.pipesJobApplication().toObjectCreated();
-        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR;
+        Comparator      comparator  =   CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST;
         
         if(appSortOption==AppSortOption.OLDEST)
         {
@@ -236,12 +236,12 @@ public class Utils
         else if(appSortOption==AppSortOption.ALPHA_A_Z)
         {
             transform   =   JobApplication.pipesJobApplication().toCandidate().toUser().toFirstName();
-            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR;
+            comparator  =   CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST;
         }
         else if(appSortOption==AppSortOption.ALPHA_Z_A)
         {
             transform   =   JobApplication.pipesJobApplication().toCandidate().toUser().toFirstName();
-            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR);
+            comparator  =   CollectionUtils.reverse(CollectionUtils.CASE_INSENSITIVE_COMPARATOR_NULLS_FIRST);
         }
         
         return ObjstoreUtils.sort( Arrays.asList(applications), 

system.xml

@@ -4,7 +4,7 @@
 <SYSTEM name="PerformaInvestments" targetDir="C:/build/PerformaInvestments" executor="testMainApp">
 
     <WEBAPP name="cmsWebApp" relative-path="cmsWebApp" deployment="cms">
-        <OVERLAY system="CougarCMS8.2" subsystem="cmsWebApp" pin="3c1d38dc38c69786b3a4a45553f309aa57cd2836"/>
+        <OVERLAY system="CougarCMS8.2" subsystem="cmsWebApp" pin="2bb1972b665029a5167e3d25f5197c79c206a899"/>
     </WEBAPP>
 
     <PARAMETER name="key.file"/>