Commit: 3af251b42254ce15847e6eaaea34e24dff1ce632 - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 3af251b42254ce15847e6eaaea34e24dff1ce632 (tree)
• Zeit: 2012-08-11 21:58:13
• Autor: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

NoteDB に新しいテーブルを追加するための準備

Ändern Zusammenfassung

• modified: notepad-common/src/org/routine_work/notepad/provider/NoteDBConstants.java
• modified: notepad-common/src/org/routine_work/notepad/provider/NoteDBHelper.java
• modified: notepad-common/src/org/routine_work/notepad/provider/NoteProvider.java
• modified: notepad-common/src/org/routine_work/notepad/provider/NoteStore.java
• modified: notepad-common/src/org/routine_work/notepad/provider/RecentQueryTextSuggestionProvider.java

Diff

--- a/notepad-common/src/org/routine_work/notepad/provider/NoteDBConstants.java
+++ b/notepad-common/src/org/routine_work/notepad/provider/NoteDBConstants.java
@@ -34,27 +34,32 @@ interface NoteDBConstants
 
 	String DATABASE_NAME = "NoteDB";
 	int DATABASE_VERSION = 5;
-	String TABLE_NAME = "Notes";
-	// CREATE SQL
-	String CREATE_TABLE_SQL = "CREATE TABLE " + TABLE_NAME + "("
-		+ "  " + NoteColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT"
-		+ ", " + NoteColumns.TITLE + " TEXT"
-		+ ", " + NoteColumns.CONTENT + " TEXT"
-		+ ", " + NoteColumns.TITLE_LOCKED + " BOOLEAN NOT NULL"
-		+ ", " + NoteColumns.CONTENT_LOCKED + " BOOLEAN NOT NULL"
-		+ ", " + NoteColumns.DATE_ADDED + " INTEGER NOT NULL"
-		+ ", " + NoteColumns.DATE_MODIFIED + " INTEGER NOT NULL"
-		+ ");";
-	// DROP SQL
-	String DROP_TABLE_SQL = "DROP TABLE " + TABLE_NAME + ";";
-	String CREATE_TITLE_INDEX_SQL = "CREATE INDEX " + NoteColumns.TITLE + "_index "
-		+ "ON " + TABLE_NAME + "(" + NoteColumns.TITLE + ");";
-	String CREATE_CONTENT_INDEX_SQL = "CREATE INDEX " + NoteColumns.CONTENT + "_index "
-		+ "ON " + TABLE_NAME + "(" + NoteColumns.CONTENT + ");";
-	String CREATE_DATE_ADDED_INDEX_SQL = "CREATE INDEX " + NoteColumns.DATE_ADDED + "_index "
-		+ "ON " + TABLE_NAME + "(" + NoteColumns.DATE_ADDED + ");";
-	String CREATE_DATE_MODIFIED_INDEX_SQL = "CREATE INDEX " + NoteColumns.DATE_MODIFIED + "_index "
-		+ "ON " + TABLE_NAME + "(" + NoteColumns.DATE_MODIFIED + ");";
-	String REINDEX_SQL = "REINDEX;";
-	String VACCUM_SQL = "VACUUM;";
+
+	interface Notes
+	{
+
+		String TABLE_NAME = "Notes";
+		// CREATE SQL
+		String CREATE_TABLE_SQL = "CREATE TABLE " + TABLE_NAME + "("
+			+ "  " + NoteColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT"
+			+ ", " + NoteColumns.TITLE + " TEXT"
+			+ ", " + NoteColumns.CONTENT + " TEXT"
+			+ ", " + NoteColumns.TITLE_LOCKED + " BOOLEAN NOT NULL"
+			+ ", " + NoteColumns.CONTENT_LOCKED + " BOOLEAN NOT NULL"
+			+ ", " + NoteColumns.DATE_ADDED + " INTEGER NOT NULL"
+			+ ", " + NoteColumns.DATE_MODIFIED + " INTEGER NOT NULL"
+			+ ");";
+		// DROP SQL
+		String DROP_TABLE_SQL = "DROP TABLE " + TABLE_NAME + ";";
+		String CREATE_TITLE_INDEX_SQL = "CREATE INDEX " + NoteColumns.TITLE + "_index "
+			+ "ON " + TABLE_NAME + "(" + NoteColumns.TITLE + ");";
+		String CREATE_CONTENT_INDEX_SQL = "CREATE INDEX " + NoteColumns.CONTENT + "_index "
+			+ "ON " + TABLE_NAME + "(" + NoteColumns.CONTENT + ");";
+		String CREATE_DATE_ADDED_INDEX_SQL = "CREATE INDEX " + NoteColumns.DATE_ADDED + "_index "
+			+ "ON " + TABLE_NAME + "(" + NoteColumns.DATE_ADDED + ");";
+		String CREATE_DATE_MODIFIED_INDEX_SQL = "CREATE INDEX " + NoteColumns.DATE_MODIFIED + "_index "
+			+ "ON " + TABLE_NAME + "(" + NoteColumns.DATE_MODIFIED + ");";
+		String REINDEX_SQL = "REINDEX;";
+		String VACCUM_SQL = "VACUUM;";
+	}
 }

