wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 773268 - Rename variables in Tabs.java to have the m prefix. r=bnicholson

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-07-13 14:58:42 -04:00
parent b7e10925fa
commit 44b0035871
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
mobile/android/base/Tabs.java
View File

@ -23,15 +23,15 @@ import android.widget.Toast;
public class Tabs implements GeckoEventListener {
private static final String LOGTAG = "GeckoTabs";
private Tab selectedTab;
private HashMap<Integer, Tab> tabs;
private ArrayList<Tab> order;
private ContentResolver resolver;
private boolean mRestoringSession = false;
private Tab mSelectedTab;
private HashMap<Integer, Tab> mTabs;
private ArrayList<Tab> mOrder;
private ContentResolver mResolver;
private boolean mRestoringSession;
private Tabs() {
tabs = new HashMap<Integer, Tab>();
order = new ArrayList<Tab>();
mTabs = new HashMap<Integer, Tab>();
mOrder = new ArrayList<Tab>();
GeckoAppShell.registerGeckoEventListener("SessionHistory:New", this);
GeckoAppShell.registerGeckoEventListener("SessionHistory:Back", this);
GeckoAppShell.registerGeckoEventListener("SessionHistory:Forward", this);
@ -47,13 +47,13 @@ public class Tabs implements GeckoEventListener {
}
public int getCount() {
return tabs.size();
return mTabs.size();
}
public Tab addTab(JSONObject params) throws JSONException {
int id = params.getInt("tabID");
if (tabs.containsKey(id))
return tabs.get(id);
if (mTabs.containsKey(id))
return mTabs.get(id);
// null strings return "null" (http://code.google.com/p/android/issues/detail?id=13830)
String url = params.isNull("uri") ? null : params.getString("uri");
@ -62,8 +62,8 @@ public class Tabs implements GeckoEventListener {
String title = params.getString("title");
final Tab tab = new Tab(id, url, external, parentId, title);
tabs.put(id, tab);
order.add(tab);
mTabs.put(id, tab);
mOrder.add(tab);
if (!mRestoringSession) {
GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
@ -78,27 +78,27 @@ public class Tabs implements GeckoEventListener {
}
public void removeTab(int id) {
if (tabs.containsKey(id)) {
if (mTabs.containsKey(id)) {
Tab tab = getTab(id);
order.remove(tab);
tabs.remove(id);
mOrder.remove(tab);
mTabs.remove(id);
tab.freeBuffer();
Log.i(LOGTAG, "Removed a tab with id: " + id);
}
}
public Tab selectTab(int id) {
if (!tabs.containsKey(id))
if (!mTabs.containsKey(id))
return null;
final Tab oldTab = getSelectedTab();
final Tab tab = tabs.get(id);
final Tab tab = mTabs.get(id);
// This avoids a NPE below, but callers need to be careful to
// handle this case
if (tab == null)
return null;
selectedTab = tab;
mSelectedTab = tab;
GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
public void run() {
GeckoApp.mAppContext.mFormAssistPopup.hide();
@ -118,35 +118,35 @@ public class Tabs implements GeckoEventListener {
}
public int getIndexOf(Tab tab) {
return order.lastIndexOf(tab);
return mOrder.lastIndexOf(tab);
}
public Tab getTabAt(int index) {
if (index >= 0 && index < order.size())
return order.get(index);
if (index >= 0 && index < mOrder.size())
return mOrder.get(index);
else
return null;
}
public Tab getSelectedTab() {
return selectedTab;
return mSelectedTab;
}
public boolean isSelectedTab(Tab tab) {
if (selectedTab == null)
if (mSelectedTab == null)
return false;
return tab == selectedTab;
return tab == mSelectedTab;
}
public Tab getTab(int id) {
if (getCount() == 0)
return null;
if (!tabs.containsKey(id))
if (!mTabs.containsKey(id))
return null;
return tabs.get(id);
return mTabs.get(id);
}
/** Close tab and then select the default next tab */
@ -201,22 +201,22 @@ public class Tabs implements GeckoEventListener {
if (getCount() == 0)
return null;
return tabs;
return mTabs;
}
public ArrayList<Tab> getTabsInOrder() {
if (getCount() == 0)
return null;
return order;
return mOrder;
}
public void setContentResolver(ContentResolver resolver) {
this.resolver = resolver;
mResolver = resolver;
}
public ContentResolver getContentResolver() {
return resolver;
return mResolver;
}
//Making Tabs a singleton class
@ -305,7 +305,7 @@ public class Tabs implements GeckoEventListener {
}
public void refreshThumbnails() {
Iterator<Tab> iterator = tabs.values().iterator();
Iterator<Tab> iterator = mTabs.values().iterator();
while (iterator.hasNext()) {
final Tab tab = iterator.next();
GeckoAppShell.getHandler().post(new Runnable() {