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

cleanup

Browse source
This commit is contained in:
Eric House 2014-03-22 10:14:27 -07:00
parent c426741fa1
commit e2cd275459
5 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -2001,7 +2001,7 @@ public class BoardActivity extends XWActivity
if ( post( new Runnable() { if ( post( new Runnable() {
public void run() { public void run() {
m_blockingDlgID = dlgID; m_blockingDlgID = dlgID;
showDialog( dlgID ); showDialog( dlgID.ordinal() );
} }
} ) ) { } ) ) {
@ -2044,7 +2044,7 @@ public class BoardActivity extends XWActivity
m_dlgBytes = txt; m_dlgBytes = txt;
post( new Runnable() { post( new Runnable() {
public void run() { public void run() {
showDialog( dlgID ); showDialog( dlgID.ordinal() );
} }
} ); } );
} }

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -108,10 +108,6 @@ public class DlgDelegate {
public interface DlgClickNotify { public interface DlgClickNotify {
void dlgButtonClicked( Action action, int button, Object[] params ); void dlgButtonClicked( Action action, int button, Object[] params );
} }
public interface DlgClickRegisterer {
void registerClickNotify( DlgClickNotify cb );
void unregisterClickNotify( DlgClickNotify cb );
}
public interface HasDlgDelegate { public interface HasDlgDelegate {
void showOKOnlyDialog( int msgID ); void showOKOnlyDialog( int msgID );
void showOKOnlyDialog( String msg ); void showOKOnlyDialog( String msg );

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

@ -212,14 +212,12 @@ public class StudyList extends XWListActivity
public void itemClicked( SelectableItem.LongClickHandler clicked, public void itemClicked( SelectableItem.LongClickHandler clicked,
GameSummary summary ) GameSummary summary )
{ {
Assert.assertTrue( clicked instanceof XWListItem );
m_checkeds.add( ((XWListItem)clicked).getPosition() ); m_checkeds.add( ((XWListItem)clicked).getPosition() );
} }
public void itemToggled( SelectableItem.LongClickHandler toggled, public void itemToggled( SelectableItem.LongClickHandler toggled,
boolean selected ) boolean selected )
{ {
Assert.assertTrue( toggled instanceof XWListItem );
int position = ((XWListItem)toggled).getPosition(); int position = ((XWListItem)toggled).getPosition();
if ( selected ) { if ( selected ) {
m_checkeds.add( position ); m_checkeds.add( position );
@ -231,7 +229,6 @@ public class StudyList extends XWListActivity
public boolean getSelected( SelectableItem.LongClickHandler obj ) public boolean getSelected( SelectableItem.LongClickHandler obj )
{ {
Assert.assertTrue( obj instanceof XWListItem );
return m_checkeds.contains( ((XWListItem)obj).getPosition() ); return m_checkeds.contains( ((XWListItem)obj).getPosition() );
} }

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
View file

@ -102,11 +102,6 @@ public class XWActivity extends Activity
return dialog; return dialog;
} }
public void showDialog( DlgID dlgID )
{
super.showDialog( dlgID.ordinal() );
}
// these are duplicated in XWListActivity -- sometimes multiple // these are duplicated in XWListActivity -- sometimes multiple
// inheritance would be nice to have... // inheritance would be nice to have...
protected void showAboutDialog() protected void showAboutDialog()

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

@ -57,7 +57,6 @@ public class XWListItem extends LinearLayout
{ {
super.onFinishInflate(); super.onFinishInflate();
m_checkbox = (CheckBox)findViewById( R.id.checkbox ); m_checkbox = (CheckBox)findViewById( R.id.checkbox );
Assert.assertNotNull( m_checkbox );
m_checkbox.setOnClickListener( this ); m_checkbox.setOnClickListener( this );
} }