Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

deal with added groups too, and better with removed groups.

Browse source
This commit is contained in:
Eric House 2012-12-29 11:36:51 -08:00
parent 8c4b878e21
commit 498ca99020
2 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
View file

@ -27,6 +27,8 @@ import android.view.ViewGroup;
import android.widget.ExpandableListAdapter; import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import java.util.HashMap; // class is not synchronized import java.util.HashMap; // class is not synchronized
import java.util.HashSet;
import java.util.Set;
import java.util.Iterator; import java.util.Iterator;
import junit.framework.Assert; import junit.framework.Assert;
@ -56,20 +58,36 @@ public class GameListAdapter implements ExpandableListAdapter {
m_list = list; m_list = list;
m_handler = handler; m_handler = handler;
m_cb = cb; m_cb = cb;
m_positions = positions; m_positions = checkPositions( positions );
m_fieldID = fieldToID( fieldName ); m_fieldID = fieldToID( fieldName );
} }
public long[] getPositions() public long[] getPositions()
{ {
HashMap<Long,GameGroupInfo> info = gameInfo(); Set<Long> keys = gameInfo().keySet(); // do not modify!!!!
if ( null == m_positions || info.size() != m_positions.length ) { if ( null == m_positions || m_positions.length != keys.size() ) {
m_positions = new long[info.size()]; HashSet<Long> unused = new HashSet<Long>( keys );
Iterator<Long> iter = info.keySet().iterator(); long[] newArray = new long[unused.size()];
for ( int ii = 0; ii < m_positions.length; ++ii ) {
m_positions[ii] = iter.next(); // First copy the existing values, in order
int nextIndx = 0;
if ( null != m_positions ) {
for ( long id: m_positions ) {
if ( unused.contains( id ) ) {
newArray[nextIndx++] = id;
unused.remove( id );
}
}
} }
// Then copy in what's left
Iterator<Long> iter = unused.iterator();
while ( iter.hasNext() ) {
long id = iter.next();
newArray[nextIndx++] = id;
}
m_positions = newArray;
} }
return m_positions; return m_positions;
} }
@ -88,19 +106,6 @@ public class GameListAdapter implements ExpandableListAdapter {
return success; return success;
} }
public boolean removeGroup( long groupid )
{
long[] newArray = new long[m_positions.length - 1];
int destIndex = 0;
for ( long id : m_positions ) {
if ( id != groupid ) {
newArray[destIndex++] = id;
}
}
m_positions = newArray;
return true;
}
public void expandGroups( ExpandableListView view ) public void expandGroups( ExpandableListView view )
{ {
HashMap<Long,GameGroupInfo> info = gameInfo(); HashMap<Long,GameGroupInfo> info = gameInfo();
@ -409,4 +414,19 @@ public class GameListAdapter implements ExpandableListAdapter {
{ {
return DBUtils.getGroups( m_context ); return DBUtils.getGroups( m_context );
} }
private long[] checkPositions( long[] positions )
{
long[] result = positions;
if ( null != positions ) {
Set<Long> posns = gameInfo().keySet();
for ( long id : positions ) {
if ( ! posns.contains( id ) ) {
result = null;
break;
}
}
}
return result;
}
} }

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -554,9 +554,7 @@ public class GamesList extends XWExpandableListActivity
case DELETE_GROUP_ACTION: case DELETE_GROUP_ACTION:
GameUtils.deleteGroup( this, m_groupid ); GameUtils.deleteGroup( this, m_groupid );
if ( m_adapter.removeGroup( m_groupid ) ) { onContentChanged();
onContentChanged();
}
break; break;
default: default:
Assert.fail(); Assert.fail();