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 959917 - Part 1: Explicitly handle PanelConfig order in Editor. r=lucasr

Browse Source
This commit is contained in:
Chenxia Liu 2014-03-26 16:07:14 -07:00
parent 771de8e6f6
commit 4fcae5d1b3
1 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
mobile/android/base/home/HomeConfig.java
View File

@ -22,8 +22,9 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public final class HomeConfig {
/**
@ -767,7 +768,8 @@ public final class HomeConfig {
*/
public static class Editor implements Iterable<PanelConfig> {
private final HomeConfig mHomeConfig;
private final HashMap<String, PanelConfig> mConfigMap;
private final Map<String, PanelConfig> mConfigMap;
private final List<String> mConfigOrder;
private final Thread mOriginalThread;
private PanelConfig mDefaultPanel;
@ -776,7 +778,8 @@ public final class HomeConfig {
private Editor(HomeConfig homeConfig, State configState) {
mHomeConfig = homeConfig;
mOriginalThread = Thread.currentThread();
mConfigMap = new LinkedHashMap<String, PanelConfig>();
mConfigMap = new HashMap<String, PanelConfig>();
mConfigOrder = new LinkedList<String>();
mEnabledCount = 0;
initFromState(configState);
@ -784,11 +787,11 @@ public final class HomeConfig {
/**
* Initialize the initial state of the editor from the given
* {@sode State}. A LinkedHashMap is used to represent the list of
* panels as it provides fast access to specific panels from IDs
* while also being order-aware. We keep a reference to the
* default panel and the number of enabled panels to avoid iterating
* through the map every time we need those.
* {@sode State}. A HashMap is used to represent the list of
* panels as it provides fast access, and a LinkedList is used to
* keep track of order. We keep a reference to the default panel
* and the number of enabled panels to avoid iterating through the
* map every time we need those.
*
* @param configState The source State to load the editor from.
*/
@ -808,7 +811,9 @@ public final class HomeConfig {
}
}
mConfigMap.put(panelConfig.getId(), panelCopy);
final String panelId = panelConfig.getId();
mConfigOrder.add(panelId);
mConfigMap.put(panelId, panelCopy);
}
// We should always have a defined default panel if there's
@ -848,10 +853,21 @@ public final class HomeConfig {
mDefaultPanel = null;
}
private List<PanelConfig> makeDeepCopy() {
List<PanelConfig> copiedList = new ArrayList<PanelConfig>();
for (PanelConfig panelConfig : mConfigMap.values()) {
copiedList.add(new PanelConfig(panelConfig));
/**
* Makes an ordered list of PanelConfigs that can be references
* or deep copied objects.
*
* @param deepCopy true to make deep-copied objects
* @return ordered List of PanelConfigs
*/
private List<PanelConfig> makeOrderedCopy(boolean deepCopy) {
final List<PanelConfig> copiedList = new ArrayList<PanelConfig>(mConfigOrder.size());
for (String panelId : mConfigOrder) {
PanelConfig panelConfig = mConfigMap.get(panelId);
if (deepCopy) {
panelConfig = new PanelConfig(panelConfig);
}
copiedList.add(panelConfig);
}
return copiedList;
@ -955,6 +971,7 @@ public final class HomeConfig {
final String id = panelConfig.getId();
if (!mConfigMap.containsKey(id)) {
mConfigMap.put(id, panelConfig);
mConfigOrder.add(id);
mEnabledCount++;
if (mEnabledCount == 1 || panelConfig.isDefault()) {
@ -985,6 +1002,7 @@ public final class HomeConfig {
}
mConfigMap.remove(panelId);
mConfigOrder.remove(panelId);
if (!panelConfig.isDisabled()) {
mEnabledCount--;
@ -1038,7 +1056,7 @@ public final class HomeConfig {
// We're about to save the current state in the background thread
// so we should use a deep copy of the PanelConfig instances to
// avoid saving corrupted state.
final State newConfigState = new State(mHomeConfig, makeDeepCopy());
final State newConfigState = new State(mHomeConfig, makeOrderedCopy(true));
ThreadUtils.getBackgroundHandler().post(new Runnable() {
@Override
@ -1059,8 +1077,7 @@ public final class HomeConfig {
public State commit() {
ThreadUtils.assertOnThread(mOriginalThread);
final State newConfigState =
new State(mHomeConfig, new ArrayList<PanelConfig>(mConfigMap.values()));
final State newConfigState = new State(mHomeConfig, makeOrderedCopy(false));
// This is a synchronous blocking operation, hence no
// need to deep copy the current PanelConfig instances.
@ -1073,11 +1090,35 @@ public final class HomeConfig {
return mConfigMap.isEmpty();
}
private class EditorIterator implements Iterator<PanelConfig> {
private final Iterator<String> mOrderIterator;
public EditorIterator() {
mOrderIterator = mConfigOrder.iterator();
}
@Override
public boolean hasNext() {
return mOrderIterator.hasNext();
}
@Override
public PanelConfig next() {
final String panelId = mOrderIterator.next();
return mConfigMap.get(panelId);
}
@Override
public void remove() {
throw new UnsupportedOperationException("Can't 'remove' from on Editor iterator.");
}
}
@Override
public Iterator<PanelConfig> iterator() {
ThreadUtils.assertOnThread(mOriginalThread);
return mConfigMap.values().iterator();
return new EditorIterator();
}
}