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

remove redundant class name (no code change)

Browse source
This commit is contained in:
Eric House 2012-10-23 06:50:49 -07:00
parent 1ce7b36b59
commit 521d7042be
1 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -235,7 +235,7 @@ public class BoardActivity extends XWActivity
lstnr = new DialogInterface.OnClickListener() { lstnr = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, public void onClick( DialogInterface dlg,
int whichButton ) { int whichButton ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_RESET ); m_jniThread.handle( JNICmd.CMD_RESET );
} }
}; };
ab.setNegativeButton( R.string.button_retry, lstnr ); ab.setNegativeButton( R.string.button_retry, lstnr );
@ -562,7 +562,7 @@ public class BoardActivity extends XWActivity
m_firingPrefs = false; m_firingPrefs = false;
m_volKeysZoom = XWPrefs.getVolKeysZoom( this ); m_volKeysZoom = XWPrefs.getVolKeysZoom( this );
if ( null != m_jniThread ) { if ( null != m_jniThread ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_PREFS_CHANGE ); m_jniThread.handle( JNICmd.CMD_PREFS_CHANGE );
} }
// in case of change... // in case of change...
setBackgroundColor(); setBackgroundColor();
@ -578,7 +578,7 @@ public class BoardActivity extends XWActivity
if ( null != m_jniThread ) { if ( null != m_jniThread ) {
XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode ); XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode );
if ( XwJNI.XP_Key.XP_KEY_NONE != xpKey ) { if ( XwJNI.XP_Key.XP_KEY_NONE != xpKey ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_KEYDOWN, xpKey ); m_jniThread.handle( JNICmd.CMD_KEYDOWN, xpKey );
} else { } else {
switch( keyCode ) { switch( keyCode ) {
case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_VOLUME_DOWN:
@ -601,7 +601,7 @@ public class BoardActivity extends XWActivity
if ( null != m_jniThread ) { if ( null != m_jniThread ) {
XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode ); XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode );
if ( XwJNI.XP_Key.XP_KEY_NONE != xpKey ) { if ( XwJNI.XP_Key.XP_KEY_NONE != xpKey ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_KEYUP, xpKey ); m_jniThread.handle( JNICmd.CMD_KEYUP, xpKey );
} }
} }
return super.onKeyUp( keyCode, event ); return super.onKeyUp( keyCode, event );
@ -663,7 +663,7 @@ public class BoardActivity extends XWActivity
public boolean onOptionsItemSelected( MenuItem item ) public boolean onOptionsItemSelected( MenuItem item )
{ {
boolean handled = true; boolean handled = true;
JNIThread.JNICmd cmd = JNIThread.JNICmd.CMD_NONE; JNICmd cmd = JNICmd.CMD_NONE;
Runnable proc = null; Runnable proc = null;
int id = item.getItemId(); int id = item.getItemId();
@ -674,32 +674,32 @@ public class BoardActivity extends XWActivity
break; break;
case R.id.board_menu_trade_commit: case R.id.board_menu_trade_commit:
cmd = JNIThread.JNICmd.CMD_COMMIT; cmd = JNICmd.CMD_COMMIT;
break; break;
case R.id.board_menu_trade_cancel: case R.id.board_menu_trade_cancel:
cmd = JNIThread.JNICmd.CMD_CANCELTRADE; cmd = JNICmd.CMD_CANCELTRADE;
break; break;
case R.id.board_menu_hint_prev: case R.id.board_menu_hint_prev:
cmd = JNIThread.JNICmd.CMD_PREV_HINT; cmd = JNICmd.CMD_PREV_HINT;
break; break;
case R.id.board_menu_hint_next: case R.id.board_menu_hint_next:
cmd = JNIThread.JNICmd.CMD_NEXT_HINT; cmd = JNICmd.CMD_NEXT_HINT;
break; break;
case R.id.board_menu_juggle: case R.id.board_menu_juggle:
cmd = JNIThread.JNICmd.CMD_JUGGLE; cmd = JNICmd.CMD_JUGGLE;
break; break;
case R.id.board_menu_flip: case R.id.board_menu_flip:
cmd = JNIThread.JNICmd.CMD_FLIP; cmd = JNICmd.CMD_FLIP;
break; break;
case R.id.board_menu_zoom: case R.id.board_menu_zoom:
cmd = JNIThread.JNICmd.CMD_TOGGLEZOOM; cmd = JNICmd.CMD_TOGGLEZOOM;
break; break;
case R.id.board_menu_chat: case R.id.board_menu_chat:
startChatActivity(); startChatActivity();
break; break;
case R.id.board_menu_toggle: case R.id.board_menu_toggle:
cmd = JNIThread.JNICmd.CMD_VALUES; cmd = JNICmd.CMD_VALUES;
break; break;
case R.id.board_menu_trade: case R.id.board_menu_trade:
@ -709,10 +709,10 @@ public class BoardActivity extends XWActivity
break; break;
case R.id.board_menu_tray: case R.id.board_menu_tray:
cmd = JNIThread.JNICmd.CMD_TOGGLE_TRAY; cmd = JNICmd.CMD_TOGGLE_TRAY;
break; break;
case R.id.board_menu_undo_current: case R.id.board_menu_undo_current:
cmd = JNIThread.JNICmd.CMD_UNDO_CUR; cmd = JNICmd.CMD_UNDO_CUR;
break; break;
case R.id.board_menu_undo_last: case R.id.board_menu_undo_last:
showConfirmThen( R.string.confirm_undo_last, UNDO_LAST_ACTION ); showConfirmThen( R.string.confirm_undo_last, UNDO_LAST_ACTION );
@ -725,26 +725,26 @@ public class BoardActivity extends XWActivity
break; break;
case R.id.board_menu_game_counts: case R.id.board_menu_game_counts:
m_jniThread.handle( JNIThread.JNICmd.CMD_COUNTS_VALUES, m_jniThread.handle( JNICmd.CMD_COUNTS_VALUES,
R.string.counts_values_title ); R.string.counts_values_title );
break; break;
case R.id.board_menu_game_left: case R.id.board_menu_game_left:
m_jniThread.handle( JNIThread.JNICmd.CMD_REMAINING, m_jniThread.handle( JNICmd.CMD_REMAINING,
R.string.tiles_left_title ); R.string.tiles_left_title );
break; break;
case R.id.board_menu_game_history: case R.id.board_menu_game_history:
m_jniThread.handle( JNIThread.JNICmd.CMD_HISTORY, m_jniThread.handle( JNICmd.CMD_HISTORY,
R.string.history_title ); R.string.history_title );
break; break;
case R.id.board_menu_game_resign: case R.id.board_menu_game_resign:
m_jniThread.handle( JNIThread.JNICmd.CMD_FINAL, m_jniThread.handle( JNICmd.CMD_FINAL,
R.string.history_title ); R.string.history_title );
break; break;
case R.id.board_menu_game_resend: case R.id.board_menu_game_resend:
m_jniThread.handle( JNIThread.JNICmd.CMD_RESEND, false ); m_jniThread.handle( JNICmd.CMD_RESEND, false );
break; break;
case R.id.gamel_menu_checkmoves: case R.id.gamel_menu_checkmoves:
@ -767,7 +767,7 @@ public class BoardActivity extends XWActivity
handled = false; handled = false;
} }
if ( handled && cmd != JNIThread.JNICmd.CMD_NONE ) { if ( handled && cmd != JNICmd.CMD_NONE ) {
m_jniThread.handle( cmd ); m_jniThread.handle( cmd );
} }
return handled; return handled;
@ -788,10 +788,10 @@ public class BoardActivity extends XWActivity
m_gi.nPlayers ); m_gi.nPlayers );
} }
} else if ( AlertDialog.BUTTON_POSITIVE == which ) { } else if ( AlertDialog.BUTTON_POSITIVE == which ) {
JNIThread.JNICmd cmd = JNIThread.JNICmd.CMD_NONE; JNICmd cmd = JNICmd.CMD_NONE;
switch ( id ) { switch ( id ) {
case UNDO_LAST_ACTION: case UNDO_LAST_ACTION:
cmd = JNIThread.JNICmd.CMD_UNDO_LAST; cmd = JNICmd.CMD_UNDO_LAST;
break; break;
case SYNC_ACTION: case SYNC_ACTION:
doSyncMenuitem(); doSyncMenuitem();
@ -805,7 +805,7 @@ public class BoardActivity extends XWActivity
SMS_INVITE_RESULT ); SMS_INVITE_RESULT );
break; break;
case COMMIT_ACTION: case COMMIT_ACTION:
cmd = JNIThread.JNICmd.CMD_COMMIT; cmd = JNICmd.CMD_COMMIT;
break; break;
case SHOW_EXPL_ACTION: case SHOW_EXPL_ACTION:
Utils.showToast( BoardActivity.this, m_toastStr ); Utils.showToast( BoardActivity.this, m_toastStr );
@ -816,32 +816,32 @@ public class BoardActivity extends XWActivity
DictBrowseActivity.launch( this, dictName ); DictBrowseActivity.launch( this, dictName );
break; break;
case PREV_HINT_ACTION: case PREV_HINT_ACTION:
cmd = JNIThread.JNICmd.CMD_PREV_HINT; cmd = JNICmd.CMD_PREV_HINT;
break; break;
case NEXT_HINT_ACTION: case NEXT_HINT_ACTION:
cmd = JNIThread.JNICmd.CMD_NEXT_HINT; cmd = JNICmd.CMD_NEXT_HINT;
break; break;
case JUGGLE_ACTION: case JUGGLE_ACTION:
cmd = JNIThread.JNICmd.CMD_JUGGLE; cmd = JNICmd.CMD_JUGGLE;
break; break;
case FLIP_ACTION: case FLIP_ACTION:
cmd = JNIThread.JNICmd.CMD_FLIP; cmd = JNICmd.CMD_FLIP;
break; break;
case ZOOM_ACTION: case ZOOM_ACTION:
cmd = JNIThread.JNICmd.CMD_TOGGLEZOOM; cmd = JNICmd.CMD_TOGGLEZOOM;
break; break;
case UNDO_ACTION: case UNDO_ACTION:
cmd = JNIThread.JNICmd.CMD_UNDO_CUR; cmd = JNICmd.CMD_UNDO_CUR;
break; break;
case VALUES_ACTION: case VALUES_ACTION:
cmd = JNIThread.JNICmd.CMD_VALUES; cmd = JNICmd.CMD_VALUES;
break; break;
case CHAT_ACTION: case CHAT_ACTION:
startChatActivity(); startChatActivity();
break; break;
case START_TRADE_ACTION: case START_TRADE_ACTION:
Utils.showToast( this, R.string.entering_trade ); Utils.showToast( this, R.string.entering_trade );
cmd = JNIThread.JNICmd.CMD_TRADE; cmd = JNICmd.CMD_TRADE;
break; break;
case LOOKUP_ACTION: case LOOKUP_ACTION:
launchLookup( m_words, m_gi.dictLang ); launchLookup( m_words, m_gi.dictLang );
@ -850,7 +850,7 @@ public class BoardActivity extends XWActivity
Assert.fail(); Assert.fail();
} }
if ( JNIThread.JNICmd.CMD_NONE != cmd ) { if ( JNICmd.CMD_NONE != cmd ) {
checkAndHandle( cmd ); checkAndHandle( cmd );
} }
} }
@ -863,9 +863,9 @@ public class BoardActivity extends XWActivity
public void onClick( View view ) public void onClick( View view )
{ {
if ( view == m_exchCommmitButton ) { if ( view == m_exchCommmitButton ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_COMMIT ); m_jniThread.handle( JNICmd.CMD_COMMIT );
} else if ( view == m_exchCancelButton ) { } else if ( view == m_exchCancelButton ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_CANCELTRADE ); m_jniThread.handle( JNICmd.CMD_CANCELTRADE );
} }
} }
@ -1148,7 +1148,7 @@ public class BoardActivity extends XWActivity
post( new Runnable() { post( new Runnable() {
public void run() { public void run() {
if ( null != m_jniThread ) { if ( null != m_jniThread ) {
m_jniThread.handleBkgrnd( JNIThread.JNICmd.CMD_DO ); m_jniThread.handleBkgrnd( JNICmd.CMD_DO );
} }
} }
} ); } );
@ -1157,7 +1157,7 @@ public class BoardActivity extends XWActivity
@Override @Override
public void remSelected() public void remSelected()
{ {
m_jniThread.handle( JNIThread.JNICmd.CMD_REMAINING, m_jniThread.handle( JNICmd.CMD_REMAINING,
R.string.tiles_left_title ); R.string.tiles_left_title );
} }
@ -1171,7 +1171,7 @@ public class BoardActivity extends XWActivity
newRole.toString(), m_gi.serverRole.toString() ); newRole.toString(), m_gi.serverRole.toString() );
m_gi.serverRole = newRole; m_gi.serverRole = newRole;
if ( !isServer ) { if ( !isServer ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_SWITCHCLIENT ); m_jniThread.handle( JNICmd.CMD_SWITCHCLIENT );
} }
} }
} }
@ -1315,7 +1315,7 @@ public class BoardActivity extends XWActivity
R.string.key_notagain_turnchanged ); R.string.key_notagain_turnchanged );
} }
} ); } );
m_jniThread.handle( JNIThread.JNICmd. CMD_ZOOM, -8 ); m_jniThread.handle( JNICmd. CMD_ZOOM, -8 );
} }
} }
@ -1507,7 +1507,7 @@ public class BoardActivity extends XWActivity
public void notifyGameOver() public void notifyGameOver()
{ {
m_gameOver = true; m_gameOver = true;
m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER ); m_jniThread.handle( JNICmd.CMD_POST_OVER );
} }
// public void yOffsetChange( int maxOffset, int oldOffset, int newOffset ) // public void yOffsetChange( int maxOffset, int oldOffset, int newOffset )
@ -1662,7 +1662,7 @@ public class BoardActivity extends XWActivity
startChatActivity(); startChatActivity();
} }
if ( 0 != (GameSummary.MSG_FLAGS_GAMEOVER & flags) ) { if ( 0 != (GameSummary.MSG_FLAGS_GAMEOVER & flags) ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER ); m_jniThread.handle( JNICmd.CMD_POST_OVER );
} }
if ( 0 != flags ) { if ( 0 != flags ) {
DBUtils.setMsgFlags( m_rowid, GameSummary.MSG_FLAGS_NONE ); DBUtils.setMsgFlags( m_rowid, GameSummary.MSG_FLAGS_NONE );
@ -1679,7 +1679,7 @@ public class BoardActivity extends XWActivity
} }
} // loadGame } // loadGame
private void checkAndHandle( JNIThread.JNICmd cmd ) private void checkAndHandle( JNICmd cmd )
{ {
if ( null != m_jniThread ) { if ( null != m_jniThread ) {
m_jniThread.handle( cmd ); m_jniThread.handle( cmd );
@ -1795,7 +1795,7 @@ public class BoardActivity extends XWActivity
{ {
boolean handled = null != m_jniThread; boolean handled = null != m_jniThread;
if ( handled ) { if ( handled ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_ZOOM, zoomBy ); m_jniThread.handle( JNICmd.CMD_ZOOM, zoomBy );
} }
return handled; return handled;
} }