From 975b65d9bdb056b2e910a0fe3fa95271e30d9c51 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 10 Jan 2014 12:57:20 -0800
Subject: [PATCH] Bug 958189 - Rename ListManager to PanelManager. r=liuche

--HG--
rename : mobile/android/base/home/ListManager.java => mobile/android/base/home/PanelManager.java
---
 .../base/home/HomeConfigPrefsBackend.java     |  1 -
 .../{ListManager.java => PanelManager.java}   | 24 +++++++++----------
 mobile/android/base/moz.build                 |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)
 rename mobile/android/base/home/{ListManager.java => PanelManager.java} (75%)

diff --git a/mobile/android/base/home/HomeConfigPrefsBackend.java b/mobile/android/base/home/HomeConfigPrefsBackend.java
index d62b67c0e6f..2f3862fa841 100644
--- a/mobile/android/base/home/HomeConfigPrefsBackend.java
+++ b/mobile/android/base/home/HomeConfigPrefsBackend.java
@@ -10,7 +10,6 @@ import org.mozilla.gecko.home.HomeConfig.HomeConfigBackend;
 import org.mozilla.gecko.home.HomeConfig.OnChangeListener;
 import org.mozilla.gecko.home.HomeConfig.PageEntry;
 import org.mozilla.gecko.home.HomeConfig.PageType;
-import org.mozilla.gecko.home.ListManager.ListInfo;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 
diff --git a/mobile/android/base/home/ListManager.java b/mobile/android/base/home/PanelManager.java
similarity index 75%
rename from mobile/android/base/home/ListManager.java
rename to mobile/android/base/home/PanelManager.java
index bb1af8b5f8b..e4e61adc60a 100644
--- a/mobile/android/base/home/ListManager.java
+++ b/mobile/android/base/home/PanelManager.java
@@ -21,14 +21,14 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ListManager implements GeckoEventListener {
-    private static final String LOGTAG = "GeckoListManager";
+public class PanelManager implements GeckoEventListener {
+    private static final String LOGTAG = "GeckoPanelManager";
 
-    public class ListInfo {
+    public class PanelInfo {
         public final String id;
         public final String title;
 
-        public ListInfo(String id, String title) {
+        public PanelInfo(String id, String title) {
             this.id = id;
             this.title = title;
         }
@@ -36,7 +36,7 @@ public class ListManager implements GeckoEventListener {
 
     private final Context mContext;
 
-    public ListManager(Context context) {
+    public PanelManager(Context context) {
         mContext = context;
 
         // Add a listener to handle any new lists that are added after the lists have been loaded.
@@ -46,10 +46,10 @@ public class ListManager implements GeckoEventListener {
     /**
      * Reads list info from SharedPreferences. Don't call this on the main thread!
      *
-     * @return List<ListInfo> A list of ListInfos for each registered list.
+     * @return List<PanelInfo> A list of PanelInfos for each registered list.
      */
-    public List<ListInfo> getListInfos() {
-        final ArrayList<ListInfo> listInfos = new ArrayList<ListInfo>();
+    public List<PanelInfo> getPanelInfos() {
+        final ArrayList<PanelInfo> panelInfos = new ArrayList<PanelInfo>();
 
         // XXX: We need to use PreferenceManager right now because that's what SharedPreferences.jsm uses (see bug 940575)
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
@@ -60,14 +60,14 @@ public class ListManager implements GeckoEventListener {
                 final JSONArray lists = new JSONArray(prefValue);
                 for (int i = 0; i < lists.length(); i++) {
                     final JSONObject list = lists.getJSONObject(i);
-                    final ListInfo info = new ListInfo(list.getString("id"), list.getString("title"));
-                    listInfos.add(info);
+                    final PanelInfo info = new PanelInfo(list.getString("id"), list.getString("title"));
+                    panelInfos.add(info);
                 }
             } catch (JSONException e) {
                 Log.e(LOGTAG, "Exception getting list info", e);
             }
         }
-        return listInfos;
+        return panelInfos;
     }
 
     /**
@@ -76,7 +76,7 @@ public class ListManager implements GeckoEventListener {
     @Override
     public void handleMessage(String event, JSONObject message) {
         try {
-            final ListInfo info = new ListInfo(message.getString("id"), message.getString("title"));
+            final PanelInfo info = new PanelInfo(message.getString("id"), message.getString("title"));
 
             // Do something to update the set of list pages.
 
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 0cc5d1e4846..abb90d13191 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -222,10 +222,10 @@ gbjar.sources += [
     'home/HomePager.java',
     'home/HomePagerTabStrip.java',
     'home/LastTabsPage.java',
-    'home/ListManager.java',
     'home/ListPage.java',
     'home/MostRecentPage.java',
     'home/MultiTypeCursorAdapter.java',
+    'home/PanelManager.java',
     'home/PinSiteDialog.java',
     'home/ReadingListPage.java',
     'home/SearchEngine.java',