ver1.3.0a

[jugglemaster/source.git] / workspace / JuggleMaster / src / com / jm / JuggleView.java

diff --git a/workspace/JuggleMaster/src/com/jm/JuggleView.java b/workspace/JuggleMaster/src/com/jm/JuggleView.java
index 00f5bf3..428a210 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/JuggleView.java
+++ b/workspace/JuggleMaster/src/com/jm/JuggleView.java
@@ -5,7 +5,9 @@ import javax.microedition.khronos.opengles.GL10;
 import android.os.Bundle;\r
 import android.view.MotionEvent;\r
 \r
-import com.jm.db.Dao;\r
+import com.jm.common.Constant;\r
+import com.jm.db.DaoFactory;\r
+import com.jm.db.IDao;\r
 import com.jm.opengl.JuggleDrawer;\r
 import com.jm.opengl.OpenGLActivityBase;\r
 import com.jm.utility.JmException;\r
@@ -58,9 +60,14 @@ public class JuggleView extends OpenGLActivityBase {
            Bundle extras = getIntent().getExtras();\r
                try {\r
                        JmPattern jp = null;\r
-                       int id = extras.getInt("ID");\r
+                       int id = extras.getInt(Constant.EXTRAS_ID);\r
                        if (id >= 0) {\r
-                               JmPattern[] list = Dao.getInstance().getFromId(id);\r
+                               IDao<?> dao = DaoFactory.getInstance().getDao();\r
+                               JmPattern[] list = dao.getFromId(id);\r
+                               if (list == null){\r
+                               finish();\r
+                                       return;\r
+                               }\r
                                if (list.length <= 0) {\r
                                        throw new JmException();\r
                                }\r