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 cbf17df1b..75a7e87f0 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -8,19 +8,14 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MenuInflater; import android.view.KeyEvent; -import android.content.res.AssetManager; -import java.io.InputStream; import android.os.Handler; import android.os.Message; -import java.io.FileOutputStream; -import java.io.FileInputStream; import android.content.Intent; import java.util.concurrent.Semaphore; import android.net.Uri; import android.app.Dialog; import android.app.AlertDialog; import android.content.DialogInterface; -import android.content.res.Resources; import android.widget.Toast; import junit.framework.Assert; import android.content.res.Configuration; @@ -61,7 +56,6 @@ public class BoardActivity extends Activity implements UtilCtxt { private JNIThread m_jniThread; public class TimerRunnable implements Runnable { - private int m_gamePtr; private int m_why; private int m_when; private int m_handle; 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 740fd4b17..00479396b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java @@ -14,7 +14,6 @@ import android.view.MotionEvent; import android.graphics.drawable.Drawable; import android.graphics.drawable.BitmapDrawable; import android.content.res.Resources; -import android.graphics.Paint.FontMetrics; import android.graphics.Paint.FontMetricsInt; import junit.framework.Assert; @@ -374,7 +373,6 @@ public class BoardView extends View implements DrawCtx, BoardHandler, } else { m_fillPaint.setColor( foreColor ); if ( null == bitmaps ) { - int useHt = rect.height() - 4; drawCentered( text, rect, m_fontDims ); } else { drawBestBitmap( bitmaps, rect ); @@ -546,7 +544,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler, BitmapDrawable[] bitmaps, int val, int flags, boolean clearBack ) { - boolean valHidden = (flags & CELL_VALHIDDEN) != 0; + // boolean valHidden = (flags & CELL_VALHIDDEN) != 0; boolean notEmpty = (flags & CELL_ISEMPTY) == 0; boolean isCursor = (flags & CELL_ISCURSOR) != 0; @@ -666,7 +664,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler, Bitmap.Config.ARGB_8888 ); Canvas canvas = new Canvas( bitmap ); - FontMetrics fmi = paint.getFontMetrics(); + // FontMetrics fmi = paint.getFontMetrics(); // Utils.logf( "ascent: " + fmi.ascent ); // Utils.logf( "bottom: " + fmi.bottom ); // Utils.logf( "descent: " + fmi.descent ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java index 28228f953..0f73dbbdf 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java @@ -5,7 +5,6 @@ package org.eehouse.android.xw4; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; import java.nio.channels.SelectionKey; -import java.nio.channels.spi.SelectorProvider; import java.nio.channels.ClosedChannelException; import java.nio.ByteBuffer; import java.net.InetSocketAddress; @@ -21,7 +20,6 @@ import android.os.Message; import org.eehouse.android.xw4.jni.*; import org.eehouse.android.xw4.jni.JNIThread.*; -import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; public class CommsTransport extends Thread implements TransportProcs { @@ -43,7 +41,6 @@ public class CommsTransport extends Thread implements TransportProcs { private ByteBuffer m_bytesIn; private Context m_context; - private DeviceRole m_role; // assembling inbound packet private byte[] m_packetIn; @@ -55,7 +52,6 @@ public class CommsTransport extends Thread implements TransportProcs { m_jniGamePtr = jniGamePtr; m_context = context; m_handler = handler; - m_role = role; m_buffersOut = new Vector(); m_bytesIn = ByteBuffer.allocate( 2048 ); } @@ -118,7 +114,7 @@ public class CommsTransport extends Thread implements TransportProcs { break; } - Iterator iter = m_selector.selectedKeys().iterator(); + Iterator iter = m_selector.selectedKeys().iterator(); while ( iter.hasNext() ) { SelectionKey key = (SelectionKey)iter.next(); SocketChannel channel = (SocketChannel)key.channel(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictActivity.java index 2bf839c13..9d16b63ef 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictActivity.java @@ -3,14 +3,10 @@ package org.eehouse.android.xw4; import android.app.Activity; -import android.app.ListActivity; import android.webkit.WebView; import android.os.Bundle; import android.webkit.DownloadListener; -import org.eehouse.android.xw4.jni.*; - - public class DictActivity extends Activity { private WebView m_webview; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java index 95b85caa2..a023b501e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java @@ -19,35 +19,17 @@ package org.eehouse.android.xw4; import android.app.Activity; -import android.content.ComponentName; -import android.content.ContentValues; -import android.content.Context; import android.content.Intent; -import android.database.Cursor; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.util.AttributeSet; -import android.util.Log; import java.util.ArrayList; import android.view.Menu; import android.view.MenuItem; import android.widget.EditText; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; -import android.widget.ListView; -import android.widget.ListAdapter; import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; import android.widget.Button; -import android.widget.EditText; -import java.io.PrintStream; -import java.io.FileOutputStream; -import android.text.Editable; -import android.database.DataSetObserver; import android.app.Dialog; import android.app.AlertDialog; import android.content.DialogInterface; @@ -56,13 +38,9 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; -import android.view.Menu; -import android.view.MenuItem; import android.view.MenuInflater; import android.widget.Spinner; import android.widget.ArrayAdapter; -import android.webkit.WebView; -import java.io.File; import android.widget.LinearLayout; import junit.framework.Assert; @@ -89,7 +67,6 @@ public class GameConfig extends Activity implements View.OnClickListener { private int m_browsePosition; private LinearLayout m_playerLayout; private CommsAddrRec m_car; - private int m_connLayoutID; private CommonPrefs m_cp; private boolean m_canDoSMS = false; private boolean m_canDoBT = false; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java index efc2a067f..c8c257e08 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java @@ -2,7 +2,6 @@ package org.eehouse.android.xw4; -import android.widget.Adapter; import android.widget.ListAdapter; import android.content.Context; import android.view.View; @@ -10,8 +9,6 @@ import android.view.ViewGroup; import android.widget.TextView; import android.database.DataSetObserver; import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.nio.CharBuffer; import org.eehouse.android.xw4.jni.*; import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java index 4f1d35b1b..5e3892b0a 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java @@ -18,13 +18,9 @@ package org.eehouse.android.xw4; import android.app.ListActivity; -import android.content.ComponentName; -import android.content.ContentUris; import android.content.Intent; -import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.util.Log; import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; @@ -32,12 +28,8 @@ import android.view.View; import android.view.ContextMenu.ContextMenuInfo; import android.widget.AdapterView; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; -import android.content.res.AssetManager; -import java.io.InputStream; import android.widget.Button; import android.view.MenuInflater; -import java.io.FileOutputStream; import java.io.File; import android.preference.PreferenceManager; @@ -46,7 +38,6 @@ import org.eehouse.android.xw4.jni.*; import org.eehouse.android.xw4.XWords4.Games; // for constants public class GamesList extends ListActivity implements View.OnClickListener { - private static final String TAG = "GamesList"; private GameListAdapter m_adapter; @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PlayerView.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PlayerView.java index f230c5d99..92f8aba02 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PlayerView.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PlayerView.java @@ -3,7 +3,6 @@ package org.eehouse.android.xw4; import android.widget.TextView; -import android.app.Activity; import android.content.Context; import android.util.AttributeSet; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java index 11714c880..cc70fe773 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java @@ -3,23 +3,10 @@ package org.eehouse.android.xw4; import android.preference.PreferenceActivity; -import android.app.Activity; import android.os.Bundle; -import android.content.Intent; -import android.app.Dialog; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.res.Configuration; -import android.view.View; -import android.widget.Button; - -import org.eehouse.android.xw4.jni.*; public class PrefsActivity extends PreferenceActivity { - private Button m_doneB; - private CommonPrefs m_cp; - @Override protected void onCreate( Bundle savedInstanceState ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ReceiveNBS.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ReceiveNBS.java index c01e4f69b..0e92aa10f 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ReceiveNBS.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ReceiveNBS.java @@ -8,8 +8,6 @@ import android.content.Intent; import android.os.Bundle; import android.telephony.SmsMessage; -import org.eehouse.android.xw4.jni.*; - public class ReceiveNBS extends BroadcastReceiver { @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StatusReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StatusReceiver.java index 019d5986b..c9abc7ec4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StatusReceiver.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StatusReceiver.java @@ -3,13 +3,10 @@ package org.eehouse.android.xw4; -import android.os.Bundle; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.eehouse.android.xw4.jni.*; - public class StatusReceiver extends BroadcastReceiver { @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java index fd6753522..5362bdcde 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java @@ -21,9 +21,6 @@ import android.widget.TextView; import android.text.format.Time; import java.util.Formatter; -import org.eehouse.android.xw4.jni.*; -import org.eehouse.android.xw4.jni.JNIThread.*; - public class Utils { static final String TAG = "EJAVA"; // private static JNIThread s_jniThread = null; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardHandler.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardHandler.java index 1366dfb49..f7b8ace3c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardHandler.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/BoardHandler.java @@ -1,8 +1,6 @@ package org.eehouse.android.xw4.jni; -import android.content.Context; - public interface BoardHandler { void startHandling( JNIThread thread, int gamePtr, CurGameInfo gi ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java index 6bf76e7c8..e7ccff2c7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java @@ -2,7 +2,6 @@ package org.eehouse.android.xw4.jni; import java.net.InetAddress; -import android.content.Context; import org.eehouse.android.xw4.Utils; 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 539ff4793..ff3dd8928 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 @@ -3,7 +3,6 @@ package org.eehouse.android.xw4.jni; -import android.view.View; import org.eehouse.android.xw4.Utils; import java.lang.InterruptedException; import java.util.concurrent.LinkedBlockingQueue; @@ -11,7 +10,6 @@ import android.os.Handler; import android.os.Message; import android.graphics.Paint; import android.graphics.Rect; -import junit.framework.Assert; import org.eehouse.android.xw4.R; import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; 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 5f8094617..081c7ff4f 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 @@ -51,7 +51,6 @@ public class JNIUtilsImpl implements JNIUtils { public String[] splitFaces( byte[] chars ) { ArrayList al = new ArrayList(); - int ii = 0; ByteArrayInputStream bais = new ByteArrayInputStream( chars ); InputStreamReader isr = new InputStreamReader( bais ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LocalPlayer.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LocalPlayer.java index 6d8ecd08d..64a57692c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LocalPlayer.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LocalPlayer.java @@ -9,8 +9,6 @@ public class LocalPlayer { public boolean isRobot; public boolean isLocal; - private LocalPlayer() {} - public LocalPlayer( int num ) { isLocal = true; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java index e11b0debf..1d80cc8de 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java @@ -2,8 +2,6 @@ package org.eehouse.android.xw4.jni; -import android.graphics.drawable.BitmapDrawable; - public interface UtilCtxt { static final int BONUS_NONE = 0; static final int BONUS_DOUBLE_LETTER = 1;