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

remove redundant DB field and variable

Browse source
This commit is contained in:
Eric House 2012-09-15 17:11:59 -07:00
parent a939c9ec4b
commit 33772ff0b9
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,7 +149,6 @@ public class DBHelper extends SQLiteOpenHelper {
db.execSQL( "CREATE TABLE " + TABLE_NAME_DICTBROWSE + " (" db.execSQL( "CREATE TABLE " + TABLE_NAME_DICTBROWSE + " ("
+ DICTNAME + " TEXT," + DICTNAME + " TEXT,"
+ WORDCOUNT + " INTEGER,"
+ WORDCOUNTS + " TEXT," + WORDCOUNTS + " TEXT,"
+ ITERMIN + " INTEGER(4)," + ITERMIN + " INTEGER(4),"
+ ITERMAX + " INTEGER(4)," + ITERMAX + " INTEGER(4),"

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

@ -91,7 +91,6 @@ public class DBUtils {
public int m_pos; public int m_pos;
public int m_top; public int m_top;
public String m_prefix; public String m_prefix;
public int m_count;
public int[] m_counts; public int[] m_counts;
} }
@ -981,8 +980,6 @@ public class DBUtils {
result.m_prefix = result.m_prefix =
cursor.getString( cursor cursor.getString( cursor
.getColumnIndex(DBHelper.ITERPREFIX)); .getColumnIndex(DBHelper.ITERPREFIX));
result.m_count =
cursor.getInt( cursor.getColumnIndex(DBHelper.WORDCOUNT));
String counts = String counts =
cursor.getString( cursor.getColumnIndex(DBHelper.WORDCOUNTS)); cursor.getString( cursor.getColumnIndex(DBHelper.WORDCOUNTS));
if ( null != counts ) { if ( null != counts ) {
@ -1013,7 +1010,6 @@ public class DBUtils {
values.put( DBHelper.ITERMIN, state.m_minShown ); values.put( DBHelper.ITERMIN, state.m_minShown );
values.put( DBHelper.ITERMAX, state.m_maxShown ); values.put( DBHelper.ITERMAX, state.m_maxShown );
values.put( DBHelper.ITERPREFIX, state.m_prefix ); values.put( DBHelper.ITERPREFIX, state.m_prefix );
values.put( DBHelper.WORDCOUNT, state.m_count );
if ( null != state.m_counts ) { if ( null != state.m_counts ) {
String[] nums = new String[state.m_counts.length]; String[] nums = new String[state.m_counts.length];
for ( int ii = 0; ii < nums.length; ++ii ) { for ( int ii = 0; ii < nums.length; ++ii ) {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java
View file

@ -174,8 +174,6 @@ public class DictBrowseActivity extends XWListActivity
m_browseState = new DBUtils.DictBrowseState(); m_browseState = new DBUtils.DictBrowseState();
m_browseState.m_pos = 0; m_browseState.m_pos = 0;
m_browseState.m_top = 0; m_browseState.m_top = 0;
m_browseState.m_count =
XwJNI.dict_iter_wordCount( m_dictClosure );
} }
if ( null == m_browseState.m_counts ) { if ( null == m_browseState.m_counts ) {
m_browseState.m_counts = m_browseState.m_counts =