From 1216ec49d7d597b66805041ed76004f66a325819 Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 22 Apr 2016 07:08:13 -0700 Subject: [PATCH] cleanup: move method --- .../XWords4/src/org/eehouse/android/xw4/DBHelper.java | 11 ++++++++++- .../XWords4/src/org/eehouse/android/xw4/DBUtils.java | 9 --------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 49b907a4b..840aeec57 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java @@ -444,7 +444,7 @@ public class DBHelper extends SQLiteOpenHelper { db.beginTransaction(); try { String query; - String[] columnNames = DBUtils.getColumns( db, name ); + String[] columnNames = getColumns( db, name ); if ( null != columnNames ) { // no data means no need to copy query = String.format( "ALTER table %s RENAME TO 'temp_%s'", name, name ); @@ -516,6 +516,15 @@ public class DBHelper extends SQLiteOpenHelper { return result; } + private static String[] getColumns( SQLiteDatabase db, String name ) + { + String query = String.format( "SELECT * FROM %s LIMIT 1", name ); + Cursor cursor = db.rawQuery( query, null ); + String[] colNames = cursor.getColumnNames(); + cursor.close(); + return colNames; + } + private class TableAndVersion { public String name; public int addedVersion; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java index 83b399402..e806636b2 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java @@ -2070,15 +2070,6 @@ public class DBUtils { return exists; } - public static String[] getColumns( SQLiteDatabase db, String name ) - { - String query = String.format( "SELECT * FROM %s LIMIT 1", name ); - Cursor cursor = db.rawQuery( query, null ); - String[] colNames = cursor.getColumnNames(); - cursor.close(); - return colNames; - } - public static void addToStudyList( Context context, String word, int lang ) {