From: yuji <yuji.k64613@gmail.com>
Date: Sat, 12 Jan 2013 06:28:06 +0000 (+0900)
Subject: English4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd6dbe3cfd9304f8399097efd565554b80902ae6;hp=8aa3706e695df88e65dcaf251612ee2ef457ee00;p=jugglemaster%2Fsource.git

English4
---

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 6e42765..703e169 100644
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
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
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
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
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
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
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -62,6 +62,7 @@ public class PatternList {
 			break;
 		default:
 			setPackage06En();
+			setPackage06();
 			break;
 		}
 	}
@@ -186,6 +187,11 @@ public class PatternList {
 // }
 	}
 
+	private void addJp(JmPattern jp) throws JmException {
+		if (jp.getSiteSwap() == null) return;
+		Dao.getInstance().add(jp, DatabaseHelper.JAPANEASE_ID, idx++);
+	}
+
 	private int count(int type) throws JmException {
 		return Dao.getInstance().count(type);		
 	}
@@ -542,7 +548,7 @@ public class PatternList {
 	public void setPackage06() throws JmException {
 		clearIndex();
 		int type = 6;
-		add(new JmPattern(type, "[新規作成]", "1"));
+		addJp(new JmPattern(type, "[新規作成]", "1"));
 	}
 	
 	public void setPackage00En() throws JmException {
diff --git a/workspace/JuggleMaster/src/com/jm/db/Dao.java b/workspace/JuggleMaster/src/com/jm/db/Dao.java
index 551084e..756777f 100644
--- 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,"
 				+ "idx integer);"
 			);
+		db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");
+		db.execSQL("ALTER TABLE pattern ADD COLUMN idx integer;");
 		start(db);
 	}
 	
@@ -57,6 +59,11 @@ public class Dao {
 	
 	public void add(JmPattern jp, int index) throws JmException{
 		DatabaseHelper helper = DatabaseHelper.getInstance();
+		add(jp, helper.getLangId(), index);
+	}
+	
+	public void add(JmPattern jp, int lang, int index) throws JmException{
+		DatabaseHelper helper = DatabaseHelper.getInstance();
 		SQLiteDatabase db = helper.getWritableDatabase();
 		db.beginTransaction();
 		try {
@@ -68,7 +75,7 @@ public class Dao {
 			stmt.bindLong(i++, jp.getDwell());
 			stmt.bindString(i++, jp.getName());
 			stmt.bindString(i++, jp.motionToString());
-			stmt.bindLong(i++, helper.getLangId());
+			stmt.bindLong(i++, lang);
 			stmt.bindLong(i++, index);
 			stmt.executeInsert();
 			db.setTransactionSuccessful();
@@ -134,9 +141,14 @@ public class Dao {
 
 	public JmPattern[] get(SQLiteDatabase db, int type) throws JmException{
 		DatabaseHelper helper = DatabaseHelper.getInstance();
-		JmPattern[] list = null;
 		String selection = "lang = " + helper.getLangId() + " and type = " + type;
 		String orderBy = "idx";
+		return get(db, selection, orderBy);
+	}
+	
+	public JmPattern[] get(SQLiteDatabase db, String selection, String orderBy) throws JmException{
+		DatabaseHelper helper = DatabaseHelper.getInstance();
+		JmPattern[] list = null;
 		Cursor c = db.query(
 				"pattern",
 				new String[] {
diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java
index 28771a7..6833f81 100644
--- 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;
 	public final static int JAPANEASE_ID = 2;
 	private static int langId = -1;
-	private static boolean type6Flag = false;
 	private static boolean convFlag = false;
 	
 	private static DatabaseHelper instance = null;
@@ -37,21 +36,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 		if (count <= 0) {
 			p.create();
 		}
-		if (type6Flag){
-			p.update();
-			type6Flag = false;
-		}
-		
 		if (convFlag){
-			conv(context);
+			p.update();			
 			convFlag = false;
 		}
 	}
 
-	private static void conv(Context context) {
-		;
-	}
-	
 	public DatabaseHelper(Context context) {
 		//super(context, "JuggleMaster.db", null, 1);
 		super(context, "JuggleMaster.db", null, 2);
@@ -83,7 +73,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 				
 				Dao dao = Dao.getInstance();
 				for (int i = 0; i < 7; i++){
-					JmPattern[] list = dao.get(db, i);
+					JmPattern[] list = dao.get(db, "type = " + i, null);
 					int size = list.length;
 					for (int j = 0; j < size; j++){
 						JmPattern item = list[j];
@@ -94,13 +84,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 				
 				// 既存のデータは、日本語のデータに変換
 				db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID + " WHERE TYPE <> 6;");
+				db.execSQL("DELETE FROM pattern WHERE NAME = '[新規作成]';");
 				// ただし、マイパターンは、システムの言語に
-				if (langId != JAPANEASE_ID){
-					type6Flag = true;
-				}
 				db.execSQL("UPDATE pattern set LANG = " + langId + " WHERE TYPE = 6;");
 				db.execSQL("create index langindex on pattern(lang);");
-				db.execSQL("create index langindex on pattern(idx);");
+				db.execSQL("create index idxindex on pattern(idx);");
 				
 				convFlag = true;
 			}