launch TaskActivity with <id>.jar and jar name

diff --git a/LectureFolder/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java b/LectureFolder/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java
index 9ca788d..6e88230 100644 (file)
--- a/LectureFolder/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java
+++ b/LectureFolder/src/jp/ac/titech/sharp4k/cuten/LectureActivity.java
@@ -22,6 +22,7 @@ public class LectureActivity extends Activity implements OnClickListener {
        private static final String TAG = "LectureActivity";
        private static final int TASK_REQUEST_CODE = 9;
        private String[] taskNames;
+
        @Override
        public void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
@@ -88,12 +89,12 @@ public class LectureActivity extends Activity implements OnClickListener {
                        c.moveToFirst();
                        int col = 2;
                        String[][] tasklist = new String[c.getCount()][col];
-                       taskNames=new String[c.getCount()];
+                       taskNames = new String[c.getCount()];
                        for (int i = 0; i < tasklist.length; i++) {
                                for (int j = 0; j < col; j++) {
                                        tasklist[i][j] = c.getString(j);
                                }
-                               taskNames[i]=tasklist[i][1];
+                               taskNames[i] = tasklist[i][1];
                                // ボタン作成
                                Button b = new Button(this);
                                // 背景
@@ -136,16 +137,33 @@ public class LectureActivity extends Activity implements OnClickListener {
 
        public void onClick(View v) {
                Integer id = v.getId();
-               String taskName = taskNames[id];
-               String jarName = id.toString()+".jar";
-               String qualName = "jp.ac.titech.sharp4k.cuten.sampletask.Hello3Task";
-               Intent intent = new Intent(this,TaskActivity.class);
+               // データベース読み取りor作成
+               DatabaseHelper h = new DatabaseHelper(this);
+               final SQLiteDatabase db = h.getReadableDatabase();
+               // DBから名前取得
+               String[] arg = { id.toString() };
+               Cursor c = db
+                               .rawQuery(
+                                               "SELECT jars.name,tasks.name from tasks,jars WHERE tasks.id=? AND tasks.id=jars.task_id;",
+                                               arg);
+               if (c.getCount() == 0) {
+                       Log.d(TAG, "jar id = " + id.toString() + " : not found");
+               }
+               c.moveToFirst();
+               String qualName = c.getString(0);
+               String taskName = c.getString(1);
+               c.close();
+               db.close();
+               //
+               String jarName = id.toString() + ".jar";
+               Intent intent = new Intent(this, TaskActivity.class);
                intent.putExtra(TaskActivity.TASK_NAME_KEY, taskName);
                intent.putExtra(TaskActivity.JAR_NAME_KEY, jarName);
                intent.putExtra(TaskActivity.QUAL_NAME_KEY, qualName);
                Log.d(TAG, "startActivity: " + jarName + ":" + qualName);
                startActivityForResult(intent, TASK_REQUEST_CODE);
        }
+
        @Override
        public void onActivityResult(int requestCode, int resultCode, Intent intent) {
                super.onActivityResult(requestCode, resultCode, intent);
@@ -175,7 +193,7 @@ public class LectureActivity extends Activity implements OnClickListener {
 
        class DatabaseHelper extends SQLiteOpenHelper {
                public DatabaseHelper(Context context) {
-                       super(context, "test.db", null, 1);
+                       super(context, "cuten", null, 1);
                }
 
                @Override
@@ -211,8 +229,15 @@ public class LectureActivity extends Activity implements OnClickListener {
                        for (Object[] teacher : teacherData) {
                                db.execSQL(insertTeacher, teacher);
                        }
-                       // db.execSQL("INSERT INTO \"teachers\" (\"name\" , \"teacher_id\" , \"created_at\", \"updated_at\") VALUES (\"test\",3,'2001/4/1','2001/4/1');");
-                       
+                       // add jars
+                       String insertJar = "INSERT INTO \"jars\" (\"name\" ,\"revision\",\"task_id\",\"created_at\", \"updated_at\") VALUES (?,0,?,datetime() ,datetime() );";
+                       // name,teacher_id
+                       Object[][] jarData = { { "a", 0 }, { "a", 1 }, { "a", 2 },
+                                       { "jp.ac.titech.sharp4k.cuten.sampletask.Hello3Task", 3 },
+                                       { "jp.ac.titech.sharp4k.cuten.sampletask.Hello3Task", 4 }, };
+                       for (Object[] jar : jarData) {
+                               db.execSQL(insertJar, jar);
+                       }
                }
 
                @Override