From 97c1091d0cd0e311293c8013b381178876237f9c Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 22 Nov 2016 22:10:05 -0800 Subject: [PATCH] add TAG everywhere results of running a script that adds TAG to every top-level class. It compiles, but I'm not using them yet. --- .../src/org/eehouse/android/xw4/BTInviteActivity.java | 1 + .../src/org/eehouse/android/xw4/BTInviteDelegate.java | 1 + .../XWords4/src/org/eehouse/android/xw4/BTReceiver.java | 1 + .../XWords4/src/org/eehouse/android/xw4/BTService.java | 1 + .../XWords4/src/org/eehouse/android/xw4/BoardActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/BoardCanvas.java | 1 + .../src/org/eehouse/android/xw4/BoardContainer.java | 7 ++++--- .../XWords4/src/org/eehouse/android/xw4/BoardDelegate.java | 2 +- .../XWords4/src/org/eehouse/android/xw4/BoardFrag.java | 1 + .../XWords4/src/org/eehouse/android/xw4/BoardView.java | 1 + .../XWords4/src/org/eehouse/android/xw4/ChatActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/ChatDelegate.java | 1 + .../XWords4/src/org/eehouse/android/xw4/ChatFrag.java | 1 + .../src/org/eehouse/android/xw4/ConnViaViewLayout.java | 1 + .../XWords4/src/org/eehouse/android/xw4/DBHelper.java | 1 + .../src/org/eehouse/android/xw4/DictBrowseActivity.java | 1 + .../src/org/eehouse/android/xw4/DictBrowseFrag.java | 1 + .../src/org/eehouse/android/xw4/DictListPreference.java | 1 + .../XWords4/src/org/eehouse/android/xw4/DictsActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/DictsDelegate.java | 2 +- .../XWords4/src/org/eehouse/android/xw4/DictsFrag.java | 1 + .../src/org/eehouse/android/xw4/DispatchNotify.java | 1 + .../XWords4/src/org/eehouse/android/xw4/DlgState.java | 1 + .../src/org/eehouse/android/xw4/DualpaneDelegate.java | 3 ++- .../XWords4/src/org/eehouse/android/xw4/DwnldActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java | 1 + .../src/org/eehouse/android/xw4/EditColorPreference.java | 1 + .../src/org/eehouse/android/xw4/ExpiringLinearLayout.java | 1 + .../src/org/eehouse/android/xw4/GCMIntentService.java | 1 + .../src/org/eehouse/android/xw4/GameConfigActivity.java | 1 + .../src/org/eehouse/android/xw4/GameConfigFrag.java | 1 + .../XWords4/src/org/eehouse/android/xw4/GameNamer.java | 1 + .../XWords4/src/org/eehouse/android/xw4/GamesListFrag.java | 1 + .../src/org/eehouse/android/xw4/LangListPreference.java | 1 + .../src/org/eehouse/android/xw4/ListDelegateBase.java | 1 + .../XWords4/src/org/eehouse/android/xw4/MainActivity.java | 2 +- .../src/org/eehouse/android/xw4/MountEventReceiver.java | 1 + .../XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java | 1 + .../src/org/eehouse/android/xw4/NagTurnReceiver.java | 1 + .../XWords4/src/org/eehouse/android/xw4/NotAgainView.java | 1 + .../src/org/eehouse/android/xw4/OnBootReceiver.java | 1 + .../src/org/eehouse/android/xw4/RefreshNamesTask.java | 1 + .../org/eehouse/android/xw4/RelayCheckBoxPreference.java | 1 + .../src/org/eehouse/android/xw4/RelayInviteActivity.java | 1 + .../src/org/eehouse/android/xw4/RelayInviteDelegate.java | 1 + .../XWords4/src/org/eehouse/android/xw4/RelayReceiver.java | 1 + .../src/org/eehouse/android/xw4/SMSCheckBoxPreference.java | 1 + .../src/org/eehouse/android/xw4/SMSInviteActivity.java | 1 + .../src/org/eehouse/android/xw4/SMSInviteDelegate.java | 1 + .../XWords4/src/org/eehouse/android/xw4/SMSListItem.java | 1 + .../XWords4/src/org/eehouse/android/xw4/SMSReceiver.java | 1 + .../XWords4/src/org/eehouse/android/xw4/SMSService.java | 1 + .../src/org/eehouse/android/xw4/StudyListActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/StudyListFrag.java | 1 + .../XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java | 1 + .../XWords4/src/org/eehouse/android/xw4/Toolbar.java | 1 + .../src/org/eehouse/android/xw4/UpdateCheckReceiver.java | 1 + .../src/org/eehouse/android/xw4/WiDirInviteActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/WiDirService.java | 5 +++-- .../XWords4/src/org/eehouse/android/xw4/XWActivity.java | 1 + .../android/XWords4/src/org/eehouse/android/xw4/XWApp.java | 1 + .../src/org/eehouse/android/xw4/XWConnAddrPreference.java | 1 + .../src/org/eehouse/android/xw4/XWDevIDPreference.java | 1 + .../src/org/eehouse/android/xw4/XWEditTextPreference.java | 1 + .../XWords4/src/org/eehouse/android/xw4/XWFragment.java | 2 +- .../src/org/eehouse/android/xw4/XWListPreference.java | 1 + .../src/org/eehouse/android/xw4/XWSumListPreference.java | 1 + .../src/org/eehouse/android/xw4/XWThumbListPreference.java | 1 + .../src/org/eehouse/android/xw4/jni/CommonPrefs.java | 1 + .../XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java | 1 + .../XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java | 2 +- .../src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java | 1 + .../src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java | 1 + .../src/org/eehouse/android/xw4/loc/LocActivity.java | 1 + .../XWords4/src/org/eehouse/android/xw4/loc/LocIDs.java | 1 + .../org/eehouse/android/xw4/loc/LocItemEditActivity.java | 1 + .../org/eehouse/android/xw4/loc/LocItemEditDelegate.java | 1 + .../src/org/eehouse/android/xw4/loc/LocListAdapter.java | 1 + .../src/org/eehouse/android/xw4/loc/LocListItem.java | 1 + .../org/eehouse/android/xw4/loc/XlatingSpinnerAdapter.java | 1 + 80 files changed, 86 insertions(+), 11 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java index a69c86e3f..265c89fd6 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class BTInviteActivity extends InviteActivity { + private static final String TAG = BTInviteActivity.class.getSimpleName(); @Override protected void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java index 0acdb5bc9..a453a695c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Set; public class BTInviteDelegate extends InviteDelegate { + private static final String TAG = BTInviteDelegate.class.getSimpleName(); private Activity m_activity; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java index 2113718e4..426067f42 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.Intent; public class BTReceiver extends BroadcastReceiver { + private static final String TAG = BTReceiver.class.getSimpleName(); @Override public void onReceive( Context context, Intent intent ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java index 0cebf4d17..f290a5d91 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java @@ -53,6 +53,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; public class BTService extends XWService { + private static final String TAG = BTService.class.getSimpleName(); private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00"; private static final long RESEND_TIMEOUT = 5; // seconds diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index 1669a64e0..c3cfcbb4e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -28,6 +28,7 @@ import android.view.Window; import org.eehouse.android.xw4.jni.CommonPrefs; public class BoardActivity extends XWActivity { + private static final String TAG = BoardActivity.class.getSimpleName(); private BoardDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java index 674890ba2..4e7b53745 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java @@ -43,6 +43,7 @@ import org.eehouse.android.xw4.jni.XwJNI.DictWrapper; import org.eehouse.android.xw4.loc.LocUtils; public class BoardCanvas extends Canvas implements DrawCtx { + private static final String TAG = BoardCanvas.class.getSimpleName(); private static final int BLACK = 0xFF000000; private static final int WHITE = 0xFFFFFFFF; private static final int FRAME_GREY = 0xFF101010; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java index a7e9f477a..64d7f1867 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java @@ -32,6 +32,7 @@ import android.graphics.Rect; import junit.framework.Assert; public class BoardContainer extends ViewGroup { + private static final String TAG = BoardContainer.class.getSimpleName(); // If the ratio of height/width exceeds this, use portrait layout private static final int PORTRAIT_THRESHHOLD = 105; @@ -54,7 +55,7 @@ public class BoardContainer extends ViewGroup { void sizeChanged( int width, int height, boolean isPortrait ); } private static WeakReference s_scl; - + public static void registerSizeChangeListener(SizeChangeListener scl) { s_scl = new WeakReference(scl); @@ -62,7 +63,7 @@ public class BoardContainer extends ViewGroup { } public static boolean getIsPortrait() { return s_isPortrait; } - + public BoardContainer( Context context, AttributeSet as ) { super( context, as ); s_height = s_width = 0; @@ -158,7 +159,7 @@ public class BoardContainer extends ViewGroup { .setVisibility( s_isPortrait ? VISIBLE : GONE ); findViewById( R.id.tbar_parent_vert ) .setVisibility( s_isPortrait ? GONE : VISIBLE ); - + callSCL(); } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java index e6e93ca38..3ebce3430 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java @@ -2039,7 +2039,7 @@ public class BoardDelegate extends DelegateBase m_handler = new Handler(); m_blockingDlgID = DlgID.NONE; - m_jniThreadRef.configure( m_activity, m_view, m_utils, this, + m_jniThreadRef.configure( m_activity, m_view, m_utils, this, makeJNIHandler() ); m_jniGamePtr = m_jniThreadRef.getGamePtr(); Assert.assertNotNull( m_jniGamePtr ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardFrag.java index b100f715e..ce63c8df2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardFrag.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class BoardFrag extends XWFragment { + private static final String TAG = BoardFrag.class.getSimpleName(); public BoardFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java index f8032633a..3a971180d 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java @@ -43,6 +43,7 @@ import org.eehouse.android.xw4.jni.SyncedDraw; import org.eehouse.android.xw4.jni.XwJNI; public class BoardView extends View implements BoardHandler, SyncedDraw { + private static final String TAG = BoardView.class.getSimpleName(); private static final float MIN_FONT_DIPS = 10.0f; private static final int MULTI_INACTIVE = -1; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatActivity.java index dc3843d7b..b72a502d5 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class ChatActivity extends XWActivity { + private static final String TAG = ChatActivity.class.getSimpleName(); @Override public void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java index b8744a78a..08328bde7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java @@ -43,6 +43,7 @@ import org.eehouse.android.xw4.DlgDelegate.Action; import org.eehouse.android.xw4.jni.JNIThread; public class ChatDelegate extends DelegateBase { + private static final String TAG = ChatDelegate.class.getSimpleName(); private static final String INTENT_KEY_PLAYER = "intent_key_player"; private static final String INTENT_KEY_NAMES = "intent_key_names"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatFrag.java index ac6309e3f..abc9dfbe1 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatFrag.java @@ -22,6 +22,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class ChatFrag extends XWFragment { + private static final String TAG = ChatFrag.class.getSimpleName(); public ChatFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnViaViewLayout.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnViaViewLayout.java index 8b3b675b7..7b87a59dd 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnViaViewLayout.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ConnViaViewLayout.java @@ -34,6 +34,7 @@ import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet; import org.eehouse.android.xw4.loc.LocUtils; public class ConnViaViewLayout extends LinearLayout { + private static final String TAG = ConnViaViewLayout.class.getSimpleName(); private CommsConnTypeSet m_curSet; private DlgDelegate.HasDlgDelegate m_dlgDlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java index fc95d268f..af81b17aa 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; public class DBHelper extends SQLiteOpenHelper { + private static final String TAG = DBHelper.class.getSimpleName(); public static final String TABLE_NAME_SUM = "summaries"; public static final String TABLE_NAME_OBITS = "obits"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java index acf7ceecc..885f9e494 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class DictBrowseActivity extends XWActivity { + private static final String TAG = DictBrowseActivity.class.getSimpleName(); private DictBrowseDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseFrag.java index 5af311b33..8fa05f204 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseFrag.java @@ -22,6 +22,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class DictBrowseFrag extends XWFragment { + private static final String TAG = DictBrowseFrag.class.getSimpleName(); public DictBrowseFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictListPreference.java index b7dbf1326..79c7175c0 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictListPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictListPreference.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import java.util.ArrayList; public class DictListPreference extends XWListPreference { + private static final String TAG = DictListPreference.class.getSimpleName(); public DictListPreference( Context context, AttributeSet attrs ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java index 44306e1f2..0c2b91d7e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class DictsActivity extends XWActivity { + private static final String TAG = DictsActivity.class.getSimpleName(); // I can't provide a subclass of MenuItem to hold DictAndLoc, so // settle for a hash on the side. diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java index 56fbc8fc0..efa03f7cb 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java @@ -385,7 +385,7 @@ public class DictsDelegate extends ListDelegateBase if ( fromLoc == toLoc ) { DbgUtils.logw( getClass(), "not moving %s: same loc", name ); } else if ( DictUtils.moveDict( self.m_activity, - name, fromLoc, + name, fromLoc, toLoc ) ) { selItem.setComment( self.m_locNames[toLoc.ordinal()] ); selItem.setCached( toLoc ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsFrag.java index e6fabfc9a..4fc9767e8 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsFrag.java @@ -22,6 +22,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class DictsFrag extends XWFragment { + private static final String TAG = DictsFrag.class.getSimpleName(); public DictsFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java index 6d97333e4..53cd9d197 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java @@ -25,6 +25,7 @@ import android.net.Uri; import android.os.Bundle; public class DispatchNotify extends Activity { + private static final String TAG = DispatchNotify.class.getSimpleName(); @Override protected void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java index 3244a21e1..59c2eaad7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java @@ -27,6 +27,7 @@ import org.eehouse.android.xw4.DlgDelegate.Action; import org.eehouse.android.xw4.DlgDelegate.ActionPair; public class DlgState implements Parcelable { + private static final String TAG = DlgState.class.getSimpleName(); public DlgID m_id; public String m_msg; public int m_posButton; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java index d8099ae1b..a13b84f08 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java @@ -30,6 +30,7 @@ import android.view.MenuItem; import android.view.View; public class DualpaneDelegate extends DelegateBase { + private static final String TAG = DualpaneDelegate.class.getSimpleName(); private Activity m_activity; public DualpaneDelegate( Delegator delegator, Bundle sis ) @@ -80,7 +81,7 @@ public class DualpaneDelegate extends DelegateBase { } @Override - protected void onCreateContextMenu( ContextMenu menu, View view, + protected void onCreateContextMenu( ContextMenu menu, View view, ContextMenuInfo menuInfo ) { MainActivity main = (MainActivity)m_activity; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java index 66b2d9d50..498fb2099 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.view.Window; public class DwnldActivity extends XWActivity { + private static final String TAG = DwnldActivity.class.getSimpleName(); @Override protected void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java index d1764d6cd..a6d3ba880 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Map; public class DwnldDelegate extends ListDelegateBase { + private static final String TAG = DwnldDelegate.class.getSimpleName(); // URIs coming in in intents private static final String APK_EXTRA = "APK"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java index 729f7e8f8..1310a98ab 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/EditColorPreference.java @@ -36,6 +36,7 @@ import android.widget.SeekBar; import org.eehouse.android.xw4.loc.LocUtils; public class EditColorPreference extends DialogPreference { + private static final String TAG = EditColorPreference.class.getSimpleName(); private Context m_context; private int m_curColor; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ExpiringLinearLayout.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ExpiringLinearLayout.java index 3c82fe77e..e2e5a6fc6 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ExpiringLinearLayout.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ExpiringLinearLayout.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import android.widget.LinearLayout; public class ExpiringLinearLayout extends LinearLayout { + private static final String TAG = ExpiringLinearLayout.class.getSimpleName(); private ExpiringDelegate m_delegate; public ExpiringLinearLayout( Context context, AttributeSet as ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java index 95e8666f2..b9b18851e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java @@ -30,6 +30,7 @@ import com.google.android.gcm.GCMRegistrar; import org.json.JSONArray; public class GCMIntentService extends GCMBaseIntentService { + private static final String TAG = GCMIntentService.class.getSimpleName(); public GCMIntentService() { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java index ba5095dc0..7452382af 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class GameConfigActivity extends XWActivity { + private static final String TAG = GameConfigActivity.class.getSimpleName(); @Override public void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigFrag.java index 8cc70b57d..85996aa5e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigFrag.java @@ -22,6 +22,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class GameConfigFrag extends XWFragment { + private static final String TAG = GameConfigFrag.class.getSimpleName(); public GameConfigFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameNamer.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameNamer.java index f661d8b37..f3fea56f0 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameNamer.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameNamer.java @@ -30,6 +30,7 @@ import android.widget.TextView; import org.eehouse.android.xw4.loc.LocUtils; public class GameNamer extends LinearLayout { + private static final String TAG = GameNamer.class.getSimpleName(); private Context m_context; 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 acde048cb..f435720ce 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListFrag.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class GamesListFrag extends XWFragment { + private static final String TAG = GamesListFrag.class.getSimpleName(); public GamesListFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/LangListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/LangListPreference.java index 8852fee69..9f87da8a7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/LangListPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/LangListPreference.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import org.eehouse.android.xw4.loc.LocUtils; public class LangListPreference extends XWListPreference { + private static final String TAG = LangListPreference.class.getSimpleName(); private Context m_context; public LangListPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java index e5aba048e..fbe4b979c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java @@ -26,6 +26,7 @@ import android.widget.ListAdapter; import android.widget.ListView; public class ListDelegateBase extends DelegateBase { + private static final String TAG = ListDelegateBase.class.getSimpleName(); private Activity m_activity; private Delegator m_delegator; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java index 2c6785447..5b4978f2b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java @@ -237,7 +237,7 @@ public class MainActivity extends XWActivity return handled; } - protected void dispatchOnActivityResult( RequestCode requestCode, + protected void dispatchOnActivityResult( RequestCode requestCode, int resultCode, Intent data ) { XWFragment frag = getTopFragment(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MountEventReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MountEventReceiver.java index 750d56b74..b2e68d197 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MountEventReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MountEventReceiver.java @@ -28,6 +28,7 @@ import java.util.HashSet; import java.util.Iterator; public class MountEventReceiver extends BroadcastReceiver { + private static final String TAG = MountEventReceiver.class.getSimpleName(); public interface SDCardNotifiee { void cardMounted( boolean nowMounted ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java index 4f9bbacf9..691ad6090 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java @@ -32,6 +32,7 @@ import java.util.HashSet; import java.util.Set; public class MultiMsgSink implements TransportProcs { + private static final String TAG = MultiMsgSink.class.getSimpleName(); private long m_rowid; private Context m_context; // Use set to count so message sent over both BT and Relay is counted only diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NagTurnReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NagTurnReceiver.java index 896c9350b..616dbd3ff 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NagTurnReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NagTurnReceiver.java @@ -38,6 +38,7 @@ import java.util.Date; import java.util.Iterator; public class NagTurnReceiver extends BroadcastReceiver { + private static final String TAG = NagTurnReceiver.class.getSimpleName(); private static final long INTERVAL_MILLIS = 1000 * 30; // every half minute for now private static final long[] NAG_INTERVAL_SECONDS = {// 2*60, // two minutes (for testing) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NotAgainView.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NotAgainView.java index 3a241c586..7ea4c86f3 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NotAgainView.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NotAgainView.java @@ -28,6 +28,7 @@ import android.widget.ScrollView; import android.widget.TextView; public class NotAgainView extends ScrollView { + private static final String TAG = NotAgainView.class.getSimpleName(); public NotAgainView( Context cx, AttributeSet as ) { super( cx, as ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/OnBootReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/OnBootReceiver.java index 3f3e1ce54..a95fe5bf7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/OnBootReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/OnBootReceiver.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.Intent; public class OnBootReceiver extends BroadcastReceiver { + private static final String TAG = OnBootReceiver.class.getSimpleName(); @Override public void onReceive( Context context, Intent intent ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java index cdc139b47..864c888d9 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java @@ -34,6 +34,7 @@ import java.net.Socket; import java.util.ArrayList; public class RefreshNamesTask extends AsyncTask { + private static final String TAG = RefreshNamesTask.class.getSimpleName(); public interface NoNameFound { public void NoNameFound(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayCheckBoxPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayCheckBoxPreference.java index aa940eca6..c391ade39 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayCheckBoxPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayCheckBoxPreference.java @@ -27,6 +27,7 @@ import org.eehouse.android.xw4.DlgDelegate.Action; import org.eehouse.android.xw4.loc.LocUtils; public class RelayCheckBoxPreference extends ConfirmingCheckBoxPreference { + private static final String TAG = RelayCheckBoxPreference.class.getSimpleName(); private static ConfirmingCheckBoxPreference s_this = null; public RelayCheckBoxPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteActivity.java index fcba6c65f..1711a0d87 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class RelayInviteActivity extends InviteActivity { + private static final String TAG = RelayInviteActivity.class.getSimpleName(); private RelayInviteDelegate m_dlgt; @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteDelegate.java index a7b03df89..4fea0d3f2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayInviteDelegate.java @@ -49,6 +49,7 @@ import java.util.Iterator; import java.util.Set; public class RelayInviteDelegate extends InviteDelegate { + private static final String TAG = RelayInviteDelegate.class.getSimpleName(); // private static final int GET_CONTACT = 1; private static final String SAVE_NAME = "SAVE_NAME"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayReceiver.java index 694325726..41b9a324c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayReceiver.java @@ -28,6 +28,7 @@ import android.content.Intent; import android.os.SystemClock; public class RelayReceiver extends BroadcastReceiver { + private static final String TAG = RelayReceiver.class.getSimpleName(); @Override public void onReceive( Context context, Intent intent ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java index 78ee3137c..132451707 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSCheckBoxPreference.java @@ -27,6 +27,7 @@ import java.lang.ref.WeakReference; import org.eehouse.android.xw4.DlgDelegate.Action; public class SMSCheckBoxPreference extends ConfirmingCheckBoxPreference { + private static final String TAG = SMSCheckBoxPreference.class.getSimpleName(); private static WeakReference s_this = null; public SMSCheckBoxPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteActivity.java index 1a146e278..1670a7939 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class SMSInviteActivity extends InviteActivity { + private static final String TAG = SMSInviteActivity.class.getSimpleName(); private SMSInviteDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java index f20185eb2..e71020ae3 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java @@ -51,6 +51,7 @@ import java.util.Comparator; import java.util.Iterator; public class SMSInviteDelegate extends InviteDelegate { + private static final String TAG = SMSInviteDelegate.class.getSimpleName(); private static final String SAVE_NAME = "SAVE_NAME"; private static final String SAVE_NUMBER = "SAVE_NUMBER"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSListItem.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSListItem.java index 515cb8d2b..f748a6e90 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSListItem.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSListItem.java @@ -28,6 +28,7 @@ import android.widget.LinearLayout; import android.widget.TextView; public class SMSListItem extends LinearLayout { + private static final String TAG = SMSListItem.class.getSimpleName(); public SMSListItem( Context cx, AttributeSet as ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java index bb258f942..770c450b0 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSReceiver.java @@ -27,6 +27,7 @@ import android.os.Bundle; import android.telephony.SmsMessage; public class SMSReceiver extends BroadcastReceiver { + private static final String TAG = SMSReceiver.class.getSimpleName(); @Override public void onReceive( Context context, Intent intent ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java index 69e368be8..c70de4391 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java @@ -53,6 +53,7 @@ import java.util.Map; import java.util.Set; public class SMSService extends XWService { + private static final String TAG = SMSService.class.getSimpleName(); private static final String INSTALL_URL = "http://eehouse.org/_/a.py/a "; private static final int MAX_SMS_LEN = 140; // ??? differs by network diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListActivity.java index 019e5190b..b8902d583 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListActivity.java @@ -22,6 +22,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class StudyListActivity extends XWActivity { + private static final String TAG = StudyListActivity.class.getSimpleName(); @Override protected void onCreate( Bundle savedInstanceState ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListFrag.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListFrag.java index 1ac42740f..5caed01ef 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListFrag.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListFrag.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class StudyListFrag extends XWFragment { + private static final String TAG = StudyListFrag.class.getSimpleName(); public StudyListFrag() {} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java index 837c762bc..3e302d113 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java @@ -27,6 +27,7 @@ import android.graphics.Rect; import org.eehouse.android.xw4.jni.XwJNI; public class ThumbCanvas extends BoardCanvas { + private static final String TAG = ThumbCanvas.class.getSimpleName(); public ThumbCanvas( Context context, Bitmap bitmap ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java index 5c24de5ff..ab77f5369 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java @@ -39,6 +39,7 @@ import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate; import org.eehouse.android.xw4.loc.LocUtils; public class Toolbar implements BoardContainer.SizeChangeListener { + private static final String TAG = Toolbar.class.getSimpleName(); public enum Buttons { BUTTON_BROWSE_DICT(R.id.dictlist_button), BUTTON_HINT_PREV(R.id.prevhint_button), diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java index 529a28c4b..88391a262 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java @@ -39,6 +39,7 @@ import java.io.File; import java.net.HttpURLConnection; public class UpdateCheckReceiver extends BroadcastReceiver { + private static final String TAG = UpdateCheckReceiver.class.getSimpleName(); public static final String NEW_DICT_URL = "NEW_DICT_URL"; public static final String NEW_DICT_LOC = "NEW_DICT_LOC"; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirInviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirInviteActivity.java index 595a4b2cb..e6f7caf02 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirInviteActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirInviteActivity.java @@ -23,6 +23,7 @@ package org.eehouse.android.xw4; import android.os.Bundle; public class WiDirInviteActivity extends InviteActivity { + private static final String TAG = WiDirInviteActivity.class.getSimpleName(); private WiDirInviteDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java index c3d5e3862..8433355af 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java @@ -70,6 +70,7 @@ import org.eehouse.android.xw4.loc.LocUtils; import junit.framework.Assert; public class WiDirService extends XWService { + private static final String TAG = WiDirService.class.getSimpleName(); private static final Class CLAZZ = WiDirService.class; private static final String MAC_ADDR_KEY = "p2p_mac_addr"; private static final String SERVICE_NAME = "srvc_" + BuildConstants.VARIANT; @@ -298,7 +299,7 @@ public class WiDirService extends XWService { } return nSent; } - + public static void activityResumed( Activity activity ) { if ( WIFI_DIRECT_ENABLED ) { @@ -854,7 +855,7 @@ public class WiDirService extends XWService { DbgUtils.loge( CLAZZ, "can't forward; not group owner (any more?)" ); } } - + private static void startAcceptThread() { sAmServer = true; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java index ca4cb3223..4fd46961c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java @@ -37,6 +37,7 @@ import android.widget.ListView; import junit.framework.Assert; public class XWActivity extends FragmentActivity implements Delegator { + private static final String TAG = XWActivity.class.getSimpleName(); private DelegateBase m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java index bd42d8b7f..39ba51c87 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java @@ -33,6 +33,7 @@ import java.util.UUID; import junit.framework.Assert; public class XWApp extends Application { + private static final String TAG = XWApp.class.getSimpleName(); public static final boolean BTSUPPORTED = true; public static final boolean SMSSUPPORTED = true; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConnAddrPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConnAddrPreference.java index 2c3a76a81..3cb96da17 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConnAddrPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConnAddrPreference.java @@ -35,6 +35,7 @@ import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet; import org.eehouse.android.xw4.loc.LocUtils; public class XWConnAddrPreference extends DialogPreference { + private static final String TAG = XWConnAddrPreference.class.getSimpleName(); private Context m_context; private ConnViaViewLayout m_view; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWDevIDPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWDevIDPreference.java index fdf164b0d..ea0aa29a7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWDevIDPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWDevIDPreference.java @@ -25,6 +25,7 @@ import android.preference.EditTextPreference; import android.util.AttributeSet; public class XWDevIDPreference extends EditTextPreference { + private static final String TAG = XWDevIDPreference.class.getSimpleName(); private Context m_context; public XWDevIDPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWEditTextPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWEditTextPreference.java index 35c7cca19..3c6a17fb4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWEditTextPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWEditTextPreference.java @@ -25,6 +25,7 @@ import android.preference.EditTextPreference; import android.util.AttributeSet; public class XWEditTextPreference extends EditTextPreference { + private static final String TAG = XWEditTextPreference.class.getSimpleName(); public XWEditTextPreference( Context context, AttributeSet attrs ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWFragment.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWFragment.java index 009279177..ec80eb85b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWFragment.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWFragment.java @@ -153,7 +153,7 @@ abstract class XWFragment extends Fragment implements Delegator { public void onActivityResult( int requestCode, int resultCode, Intent data ) { DbgUtils.logd( getClass(), "onActivityResult() called" ); - m_dlgt.onActivityResult( RequestCode.values()[requestCode], + m_dlgt.onActivityResult( RequestCode.values()[requestCode], resultCode, data ); } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java index fc36feb9a..3662df618 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java @@ -27,6 +27,7 @@ import android.util.AttributeSet; import org.eehouse.android.xw4.loc.LocUtils; public class XWListPreference extends ListPreference { + private static final String TAG = XWListPreference.class.getSimpleName(); protected Context m_context; public XWListPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java index 77ce5df5a..0ea5c678d 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java @@ -27,6 +27,7 @@ import org.eehouse.android.xw4.loc.LocUtils; public class XWSumListPreference extends XWListPreference { + private static final String TAG = XWSumListPreference.class.getSimpleName(); private static final int[] s_ADDROWS = { R.string.game_summary_field_npackets, diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java index 163a2583e..77bd1af4e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java @@ -26,6 +26,7 @@ import android.util.AttributeSet; import org.eehouse.android.xw4.loc.LocUtils; public class XWThumbListPreference extends XWListPreference { + private static final String TAG = XWThumbListPreference.class.getSimpleName(); private Context m_context; public XWThumbListPreference( Context context, AttributeSet attrs ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java index ffb59426e..079fd3911 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java @@ -32,6 +32,7 @@ import org.eehouse.android.xw4.XWPrefs; import org.eehouse.android.xw4.loc.LocUtils; public class CommonPrefs extends XWPrefs { + private static final String TAG = CommonPrefs.class.getSimpleName(); public static final int COLOR_TILE_BACK = 0; public static final int COLOR_NOTILE = 1; public static final int COLOR_FOCUS = 2; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java index 773ea2ff5..ecc0be57d 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java @@ -49,6 +49,7 @@ import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; public class JNIThread extends Thread { + private static final String TAG = JNIThread.class.getSimpleName(); public enum JNICmd { CMD_NONE, // CMD_RUN, diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java index 7f2b07af5..d216984ea 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtils.java @@ -26,4 +26,4 @@ public interface JNIUtils { String[][] splitFaces( byte[] chars, boolean isUTF8 ); String getMD5SumFor( byte[] bytes ); String getMD5SumFor( String dictName, byte[] bytes ); -} \ No newline at end of file +} diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java index 8727715f6..ea7a82d60 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIUtilsImpl.java @@ -34,6 +34,7 @@ import java.security.MessageDigest; import java.util.ArrayList; public class JNIUtilsImpl implements JNIUtils { + private static final String TAG = JNIUtilsImpl.class.getSimpleName(); private static final char SYNONYM_DELIM = ' '; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java index 1d7db33b8..16abc0c81 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java @@ -33,6 +33,7 @@ import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet; import org.eehouse.android.xw4.loc.LocUtils; public class UtilCtxtImpl implements UtilCtxt { + private static final String TAG = UtilCtxtImpl.class.getSimpleName(); private Context m_context; private UtilCtxtImpl() {} // force subclasses to pass context diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocActivity.java index 564433444..ec20574c3 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocActivity.java @@ -24,6 +24,7 @@ import android.os.Bundle; import org.eehouse.android.xw4.XWActivity; public class LocActivity extends XWActivity { + private static final String TAG = LocActivity.class.getSimpleName(); private LocDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocIDs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocIDs.java index 8cdcfc7f8..f54ee64ab 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocIDs.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocIDs.java @@ -27,6 +27,7 @@ import org.eehouse.android.xw4.DbgUtils; import java.util.HashMap; public class LocIDs extends LocIDsData { + private static final String TAG = LocIDs.class.getSimpleName(); private static String[] s_keys; private static HashMap S_MAP = null; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditActivity.java index 4c7394e53..cad04a351 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditActivity.java @@ -25,6 +25,7 @@ import android.os.Bundle; import org.eehouse.android.xw4.XWActivity; public class LocItemEditActivity extends XWActivity { + private static final String TAG = LocItemEditActivity.class.getSimpleName(); private LocItemEditDelegate m_dlgt; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java index f59ce2590..5ca336a19 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java @@ -44,6 +44,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class LocItemEditDelegate extends DelegateBase implements TextWatcher { + private static final String TAG = LocItemEditDelegate.class.getSimpleName(); private static final String KEY = "KEY"; private Activity m_activity; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListAdapter.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListAdapter.java index 82e1b9f71..4512483d2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListAdapter.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListAdapter.java @@ -28,6 +28,7 @@ import android.widget.ListView; import org.eehouse.android.xw4.XWListAdapter; public class LocListAdapter extends XWListAdapter { + private static final String TAG = LocListAdapter.class.getSimpleName(); private Context m_context; private ListView m_listView; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListItem.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListItem.java index 886bc4ca8..ad56168f7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListItem.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocListItem.java @@ -29,6 +29,7 @@ import android.widget.TextView; import org.eehouse.android.xw4.R; public class LocListItem extends LinearLayout { + private static final String TAG = LocListItem.class.getSimpleName(); protected static final int LOCAL_COLOR = Color.argb( 0xFF, 0x7f, 0x00, 0x00 ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/XlatingSpinnerAdapter.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/XlatingSpinnerAdapter.java index 33029d539..961db9e6b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/XlatingSpinnerAdapter.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/XlatingSpinnerAdapter.java @@ -26,6 +26,7 @@ import android.view.ViewGroup; import android.widget.SpinnerAdapter; public class XlatingSpinnerAdapter implements SpinnerAdapter { + private static final String TAG = XlatingSpinnerAdapter.class.getSimpleName(); private SpinnerAdapter m_adapter; private Context m_context;