--- a/notepad-common/src/org/routine_work/notepad/provider/NoteDBHelper.java
+++ b/notepad-common/src/org/routine_work/notepad/provider/NoteDBHelper.java
@@ -62,16 +62,16 @@ class NoteDBHelper extends SQLiteOpenHelper
 	public void onCreate(SQLiteDatabase db)
 	{
 		Log.w(LOG_TAG, "Create database.");
-		Log.w(LOG_TAG, "CREATE_TABLE_SQL => " + CREATE_TABLE_SQL);
-		db.execSQL(CREATE_TABLE_SQL);
-		Log.w(LOG_TAG, "CREATE_TITLE_INDEX_SQL => " + CREATE_TITLE_INDEX_SQL);
-		db.execSQL(CREATE_TITLE_INDEX_SQL);
-		Log.w(LOG_TAG, "CREATE_CONTENT_INDEX_SQL => " + CREATE_CONTENT_INDEX_SQL);
-		db.execSQL(CREATE_CONTENT_INDEX_SQL);
-		Log.w(LOG_TAG, "CREATE_DATE_ADDED_INDEX_SQL => " + CREATE_DATE_ADDED_INDEX_SQL);
-		db.execSQL(CREATE_DATE_ADDED_INDEX_SQL);
-		Log.w(LOG_TAG, "CREATE_DATE_MODIFIED_INDEX_SQL => " + CREATE_DATE_MODIFIED_INDEX_SQL);
-		db.execSQL(CREATE_DATE_MODIFIED_INDEX_SQL);
+		Log.w(LOG_TAG, "Notes.CREATE_TABLE_SQL => " + Notes.CREATE_TABLE_SQL);
+		db.execSQL(Notes.CREATE_TABLE_SQL);
+		Log.w(LOG_TAG, "Notes.CREATE_TITLE_INDEX_SQL => " + Notes.CREATE_TITLE_INDEX_SQL);
+		db.execSQL(Notes.CREATE_TITLE_INDEX_SQL);
+		Log.w(LOG_TAG, "Notes.CREATE_CONTENT_INDEX_SQL => " + Notes.CREATE_CONTENT_INDEX_SQL);
+		db.execSQL(Notes.CREATE_CONTENT_INDEX_SQL);
+		Log.w(LOG_TAG, "Notes.CREATE_DATE_ADDED_INDEX_SQL => " + Notes.CREATE_DATE_ADDED_INDEX_SQL);
+		db.execSQL(Notes.CREATE_DATE_ADDED_INDEX_SQL);
+		Log.w(LOG_TAG, "Notes.CREATE_DATE_MODIFIED_INDEX_SQL => " + Notes.CREATE_DATE_MODIFIED_INDEX_SQL);
+		db.execSQL(Notes.CREATE_DATE_MODIFIED_INDEX_SQL);
 	}
 
 	@Override
@@ -87,7 +87,7 @@ class NoteDBHelper extends SQLiteOpenHelper
 			backupV4To(db, backupDir);
 		}
 		// upgrade table
-		db.execSQL(DROP_TABLE_SQL);
+		db.execSQL(Notes.DROP_TABLE_SQL);
 
 		// restore data
 		onCreate(db);
@@ -97,12 +97,12 @@ class NoteDBHelper extends SQLiteOpenHelper
 
 	public void reindex(SQLiteDatabase db)
 	{
-		db.execSQL(REINDEX_SQL);
+		db.execSQL(Notes.REINDEX_SQL);
 	}
 
 	public void vacuum(SQLiteDatabase db)
 	{
-		db.execSQL(VACCUM_SQL);
+		db.execSQL(Notes.VACCUM_SQL);
 	}
 
 	public void backupV4To(SQLiteDatabase db, File backupDirectory)
@@ -110,7 +110,7 @@ class NoteDBHelper extends SQLiteOpenHelper
 		Log.v(LOG_TAG, "Hello");
 		Log.v(LOG_TAG, "backupDirectory => " + backupDirectory);
 
