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

cleanup: Remove some commented-out code

Browse source
This commit is contained in:
Eric House 2016-06-26 13:53:59 -07:00
parent 372b0c2f1e
commit 6c5b5489ad
6 changed files with 1 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/res/values/styles.xml
View file

@ -90,12 +90,6 @@
<item name="android:layout_weight">1</item>
</style>
<!-- <style name="spaced_buttons"> -->
<!-- <item name="android:layout_width">fill_parent</item> -->
<!-- <item name="android:layout_height">wrap_content</item> -->
<!-- <item name="android:layout_weight">1</item> -->
<!-- </style> -->
<style name="newgame_connicon">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -1165,9 +1165,6 @@ public class BTService extends XWService {
private void updateStatusOut( boolean success )
{
// Intent intent = GamesListDelegate.makeGameIDIntent( this, gameID );
// Utils.postNotification( this, intent, R.string.new_btmove_title,
// body, (int)rowid );
ConnStatusHandler
.updateStatusOut( this, null, CommsConnType.COMMS_CONN_BT, success );
}

122
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -633,9 +633,6 @@ public class BoardDelegate extends DelegateBase
protected void onResume()
{
super.onResume();
// if( BuildConfig.DEBUG ) {
// GameUtils.postSelfNotification( m_activity, m_rowid );
// }
doResume( false );
}
@ -2124,125 +2121,6 @@ public class BoardDelegate extends DelegateBase
}
} // resumeGame
// private void loadGame( boolean isStart )
// {
// if ( null == m_jniGamePtr ) {
// try {
// String gameName = DBUtils.getName( m_activity, m_rowid );
// String[] dictNames;
// Assert.assertNull( m_gameLock );
// m_gameLock = m_jniThreadRef.getLock();
// if ( null == m_gameLock ) {
// dictNames = GameUtils.dictNames( m_activity, m_rowid );
// } else {
// dictNames = GameUtils.dictNames( m_activity, m_gameLock );
// }
// DictUtils.DictPairs pairs = DictUtils.openDicts( m_activity, dictNames );
// if ( pairs.anyMissing( dictNames ) ) {
// showDictGoneFinish();
// } else {
// if ( null == m_gameLock ) {
// m_gameLock = new GameLock( m_rowid, true ).lock();
// }
// // PENDING: there's no point in re-opening the game if
// // it's already open!
// byte[] stream = GameUtils.savedGame( m_activity, m_gameLock );
// m_gi = new CurGameInfo( m_activity );
// m_gi.setName( gameName );
// XwJNI.gi_from_stream( m_gi, stream );
// String langName = m_gi.langName();
// m_summary = DBUtils.getSummary( m_activity, m_gameLock );
// m_relayMissing = m_summary.relayConnectPending();
// setThis( this );
// m_jniGamePtr = XwJNI.initJNI( m_rowid );
// if ( m_gi.serverRole != DeviceRole.SERVER_STANDALONE ) {
// m_xport = new CommsTransport( m_activity, this, m_rowid,
// m_gi.serverRole );
// }
// CommonPrefs cp = CommonPrefs.get( m_activity );
// if ( null == stream ||
// ! XwJNI.game_makeFromStream( m_jniGamePtr, stream,
// m_gi, dictNames,
// pairs.m_bytes,
// pairs.m_paths, langName,
// m_utils, m_jniu,
// null, cp, m_xport ) ) {
// XwJNI.game_makeNewGame( m_jniGamePtr, m_gi, m_utils,
// m_jniu, null, cp, m_xport,
// dictNames, pairs.m_bytes,
// pairs.m_paths, langName );
// }
// m_jniThread = m_jniThreadRef.retain();
// // see http://stackoverflow.com/questions/680180/where-to-stop-\
// // destroy-threads-in-android-service-class
// // m_jniThread.setDaemonOnce( true ); // firing
// // m_jniThread.startOnce();
// m_view.startHandling( m_activity, m_jniThread, m_jniGamePtr, m_gi,
// m_connTypes );
// if ( null != m_xport ) {
// // informMissing should have been called by now
// Assert.assertNotNull( m_connTypes );
// m_xport.setReceiver( m_jniThread, m_handler );
// }
// handleViaThread( JNICmd.CMD_START );
// if ( !CommonPrefs.getHideTitleBar( m_activity ) ) {
// setTitle( GameUtils.getName( m_activity, m_rowid ) );
// }
// positionToolbar( isPortrait() );
// populateToolbar();
// adjustTradeVisibility();
// int flags = DBUtils.getMsgFlags( m_activity, m_rowid );
// if ( 0 != (GameSummary.MSG_FLAGS_CHAT & flags) ) {
// startChatActivity();
// }
// if ( m_overNotShown ) {
// boolean auto = false;
// if ( 0 != (GameSummary.MSG_FLAGS_GAMEOVER & flags) ) {
// m_gameOver = true;
// } else if ( DBUtils.gameOver( m_activity, m_rowid ) ) {
// m_gameOver = true;
// auto = true;
// }
// if ( m_gameOver ) {
// m_overNotShown = false;
// handleViaThread( JNICmd.CMD_POST_OVER, auto );
// }
// }
// if ( 0 != flags ) {
// DBUtils.setMsgFlags( m_rowid, GameSummary.MSG_FLAGS_NONE );
// }
// Utils.cancelNotification( m_activity, (int)m_rowid );
// if ( null != m_xport ) {
// warnIfNoTransport();
// trySendChats();
// tickle( isStart );
// tryInvites();
// }
// }
// } catch ( GameUtils.NoSuchGameException nsge ) {
// DbgUtils.loge( nsge );
// finish();
// }
// }
// } // loadGame
private void tickle( boolean force )
{
for ( Iterator<CommsConnType> iter = m_connTypes.iterator();

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

@ -186,6 +186,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
width, height );
}
// @Override
// public void onSizeChanged( int width, int height, int oldWidth, int oldHeight )
// {
// DbgUtils.logf( "BoardView.onSizeChanged(): width: %d => %d; height: %d => %d",

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -268,8 +268,6 @@ public class JNIThread extends Thread {
} catch ( java.lang.InterruptedException ie ) {
DbgUtils.loge( ie );
}
// m_jniGamePtr.release();
// m_jniGamePtr = null;
m_lock.unlock();
}
@ -712,7 +710,6 @@ public class JNIThread extends Thread {
}
m_jniGamePtr.release();
m_jniGamePtr = null;
// XwJNI.threadDone();
} // run
public void handleBkgrnd( JNICmd cmd, Object... args )

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

@ -34,10 +34,4 @@ public class LocActivity extends XWActivity {
m_dlgt = new LocDelegate( this, savedInstanceState );
super.onCreate( savedInstanceState, m_dlgt );
} // onCreate
// @Override
// public boolean onCreateOptionsMenu( Menu menu )
// {
// return m_dlgt.onCreateOptionsMenu( menu );
// }
}