Mac移行後

[train-delayed/source.git] / workspace / TrainDelayed / src / com / td / db / PrefectureDao.java

diff --git a/workspace/TrainDelayed/src/com/td/db/PrefectureDao.java b/workspace/TrainDelayed/src/com/td/db/PrefectureDao.java
old mode 100644 (file)
new mode 100755 (executable)
index 425ac08..eaaf44d
--- a/workspace/TrainDelayed/src/com/td/db/PrefectureDao.java
+++ b/workspace/TrainDelayed/src/com/td/db/PrefectureDao.java
@@ -13,82 +13,64 @@ public class PrefectureDao {
        private static PrefectureDao instance = null;\r
        private SQLiteStatement insertStmt = null;\r
        private SQLiteStatement deleteStmt = null;\r
-       \r
-       public static PrefectureDao getInstance(){\r
-               if (instance == null){\r
+\r
+       public static PrefectureDao getInstance() {\r
+               if (instance == null) {\r
                        instance = new PrefectureDao();\r
                }\r
                return instance;\r
-       }       \r
-       \r
-       private PrefectureDao(){\r
+       }\r
+\r
+       private PrefectureDao() {\r
 \r
        }\r
-       \r
+\r
        public void onCreate(SQLiteDatabase db) {\r
-               db.execSQL(\r
-                               "CREATE TABLE PREFECTURE ("\r
-                               + android.provider.BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"\r
-                               + "NAME TEXT"\r
-                               + ");");\r
+               db.execSQL("CREATE TABLE PREFECTURE ("\r
+                               + android.provider.BaseColumns._ID\r
+                               + " INTEGER PRIMARY KEY AUTOINCREMENT," + "NAME TEXT" + ");");\r
        }\r
-       \r
-       public void init(SQLiteDatabase db)\r
-       {\r
+\r
+       public void init(SQLiteDatabase db) {\r
 \r
        }\r
 \r
        public void start(SQLiteDatabase db) {\r
-               insertStmt = db.compileStatement(\r
-                               "INSERT INTO PREFECTURE ("\r
-                               + "NAME"\r
-                               + ") VALUES ("\r
-                               + "?"\r
-                               + ");");                \r
-               deleteStmt = db.compileStatement(\r
-                               "DELETE FROM PREFECTURE");\r
+               insertStmt = db.compileStatement("INSERT INTO PREFECTURE (" + "NAME"\r
+                               + ") VALUES (" + "?" + ");");\r
+               deleteStmt = db.compileStatement("DELETE FROM PREFECTURE");\r
        }\r
-       \r
-       public List<Prefecture> search(){\r
+\r
+       public List<Prefecture> search() {\r
                return search(null, null, android.provider.BaseColumns._ID);\r
        }\r
-       \r
-       private List<Prefecture> search(String selection, String[] selectionArgs, String orderBy){\r
+\r
+       private List<Prefecture> search(String selection, String[] selectionArgs,\r
+                       String orderBy) {\r
                List<Prefecture> list = new ArrayList<Prefecture>();\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               SQLiteDatabase db = helper.getReadableDatabase();\r
+\r
+               Cursor cursor = db.query("PREFECTURE", new String[] {\r
+                               android.provider.BaseColumns._ID, "NAME", }, selection,\r
+                               selectionArgs, null, null, orderBy);\r
                try {\r
-                       DatabaseHelper helper = DatabaseHelper.getInstance();\r
-                       SQLiteDatabase db = helper.getReadableDatabase();\r
-\r
-                       Cursor cursor = db.query(\r
-                                       "PREFECTURE",\r
-                                       new String[] {\r
-                                                       android.provider.BaseColumns._ID,\r
-                                                       "NAME",\r
-                                                       },\r
-                                                       selection, selectionArgs, null, null, orderBy);\r
                        cursor.moveToFirst();\r
                        int size = cursor.getCount();\r
                        for (int i = 0; i < size; i++) {\r
-                               Prefecture prefecture = new Prefecture(\r
-                                               cursor.getInt(0),\r
+                               Prefecture prefecture = new Prefecture(cursor.getInt(0),\r
                                                cursor.getString(1));\r
-                           list.add(prefecture);\r
-                           cursor.moveToNext();\r
+                               list.add(prefecture);\r
+                               cursor.moveToNext();\r
+                       }\r
+               } finally {\r
+                       if (cursor != null) {\r
+                               cursor.close();\r
                        }\r
-                       cursor.close();\r
-//             } catch (SQLException e){\r
-//                     // TODO\r
-//                     Debug.d(this, null, e);\r
-               } catch (Exception e){\r
-                       // TODO\r
-                       Debug.d(this, null, e);\r
-               }\r
-               finally {\r
-                       // TODO\r
                }\r
                return list;\r
        }\r
-       \r
+\r
        public void delete() {\r
                DatabaseHelper helper = DatabaseHelper.getInstance();\r
                SQLiteDatabase db = helper.getWritableDatabase();\r
@@ -97,9 +79,6 @@ public class PrefectureDao {
                        SQLiteStatement stmt = deleteStmt;\r
                        stmt.execute();\r
                        db.setTransactionSuccessful();\r
-               } catch (Exception e){\r
-                       // TODO\r
-                       Debug.d(this, null, e);\r
                } finally {\r
                        db.endTransaction();\r
                }\r
@@ -112,7 +91,7 @@ public class PrefectureDao {
                long id = stmt.executeInsert();\r
                return id;\r
        }\r
-       \r
+\r
        public void deleteNT() {\r
                SQLiteStatement stmt = deleteStmt;\r
                stmt.execute();\r