Sort contacts alphabetically by name

jezhiggins · jezhiggins · commit f13ade9417f2 · 2011-07-05T10:55:37.000+01:00
diff --git a/src/net/cyclestreets/contacts/Contact.java b/src/net/cyclestreets/contacts/Contact.java
@@ -1,5 +1,7 @@
 package net.cyclestreets.contacts;
 
+import java.util.Comparator;
+
 public class Contact 
 {
 	private final String name_;
@@ -22,10 +24,33 @@ public Contact(final String name,
 		postcode_ = postcode;
 	} // Contact
 	
+	public String name() { return name_; }
 	public String address() { return address_; }
 	public String neighbourhood() { return neighbourhood_; }
 	public String city() { return city_; }
 	public String postcode() { return postcode_; }
 	
 	public String toString() { return name_; }
+	
+	static public Comparator<Contact> comparator()
+	{
+		return ContactsComparator.instance();
+	} // Comparator
+	
+	static private class ContactsComparator implements Comparator<Contact>
+	{
+		static private ContactsComparator instance_;
+		static public ContactsComparator instance() 
+		{ 
+			if(instance_ == null)
+				instance_ = new ContactsComparator();
+			return instance_;
+		} // instance
+
+		@Override
+		public int compare(final Contact lhs, final Contact rhs) 
+		{
+			return lhs.name().compareToIgnoreCase(rhs.name());
+		} // compare
+	} // class ContactsComparator
 } // class Contact
diff --git a/src/net/cyclestreets/contacts/ContactsEclair.java b/src/net/cyclestreets/contacts/ContactsEclair.java
@@ -1,6 +1,7 @@
 package net.cyclestreets.contacts;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import android.content.Context;
@@ -69,6 +70,8 @@ static public List<Contact> fetch(final Context context)
 			addrCur.close();
 		} // finally
 		
+		Collections.sort(contacts, Contact.comparator());
+		
 		return contacts;
 	} // queryContacts
 	
