ver1.3.0b

[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 80df93c..89143b0 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/JuggleView.java
+++ b/workspace/JuggleMaster/src/com/jm/JuggleView.java
@@ -4,11 +4,13 @@ import javax.microedition.khronos.opengles.GL10;
 \r
 import android.os.Bundle;\r
 import android.view.MotionEvent;\r
-import android.widget.Toast;\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.Debug;\r
 import com.jm.utility.JmException;\r
 import com.jm.utility.Resource;\r
 \r
@@ -59,9 +61,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
@@ -73,9 +80,11 @@ public class JuggleView extends OpenGLActivityBase {
                        drawer = new JuggleDrawer(this, jp);\r
                        drawer.clear();\r
                } catch (JmException e) {\r
-                       showDialog(this, e);\r
+                       Debug.d(this, e.getMessage());\r
+                       finish();\r
                } catch (Exception e) {\r
-                       showDialog(this, e);\r
+                       Debug.d(this, e.getMessage());\r
+                       finish();\r
                }\r
        }\r
 \r