diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index ae58a3356..8289a5673 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -235,7 +235,7 @@ public class BoardActivity extends XWActivity lstnr = new DialogInterface.OnClickListener() { public void onClick( DialogInterface dlg, int whichButton ) { - m_jniThread.handle( JNIThread.JNICmd.CMD_RESET ); + m_jniThread.handle( JNICmd.CMD_RESET ); } }; ab.setNegativeButton( R.string.button_retry, lstnr ); @@ -562,7 +562,7 @@ public class BoardActivity extends XWActivity m_firingPrefs = false; m_volKeysZoom = XWPrefs.getVolKeysZoom( this ); if ( null != m_jniThread ) { - m_jniThread.handle( JNIThread.JNICmd.CMD_PREFS_CHANGE ); + m_jniThread.handle( JNICmd.CMD_PREFS_CHANGE ); } // in case of change... setBackgroundColor(); @@ -578,7 +578,7 @@ public class BoardActivity extends XWActivity if ( null != m_jniThread ) { XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode ); if ( XwJNI.XP_Key.XP_KEY_NONE != xpKey ) { - m_jniThread.handle( JNIThread.JNICmd.CMD_KEYDOWN, xpKey ); + m_jniThread.handle( JNICmd.CMD_KEYDOWN, xpKey ); } else { switch( keyCode ) { case KeyEvent.KEYCODE_VOLUME_DOWN: @@ -601,7 +601,7 @@ public class BoardActivity extends XWActivity if ( null != m_jniThread ) { XwJNI.XP_Key xpKey = keyCodeToXPKey( keyCode ); 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 ); @@ -663,7 +663,7 @@ public class BoardActivity extends XWActivity public boolean onOptionsItemSelected( MenuItem item ) { boolean handled = true; - JNIThread.JNICmd cmd = JNIThread.JNICmd.CMD_NONE; + JNICmd cmd = JNICmd.CMD_NONE; Runnable proc = null; int id = item.getItemId(); @@ -674,32 +674,32 @@ public class BoardActivity extends XWActivity break; case R.id.board_menu_trade_commit: - cmd = JNIThread.JNICmd.CMD_COMMIT; + cmd = JNICmd.CMD_COMMIT; break; case R.id.board_menu_trade_cancel: - cmd = JNIThread.JNICmd.CMD_CANCELTRADE; + cmd = JNICmd.CMD_CANCELTRADE; break; case R.id.board_menu_hint_prev: - cmd = JNIThread.JNICmd.CMD_PREV_HINT; + cmd = JNICmd.CMD_PREV_HINT; break; case R.id.board_menu_hint_next: - cmd = JNIThread.JNICmd.CMD_NEXT_HINT; + cmd = JNICmd.CMD_NEXT_HINT; break; case R.id.board_menu_juggle: - cmd = JNIThread.JNICmd.CMD_JUGGLE; + cmd = JNICmd.CMD_JUGGLE; break; case R.id.board_menu_flip: - cmd = JNIThread.JNICmd.CMD_FLIP; + cmd = JNICmd.CMD_FLIP; break; case R.id.board_menu_zoom: - cmd = JNIThread.JNICmd.CMD_TOGGLEZOOM; + cmd = JNICmd.CMD_TOGGLEZOOM; break; case R.id.board_menu_chat: startChatActivity(); break; case R.id.board_menu_toggle: - cmd = JNIThread.JNICmd.CMD_VALUES; + cmd = JNICmd.CMD_VALUES; break; case R.id.board_menu_trade: @@ -709,10 +709,10 @@ public class BoardActivity extends XWActivity break; case R.id.board_menu_tray: - cmd = JNIThread.JNICmd.CMD_TOGGLE_TRAY; + cmd = JNICmd.CMD_TOGGLE_TRAY; break; case R.id.board_menu_undo_current: - cmd = JNIThread.JNICmd.CMD_UNDO_CUR; + cmd = JNICmd.CMD_UNDO_CUR; break; case R.id.board_menu_undo_last: showConfirmThen( R.string.confirm_undo_last, UNDO_LAST_ACTION ); @@ -725,26 +725,26 @@ public class BoardActivity extends XWActivity break; 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 ); break; 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 ); break; case R.id.board_menu_game_history: - m_jniThread.handle( JNIThread.JNICmd.CMD_HISTORY, + m_jniThread.handle( JNICmd.CMD_HISTORY, R.string.history_title ); break; case R.id.board_menu_game_resign: - m_jniThread.handle( JNIThread.JNICmd.CMD_FINAL, + m_jniThread.handle( JNICmd.CMD_FINAL, R.string.history_title ); break; case R.id.board_menu_game_resend: - m_jniThread.handle( JNIThread.JNICmd.CMD_RESEND, false ); + m_jniThread.handle( JNICmd.CMD_RESEND, false ); break; case R.id.gamel_menu_checkmoves: @@ -767,7 +767,7 @@ public class BoardActivity extends XWActivity handled = false; } - if ( handled && cmd != JNIThread.JNICmd.CMD_NONE ) { + if ( handled && cmd != JNICmd.CMD_NONE ) { m_jniThread.handle( cmd ); } return handled; @@ -788,10 +788,10 @@ public class BoardActivity extends XWActivity m_gi.nPlayers ); } } else if ( AlertDialog.BUTTON_POSITIVE == which ) { - JNIThread.JNICmd cmd = JNIThread.JNICmd.CMD_NONE; + JNICmd cmd = JNICmd.CMD_NONE; switch ( id ) { case UNDO_LAST_ACTION: - cmd = JNIThread.JNICmd.CMD_UNDO_LAST; + cmd = JNICmd.CMD_UNDO_LAST; break; case SYNC_ACTION: doSyncMenuitem(); @@ -805,7 +805,7 @@ public class BoardActivity extends XWActivity SMS_INVITE_RESULT ); break; case COMMIT_ACTION: - cmd = JNIThread.JNICmd.CMD_COMMIT; + cmd = JNICmd.CMD_COMMIT; break; case SHOW_EXPL_ACTION: Utils.showToast( BoardActivity.this, m_toastStr ); @@ -816,32 +816,32 @@ public class BoardActivity extends XWActivity DictBrowseActivity.launch( this, dictName ); break; case PREV_HINT_ACTION: - cmd = JNIThread.JNICmd.CMD_PREV_HINT; + cmd = JNICmd.CMD_PREV_HINT; break; case NEXT_HINT_ACTION: - cmd = JNIThread.JNICmd.CMD_NEXT_HINT; + cmd = JNICmd.CMD_NEXT_HINT; break; case JUGGLE_ACTION: - cmd = JNIThread.JNICmd.CMD_JUGGLE; + cmd = JNICmd.CMD_JUGGLE; break; case FLIP_ACTION: - cmd = JNIThread.JNICmd.CMD_FLIP; + cmd = JNICmd.CMD_FLIP; break; case ZOOM_ACTION: - cmd = JNIThread.JNICmd.CMD_TOGGLEZOOM; + cmd = JNICmd.CMD_TOGGLEZOOM; break; case UNDO_ACTION: - cmd = JNIThread.JNICmd.CMD_UNDO_CUR; + cmd = JNICmd.CMD_UNDO_CUR; break; case VALUES_ACTION: - cmd = JNIThread.JNICmd.CMD_VALUES; + cmd = JNICmd.CMD_VALUES; break; case CHAT_ACTION: startChatActivity(); break; case START_TRADE_ACTION: Utils.showToast( this, R.string.entering_trade ); - cmd = JNIThread.JNICmd.CMD_TRADE; + cmd = JNICmd.CMD_TRADE; break; case LOOKUP_ACTION: launchLookup( m_words, m_gi.dictLang ); @@ -850,7 +850,7 @@ public class BoardActivity extends XWActivity Assert.fail(); } - if ( JNIThread.JNICmd.CMD_NONE != cmd ) { + if ( JNICmd.CMD_NONE != cmd ) { checkAndHandle( cmd ); } } @@ -863,9 +863,9 @@ public class BoardActivity extends XWActivity public void onClick( View view ) { if ( view == m_exchCommmitButton ) { - m_jniThread.handle( JNIThread.JNICmd.CMD_COMMIT ); + m_jniThread.handle( JNICmd.CMD_COMMIT ); } 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() { public void run() { 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 public void remSelected() { - m_jniThread.handle( JNIThread.JNICmd.CMD_REMAINING, + m_jniThread.handle( JNICmd.CMD_REMAINING, R.string.tiles_left_title ); } @@ -1171,7 +1171,7 @@ public class BoardActivity extends XWActivity newRole.toString(), m_gi.serverRole.toString() ); m_gi.serverRole = newRole; 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 ); } } ); - 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() { 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 ) @@ -1662,7 +1662,7 @@ public class BoardActivity extends XWActivity startChatActivity(); } 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 ) { DBUtils.setMsgFlags( m_rowid, GameSummary.MSG_FLAGS_NONE ); @@ -1679,7 +1679,7 @@ public class BoardActivity extends XWActivity } } // loadGame - private void checkAndHandle( JNIThread.JNICmd cmd ) + private void checkAndHandle( JNICmd cmd ) { if ( null != m_jniThread ) { m_jniThread.handle( cmd ); @@ -1795,7 +1795,7 @@ public class BoardActivity extends XWActivity { boolean handled = null != m_jniThread; if ( handled ) { - m_jniThread.handle( JNIThread.JNICmd.CMD_ZOOM, zoomBy ); + m_jniThread.handle( JNICmd.CMD_ZOOM, zoomBy ); } return handled; }