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

cleanup: rename method

Browse source
This commit is contained in:
Eric House 2016-08-12 08:50:26 -07:00
parent dfe79a2d97
commit 16a622d22c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -150,7 +150,7 @@ public class GameUtils {
} else { } else {
saveGame( context, gamePtr, gi, lockDest, true ); saveGame( context, gamePtr, gi, lockDest, true );
} }
summarizeAndClose( context, lockDest, gamePtr, gi ); summarizeAndRelease( context, lockDest, gamePtr, gi );
DBUtils.saveThumbnail( context, lockDest, null ); DBUtils.saveThumbnail( context, lockDest, null );
return lockDest; return lockDest;
@ -188,10 +188,10 @@ public class GameUtils {
return result; return result;
} }
private static GameSummary summarizeAndClose( Context context, private static GameSummary summarizeAndRelease( Context context,
GameLock lock, GameLock lock,
GamePtr gamePtr, GamePtr gamePtr,
CurGameInfo gi ) CurGameInfo gi )
{ {
GameSummary summary = new GameSummary( context, gi ); GameSummary summary = new GameSummary( context, gi );
XwJNI.game_summarize( gamePtr, summary ); XwJNI.game_summarize( gamePtr, summary );
@ -208,7 +208,7 @@ public class GameUtils {
CurGameInfo gi = new CurGameInfo( context ); CurGameInfo gi = new CurGameInfo( context );
GamePtr gamePtr = loadMakeGame( context, gi, lock ); GamePtr gamePtr = loadMakeGame( context, gi, lock );
if ( null != gamePtr ) { if ( null != gamePtr ) {
result = summarizeAndClose( context, lock, gamePtr, gi ); result = summarizeAndRelease( context, lock, gamePtr, gi );
} }
return result; return result;
} }
@ -957,8 +957,8 @@ public class GameUtils {
} }
saveGame( context, gamePtr, gi, lock, false ); saveGame( context, gamePtr, gi, lock, false );
GameSummary summary = summarizeAndClose( context, lock, GameSummary summary = summarizeAndRelease( context, lock,
gamePtr, gi ); gamePtr, gi );
if ( null != isLocalOut ) { if ( null != isLocalOut ) {
isLocalOut[0] = 0 <= summary.turn isLocalOut[0] = 0 <= summary.turn
&& gi.players[summary.turn].isLocal; && gi.players[summary.turn].isLocal;
@ -1018,7 +1018,7 @@ public class GameUtils {
saveGame( context, gamePtr, gi, lock, false ); saveGame( context, gamePtr, gi, lock, false );
summarizeAndClose( context, lock, gamePtr, gi ); summarizeAndRelease( context, lock, gamePtr, gi );
lock.unlock(); lock.unlock();
} else { } else {