commit 97f9a162b7632481988bf8639b83f37dcb42b586
author Dmitri Plotnikov <dplotnikov@google.com> Fri Aug 21 16:25:42 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Fri Aug 21 16:25:42 2009 -0700
tree 85740c2d23552dd2fcedc9cd09e6bcba01fcf216
parent 0126458fabecb6514bf6d368ae6a066a78856a91

Syntax: just moved a constants out of method bodies.

@jham: I understood the meaning of your comment in the previous CL
only after I submitted it.

src/com/android/providers/contacts/LegacyApiSupport.java

diff --git a/src/com/android/providers/contacts/LegacyApiSupport.java b/src/com/android/providers/contacts/LegacyApiSupport.java
index 4a94a6e..053528e 100644
--- a/src/com/android/providers/contacts/LegacyApiSupport.java
+++ b/src/com/android/providers/contacts/LegacyApiSupport.java
@@ -143,6 +143,22 @@
                         + " END)"
                 + " END) AS INTEGER)";
 
+    private static final String IM_PROTOCOL_SQL =
+            "(CASE WHEN " + Presence.PROTOCOL + "=" + Im.PROTOCOL_CUSTOM
+                + " THEN 'custom:'||" + Presence.CUSTOM_PROTOCOL
+                + " ELSE 'pre:'||" + Presence.PROTOCOL
+                + " END)";
+
+    private static String CONTACT_METHOD_DATA_SQL =
+            "(CASE WHEN " + Data.MIMETYPE + "='" + Im.CONTENT_ITEM_TYPE + "'"
+                + " THEN (CASE WHEN " + Tables.DATA + "." + Im.PROTOCOL + "=" + Im.PROTOCOL_CUSTOM
+                    + " THEN 'custom:'||" + Tables.DATA + "." + Im.CUSTOM_PROTOCOL
+                    + " ELSE 'pre:'||" + Tables.DATA + "." + Im.PROTOCOL
+                    + " END)"
+                + " ELSE " + DataColumns.CONCRETE_DATA2
+                + " END)";
+
+
     public interface LegacyTables {
         public static final String PEOPLE = "view_v1_people";
         public static final String PEOPLE_JOIN_PRESENCE = "view_v1_people" + PRESENCE_JOINS;
@@ -305,12 +321,6 @@
         peopleProjectionMap.put(People.SEND_TO_VOICEMAIL, People.SEND_TO_VOICEMAIL);
         peopleProjectionMap.put(People.STARRED, People.STARRED);
 
-        String IM_PROTOCOL_SQL =
-                "(CASE WHEN " + Presence.PROTOCOL + "=" + Im.PROTOCOL_CUSTOM
-                    + " THEN 'custom:'||" + Presence.CUSTOM_PROTOCOL
-                    + " ELSE 'pre:'||" + Presence.PROTOCOL
-                    + " END)";
-
         sPeopleProjectionMap = new HashMap<String, String>(peopleProjectionMap);
         sPeopleProjectionMap.put(People._ID, People._ID);
         sPeopleProjectionMap.put(People.PRIMARY_ORGANIZATION_ID, People.PRIMARY_ORGANIZATION_ID);
@@ -526,14 +536,6 @@
                         + " AND " + RawContacts.IS_RESTRICTED + "=0" +
         ";");
 
-        String DATA_SQL = "(CASE WHEN " + Data.MIMETYPE + "='" + Im.CONTENT_ITEM_TYPE + "'"
-                + " THEN (CASE WHEN " + Tables.DATA + "." + Im.PROTOCOL + "=" + Im.PROTOCOL_CUSTOM
-                        + " THEN 'custom:'||" + Tables.DATA + "." + Im.CUSTOM_PROTOCOL
-                        + " ELSE 'pre:'||" + Tables.DATA + "." + Im.PROTOCOL
-                        + " END)"
-                + " ELSE " + DataColumns.CONCRETE_DATA2
-                + " END)";
-
         db.execSQL("DROP VIEW IF EXISTS " + LegacyTables.CONTACT_METHODS + ";");
         db.execSQL("CREATE VIEW " + LegacyTables.CONTACT_METHODS + " AS SELECT " +
                 DataColumns.CONCRETE_ID
@@ -546,7 +548,7 @@
                         + " AS " + ContactMethods.ISPRIMARY + ", " +
                 DataColumns.CONCRETE_DATA1
                         + " AS " + ContactMethods.TYPE + ", " +
-                DATA_SQL
+                CONTACT_METHOD_DATA_SQL
                         + " AS " + ContactMethods.DATA + ", " +
                 DataColumns.CONCRETE_DATA3
                         + " AS " + ContactMethods.LABEL + ", " +