-		Cursor cursor = db.query(TABLE_NAME, null, null, null, null, null, null);
+		Cursor cursor = db.query(Notes.TABLE_NAME, null, null, null, null, null, null);
 		if (cursor != null && cursor.moveToFirst())
 		{
 			int idIndex = cursor.getColumnIndex(NoteColumns._ID);
@@ -173,7 +173,7 @@ class NoteDBHelper extends SQLiteOpenHelper
 				values.put(NoteColumns.CONTENT_LOCKED, note.contentLocked);
 				values.put(NoteColumns.DATE_ADDED, note.added);
 				values.put(NoteColumns.DATE_MODIFIED, note.modified);
-				db.insert(TABLE_NAME, null, values);
+				db.insert(Notes.TABLE_NAME, null, values);
 			}
 			catch (FileNotFoundException ex)
 			{

--- a/notepad-common/src/org/routine_work/notepad/provider/NoteProvider.java
+++ b/notepad-common/src/org/routine_work/notepad/provider/NoteProvider.java
@@ -45,10 +45,10 @@ public class NoteProvider extends ContentProvider
 
 	private static final String LOG_TAG = "simple-notepad";
 	// URI
-	private static final int ITEM_ALL = 1;
-	private static final int ITEM_BY_ID = 2;
-	private static final int SUGGEST_SEARCH_ALL = 3;
-	private static final int SUGGEST_SEARCH_BY_WORD = 4;
+	private static final int NOTES_ITEM_ALL = 1;
+	private static final int NOTES_ITEM_BY_ID = 2;
+	private static final int NOTES_SUGGEST_SEARCH_ALL = 3;
+	private static final int NOTES_SUGGEST_SEARCH_BY_WORD = 4;
 	private static final UriMatcher URI_MATCHER;
 	private static final Map<String, String> SUGGESTION_PROJECTION_MAP;
 	// DB
@@ -57,10 +57,10 @@ public class NoteProvider extends ContentProvider
 	static
 	{
 		URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
-		URI_MATCHER.addURI(NoteStore.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, SUGGEST_SEARCH_ALL);
-		URI_MATCHER.addURI(NoteStore.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SUGGEST_SEARCH_BY_WORD);
-		URI_MATCHER.addURI(NoteStore.AUTHORITY, "notes", ITEM_ALL);
-		URI_MATCHER.addURI(NoteStore.AUTHORITY, "notes/#", ITEM_BY_ID);
+		URI_MATCHER.addURI(NoteStore.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, NOTES_SUGGEST_SEARCH_ALL);
+		URI_MATCHER.addURI(NoteStore.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", NOTES_SUGGEST_SEARCH_BY_WORD);
+		URI_MATCHER.addURI(NoteStore.AUTHORITY, "notes", NOTES_ITEM_ALL);
+		URI_MATCHER.addURI(NoteStore.AUTHORITY, "notes/#", NOTES_ITEM_BY_ID);
 
 		SUGGESTION_PROJECTION_MAP = new HashMap<String, String>();
 		SUGGESTION_PROJECTION_MAP.put(SearchManager.SUGGEST_COLUMN_TEXT_1,
@@ -91,35 +91,35 @@ public class NoteProvider extends ContentProvider
 		Log.d(LOG_TAG, "query uri => " + uri);
 
 		SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-		qb.setTables(TABLE_NAME);
+		qb.setTables(Notes.TABLE_NAME);
 
 		int match = URI_MATCHER.match(uri);
 		switch (match)
 		{
-			case SUGGEST_SEARCH_ALL:
-			case SUGGEST_SEARCH_BY_WORD:
+			case NOTES_SUGGEST_SEARCH_ALL:
+			case NOTES_SUGGEST_SEARCH_BY_WORD:
 				qb.setProjectionMap(SUGGESTION_PROJECTION_MAP);
 				break;
 		}
 
 		switch (match)
 		{
-			case SUGGEST_SEARCH_BY_WORD:
+			case NOTES_SUGGEST_SEARCH_BY_WORD:
 				Log.d(LOG_TAG, "*SEARCH_BY_WORD");
 				String queryWord = uri.getLastPathSegment().trim();
 				Log.d(LOG_TAG, "queryWord => " + queryWord);
 				setUpQueryByWord(qb, queryWord);
 				break;
-			case SUGGEST_SEARCH_ALL:
+			case NOTES_SUGGEST_SEARCH_ALL:
 				break;
-			case ITEM_ALL:
+			case NOTES_ITEM_ALL:
 				uri.getQueryParameter("q");
 				Log.d(LOG_TAG, "*SEARCH_BY_WORD");
 				String q = uri.getQueryParameter("q");
 				Log.d(LOG_TAG, "queryWord => " + q);
 				setUpQueryByWord(qb, q);
 				break;
-			case ITEM_BY_ID:
+			case NOTES_ITEM_BY_ID:
 				qb.appendWhere(NoteColumns._ID + "=" + uri.getPathSegments().get(1));
 				break;
 			default:
@@ -143,7 +143,7 @@ public class NoteProvider extends ContentProvider
 		Log.v(LOG_TAG, "Hello");
 		Uri newUri = null;
 
-		long rowID = noteDB.insert(TABLE_NAME, null, initialValues);
+		long rowID = noteDB.insert(Notes.TABLE_NAME, null, initialValues);
 		Log.d(LOG_TAG, "rowID => " + rowID);
 
 		if (rowID > 0)
@@ -169,10 +169,10 @@ public class NoteProvider extends ContentProvider
 
 		switch (URI_MATCHER.match(uri))
 		{
-			case ITEM_ALL:
-				count = noteDB.delete(TABLE_NAME, where, whereArgs);
+			case NOTES_ITEM_ALL:
+				count = noteDB.delete(Notes.TABLE_NAME, where, whereArgs);
 				break;
-			case ITEM_BY_ID:
+			case NOTES_ITEM_BY_ID:
 				String itemId = uri.getPathSegments().get(1);
 				StringBuilder whereClause = new StringBuilder();
 				whereClause.append(NoteStore.NoteColumns._ID);
@@ -185,7 +185,7 @@ public class NoteProvider extends ContentProvider
 					whereClause.append(")");
 				}
 
-				count = noteDB.delete(TABLE_NAME, whereClause.toString(),
+				count = noteDB.delete(Notes.TABLE_NAME, whereClause.toString(),
 					whereArgs);
 				break;
 
@@ -207,11 +207,11 @@ public class NoteProvider extends ContentProvider
 
 		switch (URI_MATCHER.match(uri))
 		{
-			case ITEM_ALL:
-				count = noteDB.update(TABLE_NAME, values, where, whereArgs);
+			case NOTES_ITEM_ALL:
+				count = noteDB.update(Notes.TABLE_NAME, values, where, whereArgs);
 				break;
 
-			case ITEM_BY_ID:
+			case NOTES_ITEM_BY_ID:
 				String segment = uri.getPathSegments().get(1);
 
 				StringBuilder whereClause = new StringBuilder();
@@ -225,7 +225,7 @@ public class NoteProvider extends ContentProvider
 					whereClause.append(where);
 					whereClause.append(")");
 				}
-				count = noteDB.update(TABLE_NAME, values,
+				count = noteDB.update(Notes.TABLE_NAME, values,
 					whereClause.toString(), whereArgs);
 				break;
 
@@ -247,11 +247,11 @@ public class NoteProvider extends ContentProvider
 
 		switch (URI_MATCHER.match(uri))
 		{
-			case SUGGEST_SEARCH_ALL:
-			case ITEM_ALL:
+			case NOTES_SUGGEST_SEARCH_ALL:
+			case NOTES_ITEM_ALL:
 				type = NoteStore.NOTE_LIST_CONTENT_TYPE;
 				break;
-			case ITEM_BY_ID:
+			case NOTES_ITEM_BY_ID:
 				type = NoteStore.NOTE_ITEM_CONTENT_TYPE;
 				break;
 			default:
@@ -277,7 +277,7 @@ public class NoteProvider extends ContentProvider
 			}
 			catch (NumberFormatException e)
 			{
-				Log.e(LOG_TAG, "limit parameter is illegal value : limitText => " + limit);
+				Log.e(LOG_TAG, "limit parameter is illegal value : limitText => " + limit, e);
 				limit = null;
 			}
 		}

--- a/notepad-common/src/org/routine_work/notepad/provider/NoteStore.java
+++ b/notepad-common/src/org/routine_work/notepad/provider/NoteStore.java
@@ -30,7 +30,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.text.TextUtils;
 import org.routine_work.utils.Log;
 
 /**

--- a/notepad-common/src/org/routine_work/notepad/provider/RecentQueryTextSuggestionProvider.java
+++ b/notepad-common/src/org/routine_work/notepad/provider/RecentQueryTextSuggestionProvider.java
@@ -32,6 +32,7 @@ import android.content.SearchRecentSuggestionsProvider;
  */
 public class RecentQueryTextSuggestionProvider extends SearchRecentSuggestionsProvider
 {
+
 	public static final String AUTHORITY = "org.routine_work.notepad.recent_query_text_suggestion_provider";
 
 	public RecentQueryTextSuggestionProvider()