public static final int common_settings=0x7f040010;
public static final int create=0x7f040012;
public static final int delete=0x7f040008;
- public static final int error_unexpected=0x7f040020;
+ public static final int error_unexpected=0x7f040021;
public static final int generate=0x7f04001b;
public static final int handling=0x7f04000d;
public static final int height=0x7f04000e;
public static final int help4=0x7f040005;
public static final int hold=0x7f04000f;
public static final int lang=0x7f040000;
- public static final int list0_1=0x7f040021;
- public static final int list0_2=0x7f040022;
- public static final int list0_3=0x7f040023;
- public static final int list0_4=0x7f040024;
- public static final int list0_5=0x7f040025;
- public static final int list0_6=0x7f040026;
- public static final int list0_7=0x7f040027;
- public static final int list0_8=0x7f040028;
- public static final int message_delete_pattern=0x7f04001e;
- public static final int message_nopattern=0x7f04001f;
+ public static final int list0_1=0x7f040022;
+ public static final int list0_2=0x7f040023;
+ public static final int list0_3=0x7f040024;
+ public static final int list0_4=0x7f040025;
+ public static final int list0_5=0x7f040026;
+ public static final int list0_6=0x7f040027;
+ public static final int list0_7=0x7f040028;
+ public static final int list0_8=0x7f040029;
+ public static final int message_delete_pattern=0x7f04001f;
+ public static final int message_nopattern=0x7f040020;
public static final int normal=0x7f040015;
public static final int number=0x7f040017;
public static final int patternMax=0x7f04001a;
public static final int siteswap=0x7f04000c;
public static final int speed=0x7f040011;
public static final int synchronization=0x7f040016;
- public static final int title_delete=0x7f04001d;
- public static final int title_system_error=0x7f04001c;
+ public static final int title_delete=0x7f04001e;
+ public static final int title_system_error=0x7f04001d;
+ public static final int update=0x7f04001c;
}
}
<string name="patternMax">Nombre maximum de siteswap</string>
<string name="generate">Génération</string>
+ <string name="update">mettre à jour</string>
+
<string name="title_system_error">Erreur système</string>
<string name="title_delete">Effacer</string>
<string name="message_delete_pattern">Etes-vous sûr de vouloir supprimer ce pattern</string>
<string name="patternMax">パターンの最大数</string>
<string name="generate">生成</string>
+ <string name="update">更新</string>
+
<string name="title_system_error">システムエラー</string>
<string name="title_delete">削除</string>
<string name="message_delete_pattern">このパターンを削除しますか</string>
<string name="patternMax">The maximum number of patterns</string>
<string name="generate">Generation</string>
+ <string name="update">Update</string>
+
<string name="title_system_error">System Error</string>
<string name="title_delete">Delete</string>
<string name="message_delete_pattern">Are you sure you want to delete this pattern</string>
private MainGen gen;\r
private AsyncTaskCommand command;\r
private int mode = MainGen.SPT_NORMAL;\r
- \r
+\r
@Override\r
public void onCreate(Bundle savedInstanceState) {\r
super.onCreate(savedInstanceState);\r
spinnerPeriod1 = (Spinner) findViewById(R.id.spinner73);\r
spinnerPeriod2 = (Spinner) findViewById(R.id.spinner74);\r
spinnerMax = (Spinner) findViewById(R.id.spinner75);\r
- \r
- new SpinnersItemSelectedListener(\r
- spinnerBalls, spinnerHeight, true);\r
- new SpinnersItemSelectedListener(\r
- spinnerHeight, spinnerBalls, false);\r
-\r
- new SpinnersItemSelectedListener(\r
- spinnerPeriod1, spinnerPeriod2, true);\r
- new SpinnersItemSelectedListener(\r
- spinnerPeriod2, spinnerPeriod1, false);\r
- \r
+\r
+ new SpinnersItemSelectedListener(spinnerBalls, spinnerHeight, true);\r
+ new SpinnersItemSelectedListener(spinnerHeight, spinnerBalls, false);\r
+\r
+ new SpinnersItemSelectedListener(spinnerPeriod1, spinnerPeriod2, true);\r
+ new SpinnersItemSelectedListener(spinnerPeriod2, spinnerPeriod1, false);\r
+\r
radioGroup = (RadioGroup) findViewById(R.id.radiogroup71);\r
radioGroup.check(R.id.radio71);\r
radioButton1 = (RadioButton) findViewById(R.id.radio71);\r
radioGroup\r
.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {\r
public void onCheckedChanged(RadioGroup group, int checkedId) {\r
- if (radioButton1.isChecked()){\r
+ if (radioButton1.isChecked()) {\r
mode = MainGen.SPT_NORMAL;\r
- }\r
- else {\r
+ } else {\r
mode = MainGen.SPT_SYNCHRO;\r
}\r
}\r
});\r
- \r
+\r
String[] item = new String[MAX];\r
- for (int i = 0; i < MAX; i++){\r
+ for (int i = 0; i < MAX; i++) {\r
item[i] = "" + (i + 1);\r
}\r
- ArrayAdapter<String> adapter = new ArrayAdapter<String>(\r
- this, android.R.layout.simple_spinner_item, item);\r
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,\r
+ android.R.layout.simple_spinner_item, item);\r
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);\r
\r
spinnerBalls.setAdapter(adapter);\r
\r
spinnerPeriod2.setAdapter(adapter);\r
spinnerPeriod2.setSelection(position);\r
- \r
+\r
String[] max = { "10", "100", "500", "1000" };\r
- ArrayAdapter<String> adapterMax = new ArrayAdapter<String>(\r
- this, android.R.layout.simple_spinner_item, max);\r
- adapterMax.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);\r
+ ArrayAdapter<String> adapterMax = new ArrayAdapter<String>(this,\r
+ android.R.layout.simple_spinner_item, max);\r
+ adapterMax\r
+ .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);\r
spinnerMax.setAdapter(adapterMax);\r
spinnerMax.setSelection(1);\r
}\r
@Override\r
protected void onStart() {\r
super.onStart();\r
- \r
+\r
setEnabled(true);\r
Menu2.setList(null);\r
}\r
- \r
+\r
@Override\r
protected void onStop() {\r
super.onStop();\r
- \r
- if (command != null){\r
+\r
+ if (command != null) {\r
command.stop();\r
command = null;\r
}\r
int balls = Integer.parseInt(ballsStr);\r
int height = Integer.parseInt(heightStr);\r
int max = Integer.parseInt(maxStr);\r
- \r
+\r
String periodStr = "" + period1Str + "-" + period2Str;\r
- \r
+\r
gen = new MainGen(this, mode, balls, height, periodStr, max);\r
- command = new AsyncTaskCommand(this, gen, true);\r
- command.execute((String[])null);\r
+ command = new AsyncTaskCommand(this, gen,\r
+ getString(R.string.calculating), true);\r
+ command.execute((String[]) null);\r
setEnabled(false);\r
}\r
- \r
+\r
public void createDone(boolean isCancel) {\r
command = null;\r
- if (isCancel){\r
+ if (isCancel) {\r
setEnabled(true);\r
return;\r
}\r
JmPattern[] list = Menu2.getList();\r
int size = list.length;\r
- \r
+\r
// パターンが無い場合\r
- if (size <= 0){\r
+ if (size <= 0) {\r
Toast.makeText(this, R.string.message_nopattern, Toast.LENGTH_LONG)\r
.show();\r
setEnabled(true);\r
\r
Intent intent = new Intent(GenPattern.this, (Class<?>) Menu2.class);\r
intent.putExtra("INDEX", Menu1.INDEX7);\r
- startActivityForResult(intent, -1); \r
+ startActivityForResult(intent, -1);\r
}\r
- \r
- private void setEnabled(boolean flag){\r
+\r
+ private void setEnabled(boolean flag) {\r
radioGroup.setEnabled(flag);\r
radioButton1.setEnabled(flag);\r
radioButton2.setEnabled(flag);\r
package com.jm;\r
\r
import android.content.Intent;\r
-import android.database.sqlite.SQLiteDatabase;\r
import android.os.Bundle;\r
import android.view.View;\r
import android.widget.AdapterView;\r
count = Dao.getInstance().countAll();\r
if (count <= 0 || convFlag) {\r
InitDB idb = new InitDB(this.getApplicationContext());\r
- AsyncTaskCommand command = new AsyncTaskCommand(this, idb, false);\r
- command.execute((String[])null);\r
+ AsyncTaskCommand command = new AsyncTaskCommand(this, idb,\r
+ getString(R.string.update), false);\r
+ command.execute((String[]) null);\r
return false;\r
}\r
} catch (JmException e) {\r
- // TODO Auto-generated catch block\r
- e.printStackTrace();\r
return true;\r
}\r
return false;\r
private SQLiteStatement insertStmt = null;\r
private SQLiteStatement updateStmt = null;\r
private SQLiteStatement deleteStmt = null;\r
- \r
- public static Dao getInstance(){\r
+\r
+ public static Dao getInstance() {\r
return instance;\r
}\r
- \r
- private Dao(){\r
+\r
+ private Dao() {\r
\r
}\r
- \r
- public void init(SQLiteDatabase db){\r
- db.execSQL(\r
- "create table pattern ("\r
- + "id integer primary key, "\r
- + "type integer not null, "\r
- + "siteswap text not null, "\r
- + "height integer, "\r
- + "dwell integer, "\r
- + "name integer, "\r
- + "motion text,"\r
- + "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
+\r
+ public void init(SQLiteDatabase db) {\r
+ db.execSQL("create table pattern (" + "id integer primary key, "\r
+ + "type integer not null, " + "siteswap text not null, "\r
+ + "height integer, " + "dwell integer, " + "name integer, "\r
+ + "motion text," + "lang integer," + "idx integer);");\r
start(db);\r
}\r
- \r
+\r
public void start(SQLiteDatabase db) {\r
- try {\r
- insertStmt = db.compileStatement(\r
- "insert into pattern ("\r
- + "type, siteswap, height, dwell, name, motion, lang, idx"\r
- + ") values ("\r
- + "?, ?, ?, ?, ?, ?, ?, ?"\r
- + ");"); \r
- updateStmt = db.compileStatement(\r
- "update pattern set "\r
- + "siteswap = ?, height = ?, dwell = ?, name = ?, motion = ? "\r
- + "where id = ? and lang = ?;");\r
- deleteStmt = db.compileStatement(\r
- "delete from pattern where id = ? and lang = ?;");\r
- }\r
- catch (Exception e){\r
- // TODO\r
- e.printStackTrace();\r
- throw new RuntimeException();\r
- }\r
+ insertStmt = db.compileStatement("insert into pattern ("\r
+ + "type, siteswap, height, dwell, name, motion, lang, idx"\r
+ + ") values (" + "?, ?, ?, ?, ?, ?, ?, ?" + ");");\r
+ updateStmt = db.compileStatement("update pattern set "\r
+ + "siteswap = ?, height = ?, dwell = ?, name = ?, motion = ? "\r
+ + "where id = ? and lang = ?;");\r
+ deleteStmt = db\r
+ .compileStatement("delete from pattern where id = ? and lang = ?;");\r
}\r
- \r
- public void add(JmPattern jp, int index) throws JmException{\r
+\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 addNT(JmPattern jp, int index) throws JmException{\r
+\r
+ public void addNT(JmPattern jp, int index) throws JmException {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
addNT(jp, helper.getLangId(), index);\r
}\r
- \r
- public void add(JmPattern jp, int lang, int index) throws JmException{\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
stmt.bindLong(i++, index);\r
stmt.executeInsert();\r
db.setTransactionSuccessful();\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
} finally {\r
db.endTransaction();\r
}\r
}\r
- \r
- public void addNT(JmPattern jp, int lang, int index) throws JmException{\r
+\r
+ public void addNT(JmPattern jp, int lang, int index) throws JmException {\r
try {\r
int i = 1;\r
SQLiteStatement stmt = insertStmt;\r
stmt.bindLong(i++, lang);\r
stmt.bindLong(i++, index);\r
stmt.executeInsert();\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
}\r
\r
- public void set(JmPattern jp) throws JmException{\r
+ public void set(JmPattern jp) throws JmException {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
SQLiteDatabase db = helper.getWritableDatabase();\r
db.beginTransaction();\r
stmt.bindLong(i++, helper.getLangId());\r
stmt.execute();\r
db.setTransactionSuccessful();\r
- } catch (SQLException e){\r
- throw new JmException(e);\r
+ } catch (SQLException e) {\r
+ throw new JmException(e);\r
} finally {\r
db.endTransaction();\r
}\r
}\r
\r
- public void delete(int id) throws JmException{\r
+ public void delete(int id) throws JmException {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
SQLiteDatabase db = helper.getWritableDatabase();\r
db.beginTransaction();\r
stmt.bindLong(i++, helper.getLangId());\r
stmt.execute();\r
db.setTransactionSuccessful();\r
- } catch (SQLException e){\r
- throw new JmException(e);\r
+ } catch (SQLException e) {\r
+ throw new JmException(e);\r
} finally {\r
db.endTransaction();\r
}\r
}\r
\r
- public JmPattern[] get(int type) throws JmException{\r
+ public JmPattern[] get(int type) throws JmException {\r
JmPattern[] list = null;\r
try {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
SQLiteDatabase db = helper.getReadableDatabase();\r
list = get(db, type);\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return list;\r
}\r
\r
- public JmPattern[] get(SQLiteDatabase db, int type) throws JmException{\r
+ public JmPattern[] get(SQLiteDatabase db, int type) throws JmException {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
- String selection = "lang = " + helper.getLangId() + " and type = " + type;\r
+ String selection = "lang = " + helper.getLangId() + " and type = "\r
+ + 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
+\r
+ public JmPattern[] get(SQLiteDatabase db, String selection, String orderBy)\r
+ throws JmException {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
JmPattern[] list = null;\r
- Cursor c = db.query(\r
- "pattern",\r
- new String[] {\r
- "id",\r
- "type",\r
- "siteswap",\r
- "height",\r
- "dwell",\r
- "name",\r
- "motion"},\r
- selection, null, null, null, orderBy);\r
+ Cursor c = db.query("pattern", new String[] { "id", "type", "siteswap",\r
+ "height", "dwell", "name", "motion" }, selection, null, null,\r
+ null, orderBy);\r
c.moveToFirst();\r
list = new JmPattern[c.getCount()];\r
for (int i = 0; i < list.length; i++) {\r
- JmPattern jp = new JmPattern(\r
- c.getInt(0), // id\r
+ JmPattern jp = new JmPattern(c.getInt(0), // id\r
c.getInt(1), // type\r
c.getString(5), // name\r
c.getString(2), // siteswap\r
c.getInt(3), // height\r
c.getInt(4), // dwell\r
JmPattern.getMotion(c.getString(6))); // motions\r
- list[i] = jp;\r
- c.moveToNext();\r
+ list[i] = jp;\r
+ c.moveToNext();\r
}\r
c.close();\r
return list;\r
}\r
- \r
- public JmPattern[] getFromId(int id) throws JmException{\r
+\r
+ public JmPattern[] getFromId(int id) throws JmException {\r
JmPattern[] list = null;\r
try {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
SQLiteDatabase db = helper.getReadableDatabase();\r
- String selection = "id = " + id + " and lang = " + helper.getLangId();\r
- Cursor c = db.query(\r
- "pattern",\r
- new String[] {\r
- "id",\r
- "type",\r
- "siteswap",\r
- "height",\r
- "dwell",\r
- "name",\r
- "motion"},\r
- selection, null, null, null, null);\r
+ String selection = "id = " + id + " and lang = "\r
+ + helper.getLangId();\r
+ Cursor c = db.query("pattern", new String[] { "id", "type",\r
+ "siteswap", "height", "dwell", "name", "motion" },\r
+ selection, null, null, null, null);\r
c.moveToFirst();\r
list = new JmPattern[c.getCount()];\r
for (int i = 0; i < list.length; i++) {\r
- JmPattern jp = new JmPattern(\r
- c.getInt(0), // id\r
+ JmPattern jp = new JmPattern(c.getInt(0), // id\r
c.getInt(1), // type\r
c.getString(5), // name\r
c.getString(2), // siteswap\r
c.getInt(3), // height\r
c.getInt(4), // dwell\r
JmPattern.getMotion(c.getString(6))); // motions\r
- list[i] = jp;\r
- c.moveToNext();\r
+ list[i] = jp;\r
+ c.moveToNext();\r
}\r
c.close();\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return list;\r
}\r
\r
- public int max(int type) throws JmException{\r
+ public int max(int type) throws JmException {\r
int m = -1;\r
try {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
SQLiteDatabase db = helper.getReadableDatabase();\r
- String sql = "select max(idx) from pattern where type = " + type + " and lang = " + helper.getLangId();\r
+ String sql = "select max(idx) from pattern where type = " + type\r
+ + " and lang = " + helper.getLangId();\r
Cursor c = db.rawQuery(sql, null);\r
c.moveToFirst();\r
m = c.getInt(0);\r
c.close();\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return m;\r
}\r
- \r
- public int countAll() throws JmException{\r
+\r
+ public int countAll() throws JmException {\r
int count = -1;\r
try {\r
DatabaseHelper helper = DatabaseHelper.getInstance();\r
c.moveToFirst();\r
count = c.getInt(0); // count;\r
c.close();\r
- } catch (SQLException e){\r
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return count;\r
}\r
\r
- public int count() throws JmException{\r
+ public int count() 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 lang = " + helper.getLangId() + ";";\r
+ String sql = "select count(*) from pattern where lang = "\r
+ + 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
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return count;\r
}\r
\r
- public int count(int type) throws JmException{\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
+ String sql = "select count(*) from pattern where type = " + type\r
+ + " 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
+ } catch (SQLException e) {\r
throw new JmException(e);\r
}\r
return count;\r
import android.database.sqlite.SQLiteOpenHelper;\r
\r
import com.jm.JmPattern;\r
-import com.jm.PatternList;\r
import com.jm.utility.Debug;\r
import com.jm.utility.JmException;\r
\r
if (instance != null) {\r
return;\r
}\r
- \r
+\r
DatabaseHelper helper = new DatabaseHelper(context);\r
- \r
+\r
// onCreate, onUpgradeを呼び出す\r
SQLiteDatabase db = helper.getWritableDatabase();\r
\r
// アップグレードで無ければ、SQL分を定義\r
// アップデートの場合は、後で実行する\r
- if (!helper.getConvFlag()){\r
+ if (!helper.getConvFlag()) {\r
Dao.getInstance().start(db);\r
}\r
- // TODO\r
- // SQLiteDatabase db = helper.getWritableDatabase();\r
- // int count;\r
- // int type = 0;\r
- // count = Dao.getInstance().count(type);\r
- // Dao.getInstance().start(db);\r
- // PatternList p = new PatternList();\r
- // if (count <= 0) {\r
- // p.create();\r
- // }\r
- // if (convFlag){\r
- // p.update();\r
- // convFlag = false;\r
- // }\r
}\r
\r
public DatabaseHelper(Context context) {\r
\r
@Override\r
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
- try {\r
- if (oldVersion == 1 && newVersion == 2) {\r
- // db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");\r
- // db.execSQL("ALTER TABLE pattern ADD COLUMN idx integer;");\r
- //\r
- // Dao dao = Dao.getInstance();\r
- // for (int i = 0; i < 7; 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
- // int id = item.getId();\r
- // db.execSQL("UPDATE pattern set idx = " + j + " WHERE id = " +\r
- // id + ";");\r
- // }\r
- // }\r
- //\r
- // int langId = getLangId();\r
- //\r
- // // 既存のデータは、日本語のデータに変換\r
- // db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID +\r
- // " WHERE TYPE <> 6;");\r
- // db.execSQL("DELETE FROM pattern WHERE NAME = '[新規作成]';");\r
- // // ただし、マイパターンは、システムの言語に\r
- // db.execSQL("UPDATE pattern set LANG = " + langId +\r
- // " WHERE TYPE = 6;");\r
- // db.execSQL("create index langindex on pattern(lang);");\r
- // db.execSQL("create index idxindex on pattern(idx);");\r
-\r
- convFlag = true;\r
- }\r
- } catch (Exception e) {\r
- e.printStackTrace(); // TODO\r
+ if (oldVersion == 1 && newVersion == 2) {\r
+ convFlag = true;\r
}\r
}\r
\r
- public void convert(SQLiteDatabase db, int langId) {\r
- try {\r
- db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");\r
- db.execSQL("ALTER TABLE pattern ADD COLUMN idx integer;");\r
-\r
- Dao dao = Dao.getInstance();\r
- for (int i = 0; i < 7; i++) {\r
- JmPattern[] list;\r
- 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
- int id = item.getId();\r
- db.execSQL("UPDATE pattern set idx = " + j + " WHERE id = "\r
- + id + ";");\r
- }\r
+ public void convert(SQLiteDatabase db, int langId) throws JmException {\r
+ db.execSQL("ALTER TABLE pattern ADD COLUMN lang integer;");\r
+ db.execSQL("ALTER TABLE pattern ADD COLUMN idx integer;");\r
+\r
+ Dao dao = Dao.getInstance();\r
+ for (int i = 0; i < 7; i++) {\r
+ JmPattern[] list;\r
+ 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
+ int id = item.getId();\r
+ db.execSQL("UPDATE pattern set idx = " + j + " WHERE id = "\r
+ + id + ";");\r
}\r
-\r
- // 既存のデータは、日本語のデータに変換\r
- db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID\r
- + " WHERE TYPE <> 6;");\r
- db.execSQL("DELETE FROM pattern WHERE NAME = '[新規作成]';");\r
- // ただし、マイパターンは、システムの言語に\r
- db.execSQL("UPDATE pattern set LANG = " + langId\r
- + " WHERE TYPE = 6;");\r
- db.execSQL("create index langindex on pattern(lang);");\r
- db.execSQL("create index idxindex on pattern(idx);");\r
- } catch (JmException e) {\r
- // TODO Auto-generated catch block\r
- e.printStackTrace();\r
}\r
+\r
+ // 既存のデータは、日本語のデータに変換\r
+ db.execSQL("UPDATE pattern set LANG = " + JAPANEASE_ID\r
+ + " WHERE TYPE <> 6;");\r
+ db.execSQL("DELETE FROM pattern WHERE NAME = '[新規作成]';");\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 idxindex on pattern(idx);");\r
+\r
convFlag = false;\r
}\r
\r
- public boolean getConvFlag(){\r
+ public boolean getConvFlag() {\r
return convFlag;\r
}\r
- \r
+\r
public void setLangId(int id) {\r
langId = id;\r
}\r
import com.jm.utility.JmException;
public class InitDB implements AsyncTaskIF {
- // TODO
- private Context context;
-
public InitDB(Context context) {
- this.context = context;
+ //this.context = context;
}
@Override
Dao.getInstance().start(db);
p.create(DatabaseHelper.JAPANEASE_ID);
- p.update();
}
else {
helper.setLangId(DatabaseHelper.JAPANEASE_ID);
db.setTransactionSuccessful();
} catch (JmException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // 失敗
} finally {
db.endTransaction();
}
@Override
public void cancel() {
- // TODO Auto-generated method stub
}
@Override
public void done(boolean isCancel) {
- // TODO Auto-generated method stub
}
private AsyncTaskIF command;\r
private ProgressDialog dialog;\r
private boolean isCancel = false;\r
+ \r
+ private String title;\r
private boolean isCancelable;\r
\r
@SuppressWarnings({ "rawtypes", "unchecked" })\r
- public AsyncTaskCommand(Activity activity, AsyncTaskIF command,\r
+ public AsyncTaskCommand(Activity activity, AsyncTaskIF command, String title,\r
boolean isCancelable) {\r
this.activityRef = new WeakReference(activity);\r
this.command = command;\r
+ this.title = title;\r
this.isCancelable = isCancelable;\r
}\r
\r
dialog = new ProgressDialog(activity);\r
dialog.setIndeterminate(true);\r
dialog.setCancelable(isCancelable);\r
- dialog.setTitle(activity.getString(R.string.calculating));\r
+ dialog.setTitle(title);\r
if (isCancelable) {\r
dialog.setButton(activity.getString(R.string.cancel),\r
new DialogInterface.OnClickListener() {\r
OSDN Git Service
