English4

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 6e42765..703e169 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 d049a36..d778ce9 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 f0dc5a9..8d52841 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 06f7d5e..998ae8a 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 1130529..51594e2 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 2113152..0a6367c 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 7091b23..e4d208c 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -62,6 +62,7 @@ public class PatternList {
                        break;\r
                default:\r
                        setPackage06En();\r
+                       setPackage06();\r
                        break;\r
                }\r
        }\r
@@ -186,6 +187,11 @@ public class PatternList {
 // }\r
        }\r
 \r
+       private void addJp(JmPattern jp) throws JmException {\r
+               if (jp.getSiteSwap() == null) return;\r
+               Dao.getInstance().add(jp, DatabaseHelper.JAPANEASE_ID, idx++);\r
+       }\r
+\r
        private int count(int type) throws JmException {\r
                return Dao.getInstance().count(type);           \r
        }\r
@@ -542,7 +548,7 @@ public class PatternList {
        public void setPackage06() throws JmException {\r
                clearIndex();\r
                int type = 6;\r
-               add(new JmPattern(type, "[新規作成]", "1"));\r
+               addJp(new JmPattern(type, "[新規作成]", "1"));\r
        }\r
        \r
        public void setPackage00En() throws JmException {\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/Dao.java b/workspace/JuggleMaster/src/com/jm/db/Dao.java
index 551084e..756777f 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/Dao.java
+++ b/workspace/JuggleMaster/src/com/jm/db/Dao.java
@@ -37,6 +37,8 @@ public class Dao {
                                + "lang integer,"\r
                                + "idx integer);"\r
                        );\r
+               db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");\r
+               db.execSQL("ALTER TABLE pattern ADD COLUMN idx integer;");\r
                start(db);\r
        }\r
        \r
@@ -57,6 +59,11 @@ public class Dao {
        \r
        public void add(JmPattern jp, int index) throws JmException{\r
                DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               add(jp, helper.getLangId(), index);\r
+       }\r
+       \r
+       public void add(JmPattern jp, int lang, int index) throws JmException{\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
                SQLiteDatabase db = helper.getWritableDatabase();\r
                db.beginTransaction();\r
                try {\r
@@ -68,7 +75,7 @@ public class Dao {
                        stmt.bindLong(i++, jp.getDwell());\r
                        stmt.bindString(i++, jp.getName());\r
                        stmt.bindString(i++, jp.motionToString());\r
-                       stmt.bindLong(i++, helper.getLangId());\r
+                       stmt.bindLong(i++, lang);\r
                        stmt.bindLong(i++, index);\r
                        stmt.executeInsert();\r
                        db.setTransactionSuccessful();\r
@@ -134,9 +141,14 @@ public class Dao {
 \r
        public JmPattern[] get(SQLiteDatabase db, int type) throws JmException{\r
                DatabaseHelper helper = DatabaseHelper.getInstance();\r
-               JmPattern[] list = null;\r
                String selection = "lang = " + helper.getLangId() + " and type = " + type;\r
                String orderBy = "idx";\r
+               return get(db, selection, orderBy);\r
+       }\r
+       \r
+       public JmPattern[] get(SQLiteDatabase db, String selection, String orderBy) throws JmException{\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               JmPattern[] list = null;\r
                Cursor c = db.query(\r
                                "pattern",\r
                                new String[] {\r

diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index 28771a7..6833f81 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
+++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
@@ -14,7 +14,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
        public final static int ENGLISH_ID = 1;\r
        public final static int JAPANEASE_ID = 2;\r
        private static int langId = -1;\r
-       private static boolean type6Flag = false;\r
        private static boolean convFlag = false;\r
        \r
        private static DatabaseHelper instance = null;\r
@@ -37,21 +36,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                if (count <= 0) {\r
                        p.create();\r
                }\r
-               if (type6Flag){\r
-                       p.update();\r
-                       type6Flag = false;\r
-               }\r
-               \r
                if (convFlag){\r
-                       conv(context);\r
+                       p.update();                     \r
                        convFlag = false;\r
                }\r
        }\r
 \r
-       private static void conv(Context context) {\r
-               ;\r
-       }\r
-       \r
        public DatabaseHelper(Context context) {\r
                //super(context, "JuggleMaster.db", null, 1);\r
                super(context, "JuggleMaster.db", null, 2);\r
@@ -83,7 +73,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                                \r
                                Dao dao = Dao.getInstance();\r
                                for (int i = 0; i < 7; i++){\r
-                                       JmPattern[] list = dao.get(db, i);\r
+                                       JmPattern[] list = dao.get(db, "type = " + i, null);\r
                                        int size = list.length;\r
                                        for (int j = 0; j < size; j++){\r
                                                JmPattern item = list[j];\r
@@ -94,13 +84,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                                \r
                                // 既存のデータは、日本語のデータに変換\r
                                db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID + " WHERE TYPE <> 6;");\r
+                               db.execSQL("DELETE FROM pattern WHERE NAME = '[新規作成]';");\r
                                // ただし、マイパターンは、システムの言語に\r
-                               if (langId != JAPANEASE_ID){\r
-                                       type6Flag = true;\r
-                               }\r
                                db.execSQL("UPDATE pattern set LANG = " + langId + " WHERE TYPE = 6;");\r
                                db.execSQL("create index langindex on pattern(lang);");\r
-                               db.execSQL("create index langindex on pattern(idx);");\r
+                               db.execSQL("create index idxindex on pattern(idx);");\r
                                \r
                                convFlag = true;\r
                        }\r