English1

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index dd90914..24b9e3c 100644 (file)
Binary files a/workspace/JuggleMaster/bin/JuggleMaster.apk and b/workspace/JuggleMaster/bin/JuggleMaster.apk differ

diff --git a/workspace/JuggleMaster/bin/classes.dex b/workspace/JuggleMaster/bin/classes.dex
index bc677c2..0b468a5 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes.dex and b/workspace/JuggleMaster/bin/classes.dex differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class
index 1f36b6a..93e956c 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class and b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class b/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class
index 3525650..0e5dcc8 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class and b/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class
index 42c0897..70720f4 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class and b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index 12910f1..b42b333 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/src/com/jm/PatternList.java b/workspace/JuggleMaster/src/com/jm/PatternList.java
index f42f2cc..a336dcb 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -28,8 +28,11 @@ public class PatternList {
 // }\r
        \r
 \r
-       // edit {\r
-       public PatternList() throws JmException {\r
+       public PatternList() {\r
+               \r
+       }\r
+       \r
+       public void create() throws JmException {\r
                //言語別設定追加\r
                \r
                DatabaseHelper helper = DatabaseHelper.getInstance();\r
@@ -41,17 +44,30 @@ public class PatternList {
                        setPackage03();\r
                        setPackage04();\r
                        setPackage05();\r
-                       setPackage06();\r
                        break;\r
                default:\r
                        setPackage01En();\r
-                       setPackage06En();\r
                        break;\r
                }\r
        }\r
-\r
-       // }\r
        \r
+       public void update() throws JmException {\r
+               int type = 6;\r
+               int count = count(type);\r
+               \r
+               if (count <= 0){\r
+                       DatabaseHelper helper = DatabaseHelper.getInstance();\r
+                       switch (helper.getLangId()){\r
+                       case DatabaseHelper.JAPANEASE_ID:\r
+                               setPackage06();\r
+                               break;\r
+                       default:\r
+                               setPackage06En();\r
+                               break;\r
+                       }\r
+               }\r
+       }\r
+\r
        /*\r
     public PatternList(Runnable parent, int index) throws JmException {\r
 // edit\r
@@ -168,6 +184,10 @@ public class PatternList {
 // }\r
        }\r
 \r
+       private int count(int type) throws JmException {\r
+               return Dao.getInstance().count(type);           \r
+       }\r
+       \r
 // edit {\r
 //     private boolean delete(int index) {\r
 //             if (patterns.isEmpty()) return false;\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/Dao.java b/workspace/JuggleMaster/src/com/jm/db/Dao.java
index 605c67e..d0322ad 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/Dao.java
+++ b/workspace/JuggleMaster/src/com/jm/db/Dao.java
@@ -209,4 +209,20 @@ public class Dao {
                }\r
                return count;\r
        }\r
+\r
+       public int count(int type) throws JmException{\r
+               int count = -1;\r
+               try {\r
+                       DatabaseHelper helper = DatabaseHelper.getInstance();\r
+                       SQLiteDatabase db = helper.getReadableDatabase();\r
+                       String sql = "select count(*) from pattern where type = " + type + " and lang = " + helper.getLangId() + ";";\r
+                       Cursor c = db.rawQuery(sql, null);\r
+                       c.moveToFirst();\r
+                       count = c.getInt(0); // count;\r
+                       c.close();\r
+               } catch (SQLException e){\r
+                       throw new JmException(e);\r
+               }\r
+               return count;\r
+       }\r
 }\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index 276048a..0086f55 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
+++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
@@ -29,9 +29,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                int count;\r
                count = Dao.getInstance().count();\r
                Dao.getInstance().start(db);\r
+               PatternList p = new PatternList();\r
                if (count <= 0) {\r
-                       new PatternList();\r
+                       p.create();\r
                }\r
+               p.update();\r
        }\r
 \r
        public DatabaseHelper(Context context) {\r
@@ -61,11 +63,14 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                try {\r
                        if (oldVersion == 1 && newVersion == 2) {\r
                                db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");\r
-                               db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID + ";");\r
+                               // 既存のデータは、日本語のデータに変換\r
+                               db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID + " WHERE TYPE <> 6;");\r
+                               // ただし、マイパターンは、システムの言語に\r
+                               db.execSQL("UPDATE pattern set LANG = " + langId + " WHERE TYPE = 6;");\r
                                db.execSQL("create index langindex on pattern(lang);");\r
                        }\r
                } catch (Exception e) {\r
-                       e.printStackTrace();\r
+                       e.printStackTrace(); // TODO\r
                }\r
        }       \r
        \r