Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename m_path->m_name for consistency

Browse source
This commit is contained in:
Andy2 2011-06-06 18:44:29 -07:00
parent c21a494e0b
commit 845b277c01
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -82,7 +82,7 @@ public class GameConfig extends XWActivity
private View m_connectSet; // really a LinearLayout
private Spinner m_roomChoose;
// private Button m_configureButton;
private String m_path;
private String m_name;
private CurGameInfo m_gi;
private CurGameInfo m_giOrig;
private GameUtils.GameLock m_gameLock;
@ -372,7 +372,7 @@ public class GameConfig extends XWActivity
m_cp = CommonPrefs.get( this );
Intent intent = getIntent();
m_path = intent.getStringExtra( BoardActivity.INTENT_KEY_NAME );
m_name = intent.getStringExtra( BoardActivity.INTENT_KEY_NAME );
setContentView(R.layout.game_config);
@ -401,7 +401,7 @@ public class GameConfig extends XWActivity
m_giOrig = new CurGameInfo( this );
// Lock in case we're going to config. We *could* re-get the
// lock once the user decides to make changes. PENDING.
m_gameLock = new GameUtils.GameLock( m_path, true ).lock();
m_gameLock = new GameUtils.GameLock( m_name, true ).lock();
GameUtils.loadMakeGame( this, gamePtr, m_giOrig, m_gameLock );
m_gameStarted = XwJNI.model_getNMoves( gamePtr ) > 0
|| XwJNI.comms_isConnected( gamePtr );
@ -529,7 +529,7 @@ public class GameConfig extends XWActivity
} else if ( m_refreshRoomsButton == view ) {
refreshNames();
} else if ( m_playButton == view ) {
// Launch BoardActivity for m_path, but ONLY IF user
// Launch BoardActivity for m_name, but ONLY IF user
// confirms any changes required. So we either launch
// from here if there's no confirmation needed, or launch
// a new dialog whose OK button does the same thing.
@ -956,7 +956,7 @@ public class GameConfig extends XWActivity
if ( m_notNetworkedGame || m_car.ip_relay_invite.length() > 0 ) {
m_gameLock.unlock();
m_gameLock = null;
GameUtils.launchGameAndFinish( this, m_path );
GameUtils.launchGameAndFinish( this, m_name );
} else {
showOKOnlyDialog( R.string.no_empty_rooms );
}
@ -975,7 +975,7 @@ public class GameConfig extends XWActivity
String fmt = getString( m_notNetworkedGame ?
R.string.title_game_configf
: R.string.title_gamenet_configf );
setTitle( String.format( fmt, GameUtils.gameName( this, m_path ) ) );
setTitle( String.format( fmt, GameUtils.gameName( this, m_name ) ) );
}
}

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameActivity.java
View file

@ -39,7 +39,7 @@ import org.eehouse.android.xw4.jni.*;
public class RelayGameActivity extends XWActivity
implements View.OnClickListener {
private String m_path;
private String m_name;
private CurGameInfo m_gi;
private GameUtils.GameLock m_gameLock;
private CommsAddrRec m_car;
@ -53,7 +53,7 @@ public class RelayGameActivity extends XWActivity
setContentView( R.layout.relay_game_config );
m_path = getIntent().getStringExtra( BoardActivity.INTENT_KEY_NAME );
m_name = getIntent().getStringExtra( BoardActivity.INTENT_KEY_NAME );
m_playButton = (Button)findViewById( R.id.play_button );
m_playButton.setOnClickListener( this );
@ -69,7 +69,7 @@ public class RelayGameActivity extends XWActivity
int gamePtr = XwJNI.initJNI();
m_gi = new CurGameInfo( this );
m_gameLock = new GameUtils.GameLock( m_path, true ).lock();
m_gameLock = new GameUtils.GameLock( m_name, true ).lock();
GameUtils.loadMakeGame( this, gamePtr, m_gi, m_gameLock );
m_car = new CommsAddrRec( this );
if ( XwJNI.game_hasComms( gamePtr ) ) {
@ -107,12 +107,12 @@ public class RelayGameActivity extends XWActivity
showOKOnlyDialog( R.string.no_empty_rooms );
} else {
if ( saveRoomAndName( room ) ) {
GameUtils.launchGameAndFinish( this, m_path );
GameUtils.launchGameAndFinish( this, m_name );
}
}
} else if ( view == m_configButton ) {
if ( saveRoomAndName( room ) ) {
GameUtils.doConfig( this, m_path, GameConfig.class );
GameUtils.doConfig( this, m_name, GameConfig.class );
finish();
}
}