diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java index 356efddb0..62be79cf4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java @@ -38,7 +38,6 @@ import java.util.Iterator; import junit.framework.Assert; import org.eehouse.android.xw4.loc.LocUtils; -import org.eehouse.android.xw4.loc.LocUtils.AlertBuilder; public class DlgDelegate { 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 18fcf5a5b..05c33eadf 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 @@ -33,20 +33,6 @@ public class LocIDs extends LocIDsData { private static String[] s_keys; private static HashMap S_MAP = null; - protected static String getNthKey( Context context, int indx ) - { - if ( null == s_keys ) { - Map map = getS_MAP( context ); - s_keys = new String[map.size()]; - Iterator iter = map.keySet().iterator(); - for ( int ii = 0; iter.hasNext(); ++ii ) { - s_keys[ii] = iter.next(); - } - } - - return s_keys[indx]; - } - protected static int getID( Context context, String key ) { int result = LocIDsData.NOT_FOUND; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocUtils.java index 494ff9b4b..8b6c793fc 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocUtils.java @@ -434,12 +434,12 @@ public class LocUtils { return sb.toString(); } - public static AlertBuilder makeAlertBuilder( Context context ) + public static AlertDialog.Builder makeAlertBuilder( Context context ) { return new AlertBuilder( context ); } - public static class AlertBuilder extends AlertDialog.Builder { + private static class AlertBuilder extends AlertDialog.Builder { Context m_context; private AlertBuilder( Context context ) @@ -483,6 +483,6 @@ public class LocUtils { String str = getString( m_context, textId ); return setNegativeButton( str, listener ); } - } + } }