Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: change map key type

Browse source
This commit is contained in:
Eric House 2016-07-11 12:31:42 -07:00
parent 91c561f6aa
commit dd96c1a5c2
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -157,8 +157,8 @@ public class DlgDelegate {
void showNotAgainDlgThen( int msgID, int prefsKey, Action action );
}
private static Map<Integer, WeakReference<DelegateBase>> s_pendings
= new HashMap<Integer, WeakReference<DelegateBase>>();
private static Map<DlgID, WeakReference<DelegateBase>> s_pendings
= new HashMap<DlgID, WeakReference<DelegateBase>>();
private Activity m_activity;
private DelegateBase m_dlgt;
private DlgClickNotify m_clickCallback;
@ -207,10 +207,9 @@ public class DlgDelegate {
protected void showDialog( DlgID dlgID )
{
int id = dlgID.ordinal();
s_pendings.put( id, new WeakReference<DelegateBase>(m_dlgt) );
s_pendings.put( dlgID, new WeakReference<DelegateBase>(m_dlgt) );
if ( !m_activity.isFinishing() ) {
m_activity.showDialog( id );
m_activity.showDialog( dlgID.ordinal() );
}
}
@ -888,7 +887,8 @@ public class DlgDelegate {
public static Dialog onCreateDialog( int id )
{
Dialog result = null;
WeakReference<DelegateBase> ref = s_pendings.get( id );
DlgID dlgID = DlgID.values()[id];
WeakReference<DelegateBase> ref = s_pendings.get( dlgID );
DelegateBase dlgt = ref.get();
if ( null != dlgt ) {
result = dlgt.onCreateDialog( id );
@ -898,10 +898,11 @@ public class DlgDelegate {
public static void onPrepareDialog( int id, Dialog dialog )
{
WeakReference<DelegateBase> ref = s_pendings.get( id );
DlgID dlgID = DlgID.values()[id];
WeakReference<DelegateBase> ref = s_pendings.get( dlgID );
DelegateBase dlgt = ref.get();
if ( null != dlgt ) {
dlgt.prepareDialog( DlgID.values()[id], dialog );
dlgt.prepareDialog( dlgID, dialog );
}
}

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java
View file

@ -20,6 +20,7 @@
package org.eehouse.android.xw4;
import android.app.Dialog;
import android.os.Bundle;
public class DualpaneDelegate extends DelegateBase {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java
View file

@ -126,7 +126,7 @@ public class MainActivity extends XWActivity
//////////////////////////////////////////////////////////////////////
public void onBackStackChanged()
{
DbgUtils.logf( "FragActivity.onBackStackChanged()" );
DbgUtils.logf( "MainActivity.onBackStackChanged()" );
// make sure the right-most are visible
int fragCount = getSupportFragmentManager().getBackStackEntryCount();
if ( 0 == fragCount ) {