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

rename onCreateDialog createDialog where it's not an overridden method

Browse source
This commit is contained in:
Eric House 2014-03-25 06:16:46 -07:00
parent cae30c61e8
commit e0c0ff219f
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,9 +36,9 @@ public class DelegateBase implements DlgDelegate.DlgClickNotify {
m_delegate = new DlgDelegate( activity, this, bundle ); m_delegate = new DlgDelegate( activity, this, bundle );
} }
protected Dialog onCreateDialog( int id ) protected Dialog createDialog( int id )
{ {
return m_delegate.onCreateDialog( id ); return m_delegate.createDialog( id );
} }
protected void showNotAgainDlgThen( int msgID, int prefsKey, protected void showNotAgainDlgThen( int msgID, int prefsKey,

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -241,8 +241,7 @@ public class DictsDelegate extends DelegateBase
protected Dialog createDialog( int id ) protected Dialog createDialog( int id )
{ {
OnClickListener lstnr, lstnr2; OnClickListener lstnr, lstnr2;
Dialog dialog = null; Dialog dialog;
String format;
String message; String message;
boolean doRemove = true; boolean doRemove = true;
@ -251,7 +250,7 @@ public class DictsDelegate extends DelegateBase
case MOVE_DICT: case MOVE_DICT:
final XWListItem[] selItems = getSelItems(); final XWListItem[] selItems = getSelItems();
final int[] moveTo = { -1 }; final int[] moveTo = { -1 };
message = Utils.format( m_activity, R.string.move_dictf, message = m_activity.getString( R.string.move_dictf,
getJoinedNames( selItems ) ); getJoinedNames( selItems ) );
OnClickListener newSelLstnr = OnClickListener newSelLstnr =
@ -347,6 +346,7 @@ public class DictsDelegate extends DelegateBase
break; break;
default: default:
dialog = super.createDialog( id );
doRemove = false; doRemove = false;
break; break;
} }

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

@ -155,9 +155,9 @@ public class DlgDelegate {
outState.putIntArray( IDS, ids ); outState.putIntArray( IDS, ids );
} }
public Dialog onCreateDialog( int id ) public Dialog createDialog( int id )
{ {
// DbgUtils.logf("onCreateDialog(id=%d)", id ); // DbgUtils.logf("createDialog(id=%d)", id );
Dialog dialog = null; Dialog dialog = null;
DlgID dlgID = DlgID.values()[id]; DlgID dlgID = DlgID.values()[id];
DlgState state = findForID( dlgID ); DlgState state = findForID( dlgID );

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

@ -334,7 +334,7 @@ public class GamesListDelegate extends DelegateBase
break; break;
default: default:
dialog = super.onCreateDialog( id ); dialog = super.createDialog( id );
break; break;
} }
return dialog; return dialog;

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

@ -97,7 +97,7 @@ public class XWActivity extends Activity
Dialog dialog = super.onCreateDialog( id ); Dialog dialog = super.onCreateDialog( id );
if ( null == dialog ) { if ( null == dialog ) {
DbgUtils.logf( "%s.onCreateDialog() called", getClass().getName() ); DbgUtils.logf( "%s.onCreateDialog() called", getClass().getName() );
dialog = m_delegate.onCreateDialog( id ); dialog = m_delegate.createDialog( id );
} }
return dialog; return dialog;
} }

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

@ -91,7 +91,7 @@ public class XWListActivity extends ListActivity
protected Dialog onCreateDialog( final int id ) protected Dialog onCreateDialog( final int id )
{ {
DbgUtils.logf( "%s.onCreateDialog() called", getClass().getName() ); DbgUtils.logf( "%s.onCreateDialog() called", getClass().getName() );
Dialog dialog = m_delegate.onCreateDialog( id ); Dialog dialog = m_delegate.createDialog( id );
if ( null == dialog ) { if ( null == dialog ) {
dialog = super.onCreateDialog( id ); dialog = super.onCreateDialog( id );
} }