debug

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 4f82f32..0688f2a 100644 (file)
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 944b45b..69cb919 100644 (file)
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/Edit$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$1.class
index c4b86cd..1135f41 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$1.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class
index 9938791..77c1981 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class
index cf9b56a..6317b10 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class
index 374dd52..2ce2ee0 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class
index 206ab02..0a7c208 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class
index 728a4df..804d21e 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class
index d9957ac..ad1e16d 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class
index c249325..d742e84 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class
index 8a9685d..99e2e9b 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit.class
index 411fad6..ce98495 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class
index 8ce495d..0bbc33e 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/R$string.class b/workspace/JuggleMaster/bin/classes/com/jm/R$string.class
index b62b285..4d8ceca 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/R$string.class and b/workspace/JuggleMaster/bin/classes/com/jm/R$string.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class
index ccd5cb2..e90b8bb 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index a9ebe85..c331f45 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/gen/com/jm/R.java b/workspace/JuggleMaster/gen/com/jm/R.java
index 40d7c1a..50b3a8a 100644 (file)
--- a/workspace/JuggleMaster/gen/com/jm/R.java
+++ b/workspace/JuggleMaster/gen/com/jm/R.java
@@ -94,14 +94,14 @@ public final class R {
         public static final int help4=0x7f040005;
         public static final int hold=0x7f04000f;
         public static final int lang=0x7f040000;
-        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 list0_1=0x7f040023;
+        public static final int list0_2=0x7f040024;
+        public static final int list0_3=0x7f040025;
+        public static final int list0_4=0x7f040026;
+        public static final int list0_5=0x7f040027;
+        public static final int list0_6=0x7f040028;
+        public static final int list0_7=0x7f040029;
+        public static final int list0_8=0x7f04002a;
         public static final int message_delete_pattern=0x7f04001f;
         public static final int message_nopattern=0x7f040020;
         public static final int normal=0x7f040015;
@@ -112,6 +112,7 @@ public final class R {
         public static final int period=0x7f040019;
         public static final int save=0x7f040007;
         public static final int siteswap=0x7f04000c;
+        public static final int siteswap_error=0x7f040022;
         public static final int speed=0x7f040011;
         public static final int synchronization=0x7f040016;
         public static final int title_delete=0x7f04001e;

diff --git a/workspace/JuggleMaster/res/values-fr/strings.xml b/workspace/JuggleMaster/res/values-fr/strings.xml
index 4f9681c..617cb3a 100644 (file)
--- a/workspace/JuggleMaster/res/values-fr/strings.xml
+++ b/workspace/JuggleMaster/res/values-fr/strings.xml
@@ -38,6 +38,8 @@
     <string name="message_delete_pattern">Etes-vous sûr de vouloir supprimer ce pattern</string>
     <string name="message_nopattern">Il n\'existe pas de pattern</string>
     <string name="error_unexpected">Une erreur inattendue s\'est produite</string>
+
+    <string name="siteswap_error">Erreur</string>
     
     <string name="list0_1">[1] 3 Balles : Partie 1</string>
     <string name="list0_2">[2] 3 Balles : Partie 2</string>

diff --git a/workspace/JuggleMaster/res/values-ja/strings.xml b/workspace/JuggleMaster/res/values-ja/strings.xml
index eb93a56..a0b3206 100644 (file)
--- a/workspace/JuggleMaster/res/values-ja/strings.xml
+++ b/workspace/JuggleMaster/res/values-ja/strings.xml
@@ -39,6 +39,8 @@
     <string name="message_nopattern">パターンがありません</string>
     <string name="error_unexpected">予期しないエラーが発生しました</string>
     
+    <string name="siteswap_error">エラー</string>
+    
     <string name="list0_1">[1] 3ボール その1</string>
     <string name="list0_2">[2] 3ボール その2</string>
     <string name="list0_3">[3] 4ボール</string>

diff --git a/workspace/JuggleMaster/res/values/strings.xml b/workspace/JuggleMaster/res/values/strings.xml
index 1878dc4..ba60e06 100644 (file)
--- a/workspace/JuggleMaster/res/values/strings.xml
+++ b/workspace/JuggleMaster/res/values/strings.xml
@@ -38,6 +38,8 @@
     <string name="message_delete_pattern">Are you sure you want to delete this pattern</string>
     <string name="message_nopattern">There is no pattern</string>
     <string name="error_unexpected">An unexpected error has occurred</string>
+
+    <string name="siteswap_error">Error</string>
     
     <string name="list0_1">[1] 3 Balls Part 1</string>
     <string name="list0_2">[2] 3 Balls Part 2</string>

diff --git a/workspace/JuggleMaster/src/com/jm/Edit.java b/workspace/JuggleMaster/src/com/jm/Edit.java
index 6b4db42..fd86083 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/Edit.java
+++ b/workspace/JuggleMaster/src/com/jm/Edit.java
@@ -21,99 +21,102 @@ import com.jm.utility.Resource;
 public class Edit extends BaseActivity {\r
        public final static int NEW = 1;\r
        public final static int EDIT = 2;\r
-       \r
-    private EditText patternEdit = null;\r
-    private EditText siteswapEdit = null; \r
-    private EditText motionEdit = null;\r
-    private TextView heightTextView = null;\r
-    private SeekBar heightSeekBar = null;\r
-    private TextView dwellTextView = null;\r
-    private SeekBar dwellSeekBar = null;\r
-    private TextView speedTextView = null;\r
-    private SeekBar speedSeekBar = null;\r
-    private Button okButton = null;\r
-    private Button deleteButton = null;\r
-    private Button cancelButton = null;\r
-\r
-    private int id;\r
-    private int index;\r
-    private int mode;\r
-    private int type = -1;\r
-    \r
-    public void onCreate(Bundle savedInstanceState) {\r
-           super.onCreate(savedInstanceState);\r
-           setContentView(R.layout.edit);\r
- \r
-           patternEdit = (EditText)findViewById(R.id.PatternEdit);\r
-           siteswapEdit = (EditText)findViewById(R.id.SiteswapEdit);\r
-           motionEdit = (EditText)findViewById(R.id.MotionEdit);\r
-           heightTextView = (TextView)findViewById(R.id.HeightLabel);\r
-           heightSeekBar = (SeekBar)findViewById(R.id.HeightValue);\r
-           dwellTextView = (TextView)findViewById(R.id.DwellLabel);\r
-           dwellSeekBar = (SeekBar)findViewById(R.id.DwellValue);\r
-           speedTextView = (TextView)findViewById(R.id.SpeedLabel);\r
-           speedSeekBar = (SeekBar)findViewById(R.id.SpeedValue);\r
-           okButton = (Button)findViewById(R.id.OkButton);\r
-           deleteButton = (Button)findViewById(R.id.DeleteButton);\r
-           cancelButton = (Button)findViewById(R.id.CancelButton);\r
-\r
-           Bundle extras = getIntent().getExtras();\r
-           mode = extras.getInt("MODE");\r
-           if (mode == NEW){\r
-               type = 6;\r
-                   patternEdit.setText("");\r
-                   siteswapEdit.setText("");\r
-                   motionEdit.setText("");\r
-                   heightSeekBar.setProgress(getProgressValue(50));\r
-                   dwellSeekBar.setProgress(getProgressValue(50));\r
-                   \r
-                   deleteButton.setEnabled(false);\r
-           }\r
-           else {\r
-               try {\r
-                           id = extras.getInt("ID");\r
-                           JmPattern[] list = Dao.getInstance().getFromId(id);\r
-                           if (list.length <= 0){\r
-                               return;\r
-                           }\r
-                           JmPattern jp = list[0];\r
-                           patternEdit.setText(jp.getName());\r
-                           siteswapEdit.setText(jp.getSiteSwap().toString());\r
-                           motionEdit.setText(jp.motionToString());\r
-                           heightSeekBar.setProgress(getProgressValue(jp.getHeight()));\r
-                           dwellSeekBar.setProgress(getProgressValue(jp.getDwell()));\r
-       \r
-                           index = extras.getInt("INDEX1");\r
-                           if (index != Menu1.INDEX6){\r
-                               deleteButton.setEnabled(false);\r
-                           }\r
-               }\r
-                       catch (JmException e){\r
+\r
+       private EditText patternEdit = null;\r
+       private EditText siteswapEdit = null;\r
+       private EditText motionEdit = null;\r
+       private TextView heightTextView = null;\r
+       private SeekBar heightSeekBar = null;\r
+       private TextView dwellTextView = null;\r
+       private SeekBar dwellSeekBar = null;\r
+       private TextView speedTextView = null;\r
+       private SeekBar speedSeekBar = null;\r
+       private Button okButton = null;\r
+       private Button deleteButton = null;\r
+       private Button cancelButton = null;\r
+\r
+       private int id;\r
+       private int index;\r
+       private int mode;\r
+       private int type = -1;\r
+\r
+       public void onCreate(Bundle savedInstanceState) {\r
+               super.onCreate(savedInstanceState);\r
+               setContentView(R.layout.edit);\r
+\r
+               patternEdit = (EditText) findViewById(R.id.PatternEdit);\r
+               siteswapEdit = (EditText) findViewById(R.id.SiteswapEdit);\r
+               motionEdit = (EditText) findViewById(R.id.MotionEdit);\r
+               heightTextView = (TextView) findViewById(R.id.HeightLabel);\r
+               heightSeekBar = (SeekBar) findViewById(R.id.HeightValue);\r
+               dwellTextView = (TextView) findViewById(R.id.DwellLabel);\r
+               dwellSeekBar = (SeekBar) findViewById(R.id.DwellValue);\r
+               speedTextView = (TextView) findViewById(R.id.SpeedLabel);\r
+               speedSeekBar = (SeekBar) findViewById(R.id.SpeedValue);\r
+               okButton = (Button) findViewById(R.id.OkButton);\r
+               deleteButton = (Button) findViewById(R.id.DeleteButton);\r
+               cancelButton = (Button) findViewById(R.id.CancelButton);\r
+\r
+               Bundle extras = getIntent().getExtras();\r
+               mode = extras.getInt("MODE");\r
+               if (mode == NEW) {\r
+                       type = 6;\r
+                       patternEdit.setText("");\r
+                       siteswapEdit.setText("");\r
+                       motionEdit.setText("");\r
+                       heightSeekBar.setProgress(getProgressValue(50));\r
+                       dwellSeekBar.setProgress(getProgressValue(50));\r
+\r
+                       deleteButton.setEnabled(false);\r
+               } else {\r
+                       try {\r
+                               id = extras.getInt("ID");\r
+                               JmPattern[] list = Dao.getInstance().getFromId(id);\r
+                               if (list.length <= 0) {\r
+                                       return;\r
+                               }\r
+                               JmPattern jp = list[0];\r
+                               patternEdit.setText(jp.getName());\r
+                               siteswapEdit.setText(jp.getSiteSwap().toString());\r
+                               motionEdit.setText(jp.motionToString());\r
+                               heightSeekBar.setProgress(getProgressValue(jp.getHeight()));\r
+                               dwellSeekBar.setProgress(getProgressValue(jp.getDwell()));\r
+\r
+                               index = extras.getInt("INDEX1");\r
+                               if (index != Menu1.INDEX6) {\r
+                                       deleteButton.setEnabled(false);\r
+                               }\r
+                       } catch (JmException e) {\r
                                showDialog(this, e);\r
                                return;\r
                        }\r
 \r
                }\r
-               heightTextView.setText(String.valueOf(getTextValue(heightSeekBar.getProgress())));\r
-               dwellTextView.setText(String.valueOf(getTextValue(dwellSeekBar.getProgress())));\r
-           speedSeekBar.setProgress(getProgressValue(Resource.speed));\r
-               speedTextView.setText(String.valueOf(getTextValue(speedSeekBar.getProgress())));\r
+               heightTextView.setText(String.valueOf(getTextValue(heightSeekBar\r
+                               .getProgress())));\r
+               dwellTextView.setText(String.valueOf(getTextValue(dwellSeekBar\r
+                               .getProgress())));\r
+               speedSeekBar.setProgress(getProgressValue(Resource.speed));\r
+               speedTextView.setText(String.valueOf(getTextValue(speedSeekBar\r
+                               .getProgress())));\r
 \r
                setListener();\r
-    }\r
-    \r
-    private void setListener(){\r
-           patternEdit.setOnEditorActionListener(new OnEditorActionListener(){\r
+       }\r
+\r
+       private void setListener() {\r
+               patternEdit.setOnEditorActionListener(new OnEditorActionListener() {\r
                        @Override\r
                        public boolean onEditorAction(TextView arg0, int arg1, KeyEvent arg2) {\r
                                return true;\r
-                       }});\r
+                       }\r
+               });\r
 \r
-           heightSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener(){\r
+               heightSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {\r
                        @Override\r
                        public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {\r
                                heightTextView.setText(String.valueOf(getTextValue(arg1)));\r
                        }\r
+\r
                        @Override\r
                        public void onStartTrackingTouch(SeekBar seekBar) {\r
 \r
@@ -121,11 +124,11 @@ public class Edit extends BaseActivity {
 \r
                        @Override\r
                        public void onStopTrackingTouch(SeekBar seekBar) {\r
-                               \r
-                       }               \r
-           });\r
 \r
-           dwellSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener(){\r
+                       }\r
+               });\r
+\r
+               dwellSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {\r
                        @Override\r
                        public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {\r
                                dwellTextView.setText(String.valueOf(getTextValue(arg1)));\r
@@ -133,131 +136,138 @@ public class Edit extends BaseActivity {
 \r
                        @Override\r
                        public void onStartTrackingTouch(SeekBar seekBar) {\r
-                               \r
+\r
                        }\r
 \r
                        @Override\r
                        public void onStopTrackingTouch(SeekBar seekBar) {\r
-                               \r
-                       }               \r
-           });\r
 \r
-           speedSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener(){\r
+                       }\r
+               });\r
+\r
+               speedSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {\r
                        @Override\r
                        public void onProgressChanged(SeekBar seekBar, int progress,\r
                                        boolean fromUser) {\r
                                speedTextView.setText(String.valueOf(getTextValue(progress)));\r
-                               \r
+\r
                        }\r
 \r
                        @Override\r
                        public void onStartTrackingTouch(SeekBar seekBar) {\r
-                               \r
+\r
                        }\r
 \r
                        @Override\r
                        public void onStopTrackingTouch(SeekBar seekBar) {\r
-                               \r
-                       }    \r
-           });\r
-           \r
-           okButton.setOnClickListener(new OnClickListener(){\r
+\r
+                       }\r
+               });\r
+\r
+               okButton.setOnClickListener(new OnClickListener() {\r
                        @Override\r
                        public void onClick(View arg0) {\r
                                String siteswapString = siteswapEdit.getText().toString();\r
-                               if (siteswapString == null || siteswapString.length() <= 0){\r
-                                       showDialog(Resource.ERROR_TITLE, "[" + siteswapString + "]" + Resource.ERRMSG_SITESWAP);\r
+                               if (siteswapString == null || siteswapString.length() <= 0) {\r
+                                       showDialog(getString(R.string.siteswap_error),\r
+                                                       getString(R.string.siteswap) + "[" + siteswapString\r
+                                                                       + "]");\r
                                        return;\r
                                }\r
-                               if (!JmPattern.setSiteSwap(siteswapString)){\r
-                                       showDialog(Resource.ERROR_TITLE, "[" + siteswapString + "]" + Resource.ERRMSG_SITESWAP);\r
+                               if (!JmPattern.setSiteSwap(siteswapString)) {\r
+                                       showDialog(getString(R.string.siteswap_error),\r
+                                                       getString(R.string.siteswap) + "[" + siteswapString\r
+                                                                       + "]");\r
                                        return;\r
                                }\r
 \r
                                String patternString = patternEdit.getText().toString();\r
-                               if (patternString == null || patternString.length() <= 0){\r
+                               if (patternString == null || patternString.length() <= 0) {\r
                                        patternString = siteswapString;\r
                                }\r
-                               \r
+\r
                                String motionString = motionEdit.getText().toString();\r
-                               if (motionString == null || motionString.length() <= 0){\r
+                               if (motionString == null || motionString.length() <= 0) {\r
                                        motionString = "{13,0}{4,0}";\r
                                }\r
                                byte[][] motion = JmPattern.getMotion(motionString);\r
-                               if (motion == null){\r
-                                       showDialog(Resource.ERROR_TITLE, "[" + motionString + "]" + Resource.ERRMSG_MOTION);\r
+                               if (motion == null || motion.length == 0\r
+                                               && motionString.length() > 0) {\r
+                                       showDialog(getString(R.string.siteswap_error),\r
+                                                       getString(R.string.handling) + "[" + motionString\r
+                                                                       + "]");\r
                                        return;\r
                                }\r
-                               \r
-                               JmPattern jp = new JmPattern(\r
-                                               id,\r
-                                               type,\r
-                                               patternString, \r
-                                               siteswapString,\r
-                                               getTextValue(heightSeekBar.getProgress()),\r
-                                               getTextValue(dwellSeekBar.getProgress()),\r
-                                               motion);\r
+\r
+                               JmPattern jp = new JmPattern(id, type, patternString,\r
+                                               siteswapString, getTextValue(heightSeekBar\r
+                                                               .getProgress()), getTextValue(dwellSeekBar\r
+                                                               .getProgress()), motion);\r
                                try {\r
                                        Dao dao = Dao.getInstance();\r
-                                       if (mode == NEW){\r
+                                       if (mode == NEW) {\r
                                                int m = dao.max(type);\r
-                                               dao.add(jp, m + 1);                                     \r
-                                       }\r
-                                       else {\r
+                                               dao.add(jp, m + 1);\r
+                                       } else {\r
                                                dao.set(jp);\r
                                        }\r
-                                   Resource.speed = getTextValue(speedSeekBar.getProgress());\r
-                               }\r
-                               catch (JmException e){\r
+                                       Resource.speed = getTextValue(speedSeekBar.getProgress());\r
+                               } catch (JmException e) {\r
                                        showDialog(this, e);\r
                                        return;\r
                                }\r
                                finish();\r
-                       }});\r
+                       }\r
+               });\r
 \r
-           deleteButton.setOnClickListener(new OnClickListener(){\r
+               deleteButton.setOnClickListener(new OnClickListener() {\r
                        @Override\r
                        public void onClick(View arg0) {\r
-                       AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(Edit.this);\r
-                       alertDialogBuilder.setTitle(getString(R.string.title_delete));\r
-                       alertDialogBuilder.setMessage(getString(R.string.message_delete_pattern));\r
-                       alertDialogBuilder.setPositiveButton(android.R.string.ok,\r
-                               new DialogInterface.OnClickListener() {\r
-                                   @Override\r
-                                   public void onClick(DialogInterface dialog, int which) {\r
-                                                       try {\r
-                                                               Dao.getInstance().delete(id);   \r
-                                                               finish();                               \r
-                                                       }\r
-                                                       catch (JmException e){\r
-                                                               showDialog(this, e);\r
-                                                               return;\r
-                                                       }\r
-                                   }\r
-                               });\r
-                       alertDialogBuilder.setNeutralButton(android.R.string.no,\r
-                               new DialogInterface.OnClickListener() {\r
-                                   @Override\r
-                                   public void onClick(DialogInterface dialog, int which) {\r
-                                   }\r
-                               });\r
-                       alertDialogBuilder.setCancelable(true);\r
-                       AlertDialog alertDialog = alertDialogBuilder.create();\r
-                       alertDialog.show();\r
-                       }});\r
-\r
-           cancelButton.setOnClickListener(new OnClickListener(){\r
+                               AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(\r
+                                               Edit.this);\r
+                               alertDialogBuilder.setTitle(getString(R.string.title_delete));\r
+                               alertDialogBuilder\r
+                                               .setMessage(getString(R.string.message_delete_pattern));\r
+                               alertDialogBuilder.setPositiveButton(android.R.string.ok,\r
+                                               new DialogInterface.OnClickListener() {\r
+                                                       @Override\r
+                                                       public void onClick(DialogInterface dialog,\r
+                                                                       int which) {\r
+                                                               try {\r
+                                                                       Dao.getInstance().delete(id);\r
+                                                                       finish();\r
+                                                               } catch (JmException e) {\r
+                                                                       showDialog(this, e);\r
+                                                                       return;\r
+                                                               }\r
+                                                       }\r
+                                               });\r
+                               alertDialogBuilder.setNeutralButton(android.R.string.no,\r
+                                               new DialogInterface.OnClickListener() {\r
+                                                       @Override\r
+                                                       public void onClick(DialogInterface dialog,\r
+                                                                       int which) {\r
+                                                       }\r
+                                               });\r
+                               alertDialogBuilder.setCancelable(true);\r
+                               AlertDialog alertDialog = alertDialogBuilder.create();\r
+                               alertDialog.show();\r
+                       }\r
+               });\r
+\r
+               cancelButton.setOnClickListener(new OnClickListener() {\r
                        @Override\r
                        public void onClick(View arg0) {\r
-                               finish();                               \r
-                       }});            \r
-    }\r
-    \r
-    private int getTextValue(int val){\r
-       return val + 1;\r
-    }\r
-\r
-    private int getProgressValue(int val){\r
-       return val - 1;\r
-    }\r
+                               finish();\r
+                       }\r
+               });\r
+       }\r
+\r
+       private int getTextValue(int val) {\r
+               return val + 1;\r
+       }\r
+\r
+       private int getProgressValue(int val) {\r
+               return val - 1;\r
+       }\r
 }\r

diff --git a/workspace/JuggleMaster/src/com/jm/utility/Resource.java b/workspace/JuggleMaster/src/com/jm/utility/Resource.java
index f3922e0..564f41b 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/utility/Resource.java
+++ b/workspace/JuggleMaster/src/com/jm/utility/Resource.java
@@ -3,32 +3,32 @@ package com.jm.utility;
 import android.graphics.Paint;\r
 \r
 public class Resource {\r
-       public static final String              MSG_INIT_SUCCESS = "設定を初期化しました。";\r
-       public static final String              MSG_NOTHING = "登録されていません";\r
-       public static final String              ERROR_TITLE = "エラー";\r
-       public static final String              ERRMSG_DELETE = "最低１つは登録されている必要があります。";\r
-       public static final String              ERRMSG_SITESWAP = " は正しいサイトスワップ表現ではありません。";\r
-       public static final String              ERRMSG_MOTION = " は正しくありません。";\r
-       public static final String              ERRMSG_JVIEWER = "パラメータが不正です。パラメータを変更してもう一度実行してみてください。";\r
-\r
-       public static final String              HELP_TITLE = "ヘルプ";\r
-       public static final String              HELPMSG_INDIVIDUAL = "技ごとに固有の設定です。マイリストでのみ変更が保存されます。それ以外で行われた変更はメインメニューに戻るまで有効です。";\r
-       public static final String              HELPMSG_NAME = "パターンの名前を決定します。";\r
-       public static final String              HELPMSG_SITESWAP = "サイトスワップ表現を使って技を変更することができます。入力決定後に文法チェックが行われて、正しければ変更が適用されます。文法はJuggleMasterJavaに準じます。";\r
-       public static final String              HELPMSG_MOTION = "ジャグラーの手の動きを指定できます（玄人向け）。{x1,y1}{x2,y2}と指定します。ここで、x1,y1 は、ボールを取る x/y 座標、x2,y2 は投げる x/y 座標を示します。JuggleMasterJavaに準じます。";\r
-       public static final String              HELPMSG_HEIGHT = "ボールを投げ上げる高さを調節します。大きいほど高く投げ上げます。";\r
-       public static final String              HELPMSG_DWELLRATE = "ボールを持っている割合を調節します。小さいほどキャッチしたあとすぐに投げ上げます。";\r
-       public static final String              HELPMSG_COMMON = "すべての技に共通の設定です。変更はプログラムが終了するまで有効です。";\r
-       public static final String              HELPMSG_SPEED = "ジャグリングの速さを調節します。大きいほど早くなります。";\r
-       public static final String              HELPMSG_MIRROR = "ONにすると左右を反転します。";\r
-       public static final String              HELPMSG_SHOW_BODY = "OFFにするとジャグラーを表示しません。";\r
-       public static final String              HELPMSG_SHOW_SITESWAP = "OFFにするとサイトスワップを表示しません。";\r
-       public static final String              HELPMSG_SETENV = "この設定は保存されます。";\r
-       public static final String              HELPMSG_REDRAWRATE = "描画間隔を調節します。大きいほど動きはスムーズになりますが、処理が重くなります。";\r
-       public static final String              HELPMSG_BGCOLOR = "背景色を決定します。";\r
-       public static final String              HELPMSG_FGCOLOR = "前景色を決定します。";\r
-       public static final String              HELPMSG_EMCOLOR = "サイトスワップ表記の強調色を決定します。";\r
-       public static final String              HELPMSG_INITIALIZE = "上記の設定を初期状態に戻します。";\r
+//     public static final String              MSG_INIT_SUCCESS = "設定を初期化しました。";\r
+//     public static final String              MSG_NOTHING = "登録されていません";\r
+//     public static final String              ERROR_TITLE = "エラー";\r
+//     public static final String              ERRMSG_DELETE = "最低１つは登録されている必要があります。";\r
+//     public static final String              ERRMSG_SITESWAP = " は正しいサイトスワップ表現ではありません。";\r
+//     public static final String              ERRMSG_MOTION = " は正しくありません。";\r
+//     public static final String              ERRMSG_JVIEWER = "パラメータが不正です。パラメータを変更してもう一度実行してみてください。";\r
+//\r
+//     public static final String              HELP_TITLE = "ヘルプ";\r
+//     public static final String              HELPMSG_INDIVIDUAL = "技ごとに固有の設定です。マイリストでのみ変更が保存されます。それ以外で行われた変更はメインメニューに戻るまで有効です。";\r
+//     public static final String              HELPMSG_NAME = "パターンの名前を決定します。";\r
+//     public static final String              HELPMSG_SITESWAP = "サイトスワップ表現を使って技を変更することができます。入力決定後に文法チェックが行われて、正しければ変更が適用されます。文法はJuggleMasterJavaに準じます。";\r
+//     public static final String              HELPMSG_MOTION = "ジャグラーの手の動きを指定できます（玄人向け）。{x1,y1}{x2,y2}と指定します。ここで、x1,y1 は、ボールを取る x/y 座標、x2,y2 は投げる x/y 座標を示します。JuggleMasterJavaに準じます。";\r
+//     public static final String              HELPMSG_HEIGHT = "ボールを投げ上げる高さを調節します。大きいほど高く投げ上げます。";\r
+//     public static final String              HELPMSG_DWELLRATE = "ボールを持っている割合を調節します。小さいほどキャッチしたあとすぐに投げ上げます。";\r
+//     public static final String              HELPMSG_COMMON = "すべての技に共通の設定です。変更はプログラムが終了するまで有効です。";\r
+//     public static final String              HELPMSG_SPEED = "ジャグリングの速さを調節します。大きいほど早くなります。";\r
+//     public static final String              HELPMSG_MIRROR = "ONにすると左右を反転します。";\r
+//     public static final String              HELPMSG_SHOW_BODY = "OFFにするとジャグラーを表示しません。";\r
+//     public static final String              HELPMSG_SHOW_SITESWAP = "OFFにするとサイトスワップを表示しません。";\r
+//     public static final String              HELPMSG_SETENV = "この設定は保存されます。";\r
+//     public static final String              HELPMSG_REDRAWRATE = "描画間隔を調節します。大きいほど動きはスムーズになりますが、処理が重くなります。";\r
+//     public static final String              HELPMSG_BGCOLOR = "背景色を決定します。";\r
+//     public static final String              HELPMSG_FGCOLOR = "前景色を決定します。";\r
+//     public static final String              HELPMSG_EMCOLOR = "サイトスワップ表記の強調色を決定します。";\r
+//     public static final String              HELPMSG_INITIALIZE = "上記の設定を初期状態に戻します。";\r
 \r
        public static int speed = 10;\r
        private static byte redrawrate = 30;\r