From ab26e263ef7ec38748f6e745c5e0bc04b442bb32 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 14 Mar 2016 22:01:55 -0700 Subject: [PATCH] cleanup: remove unnecessary file. --- .../org/eehouse/android/xw4/FragActivity.java | 6 ----- .../android/xw4/GamesListActivity.java | 2 +- .../android/xw4/GamesListDelegate.java | 2 +- .../android/xw4/GamesListDelegator.java | 27 ------------------- .../eehouse/android/xw4/GamesListFrag.java | 12 +-------- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegator.java diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java index cd93c22c6..51c415069 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java @@ -260,12 +260,6 @@ public class FragActivity extends FragmentActivity return s_this; } - public static void launchGame( long rowid, boolean invited ) - { - Bundle args = GameUtils.makeLaunchExtras( rowid, invited ); - addFragment( new BoardFrag(), args ); - } - public static void addFragment( Fragment fragment, Bundle bundle ) { addFragment( fragment, bundle, null ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java index 8245b0264..dae8065ad 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java @@ -29,7 +29,7 @@ import org.eehouse.android.xw4.jni.CurGameInfo; import junit.framework.Assert; -public class GamesListActivity extends XWActivity implements GamesListDelegator { +public class GamesListActivity extends XWActivity { private GamesListDelegate m_dlgt; @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java index ea88b5f4c..54a0461fe 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java @@ -592,7 +592,7 @@ public class GamesListDelegate extends ListDelegateBase private Intent m_rematchIntent; private Object[] m_newGameParams; - public GamesListDelegate( GamesListDelegator delegator, Bundle sis ) + public GamesListDelegate( Delegator delegator, Bundle sis ) { super( delegator, sis, R.layout.game_list, R.menu.games_list_menu ); m_activity = delegator.getActivity(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegator.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegator.java deleted file mode 100644 index e18d04937..000000000 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegator.java +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- compile-command: "find-and-ant.sh debug install"; -*- */ -/* - * Copyright 2014 by Eric House (xwords@eehouse.org). All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package org.eehouse.android.xw4; - -// import android.widget.ListAdapter; -// import android.widget.ListView; - -public interface GamesListDelegator extends Delegator { - void launchGame( long rowID, boolean invited ); -} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java index ee7c4d4b7..bf72ac950 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java @@ -40,7 +40,7 @@ import junit.framework.Assert; import org.eehouse.android.xw4.jni.CommonPrefs; import org.eehouse.android.xw4.loc.LocUtils; -public class GamesListFrag extends XWFragment implements GamesListDelegator { +public class GamesListFrag extends XWFragment { private GamesListDelegate m_dlgt; @@ -63,14 +63,4 @@ public class GamesListFrag extends XWFragment implements GamesListDelegator { super.onActivityCreated( savedInstanceState ); setHasOptionsMenu( true ); } - - ////////////////////////////////////////////////////////////////////// - // ListDelegator interface - ////////////////////////////////////////////////////////////////////// - public void launchGame( long rowid, boolean invited ) - { - DbgUtils.logf( "GamesListFrag.launchGame(%d)", rowid ); - FragActivity.launchGame( rowid, invited ); - } - }