mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-06 05:24:46 +01:00
rename interface; no code change
This commit is contained in:
parent
f599ca8be4
commit
877225f59d
9 changed files with 14 additions and 14 deletions
|
@ -65,7 +65,7 @@ public class BTInviteActivity extends InviteActivity
|
||||||
BTService.clearDevices( this, null ); // will return names
|
BTService.clearDevices( this, null ); // will return names
|
||||||
}
|
}
|
||||||
|
|
||||||
// BTService.BTEventListener interface
|
// MultiService.MultiEventListener interface
|
||||||
@Override
|
@Override
|
||||||
public void eventOccurred( MultiService.MultiEvent event, final Object ... args )
|
public void eventOccurred( MultiService.MultiEvent event, final Object ... args )
|
||||||
{
|
{
|
||||||
|
|
|
@ -147,7 +147,7 @@ public class BTService extends Service {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setListener( MultiService.BTEventListener li )
|
public static void setListener( MultiService.MultiEventListener li )
|
||||||
{
|
{
|
||||||
if ( XWApp.BTSUPPORTED ) {
|
if ( XWApp.BTSUPPORTED ) {
|
||||||
if ( null == s_srcMgr ) {
|
if ( null == s_srcMgr ) {
|
||||||
|
|
|
@ -924,7 +924,7 @@ public class BoardActivity extends XWActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
// BTService.BTEventListener interface
|
// MultiService.MultiEventListener interface
|
||||||
//////////////////////////////////////////////////
|
//////////////////////////////////////////////////
|
||||||
@Override
|
@Override
|
||||||
@SuppressWarnings("fallthrough")
|
@SuppressWarnings("fallthrough")
|
||||||
|
|
|
@ -419,7 +419,7 @@ public class GamesList extends XWListActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// BTService.BTEventListener interface
|
// BTService.MultiEventListener interface
|
||||||
@Override
|
@Override
|
||||||
public void eventOccurred( MultiService.MultiEvent event,
|
public void eventOccurred( MultiService.MultiEvent event,
|
||||||
final Object ... args )
|
final Object ... args )
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class MultiService {
|
||||||
public static final int OWNER_SMS = 1;
|
public static final int OWNER_SMS = 1;
|
||||||
public static final int OWNER_RELAY = 2;
|
public static final int OWNER_RELAY = 2;
|
||||||
|
|
||||||
private BTEventListener m_li;
|
private MultiEventListener m_li;
|
||||||
|
|
||||||
public enum MultiEvent { BAD_PROTO
|
public enum MultiEvent { BAD_PROTO
|
||||||
, BT_ENABLED
|
, BT_ENABLED
|
||||||
|
@ -64,14 +64,14 @@ public class MultiService {
|
||||||
, SMS_SEND_FAILED_NORADIO
|
, SMS_SEND_FAILED_NORADIO
|
||||||
};
|
};
|
||||||
|
|
||||||
public interface BTEventListener {
|
public interface MultiEventListener {
|
||||||
public void eventOccurred( MultiEvent event, Object ... args );
|
public void eventOccurred( MultiEvent event, Object ... args );
|
||||||
}
|
}
|
||||||
// public interface MultiEventSrc {
|
// public interface MultiEventSrc {
|
||||||
// public void setBTEventListener( BTEventListener li );
|
// public void setBTEventListener( BTEventListener li );
|
||||||
// }
|
// }
|
||||||
|
|
||||||
public void setListener( BTEventListener li )
|
public void setListener( MultiEventListener li )
|
||||||
{
|
{
|
||||||
synchronized( this ) {
|
synchronized( this ) {
|
||||||
m_li = li;
|
m_li = li;
|
||||||
|
|
|
@ -256,7 +256,7 @@ public class NewGameActivity extends XWActivity {
|
||||||
return dialog;
|
return dialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
// BTService.BTEventListener interface
|
// MultiService.MultiEventListener interface
|
||||||
@Override
|
@Override
|
||||||
public void eventOccurred( MultiService.MultiEvent event,
|
public void eventOccurred( MultiService.MultiEvent event,
|
||||||
final Object ... args )
|
final Object ... args )
|
||||||
|
@ -299,7 +299,7 @@ public class NewGameActivity extends XWActivity {
|
||||||
super.eventOccurred( event, args );
|
super.eventOccurred( event, args );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} // BTService.BTEventListener.eventOccurred
|
} // MultiService.MultiEventListener.eventOccurred
|
||||||
|
|
||||||
private void makeNewGame( boolean networked, boolean launch )
|
private void makeNewGame( boolean networked, boolean launch )
|
||||||
{
|
{
|
||||||
|
|
|
@ -189,7 +189,7 @@ public class SMSService extends Service {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setListener( MultiService.BTEventListener li )
|
public static void setListener( MultiService.MultiEventListener li )
|
||||||
{
|
{
|
||||||
if ( XWApp.SMSSUPPORTED ) {
|
if ( XWApp.SMSSUPPORTED ) {
|
||||||
if ( null == s_srcMgr ) {
|
if ( null == s_srcMgr ) {
|
||||||
|
|
|
@ -31,7 +31,7 @@ import android.widget.TextView;
|
||||||
import junit.framework.Assert;
|
import junit.framework.Assert;
|
||||||
|
|
||||||
public class XWActivity extends Activity
|
public class XWActivity extends Activity
|
||||||
implements DlgDelegate.DlgClickNotify, MultiService.BTEventListener {
|
implements DlgDelegate.DlgClickNotify, MultiService.MultiEventListener {
|
||||||
|
|
||||||
private DlgDelegate m_delegate;
|
private DlgDelegate m_delegate;
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ public class XWActivity extends Activity
|
||||||
Assert.fail();
|
Assert.fail();
|
||||||
}
|
}
|
||||||
|
|
||||||
// BTService.BTEventListener interface
|
// BTService.MultiEventListener interface
|
||||||
public void eventOccurred( MultiService.MultiEvent event,
|
public void eventOccurred( MultiService.MultiEvent event,
|
||||||
final Object ... args )
|
final Object ... args )
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,7 @@ import android.os.Bundle;
|
||||||
import junit.framework.Assert;
|
import junit.framework.Assert;
|
||||||
|
|
||||||
public class XWListActivity extends ListActivity
|
public class XWListActivity extends ListActivity
|
||||||
implements DlgDelegate.DlgClickNotify, MultiService.BTEventListener {
|
implements DlgDelegate.DlgClickNotify, MultiService.MultiEventListener {
|
||||||
|
|
||||||
private DlgDelegate m_delegate;
|
private DlgDelegate m_delegate;
|
||||||
|
|
||||||
|
@ -193,7 +193,7 @@ public class XWListActivity extends ListActivity
|
||||||
m_delegate.launchLookup( words, lang, forceList );
|
m_delegate.launchLookup( words, lang, forceList );
|
||||||
}
|
}
|
||||||
|
|
||||||
// BTService.BTEventListener interface
|
// MultiService.MultiEventListener interface
|
||||||
public void eventOccurred( MultiService.MultiEvent event,
|
public void eventOccurred( MultiService.MultiEvent event,
|
||||||
final Object ... args )
|
final Object ... args )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue