UTF-8

diff --git a/workspace/JuggleMaster/.classpath b/workspace/JuggleMaster/.classpath
index 6e9239f..6aed2eb 100644 (file)
--- a/workspace/JuggleMaster/.classpath
+++ b/workspace/JuggleMaster/.classpath
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" path="gen"/>\r
-       <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="gen"/>
+       <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry kind="output" path="bin/classes"/>
+</classpath>

diff --git a/workspace/JuggleMaster/.settings/org.eclipse.jdt.core.prefs b/workspace/JuggleMaster/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..8000cd6
--- /dev/null
+++ b/workspace/JuggleMaster/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/workspace/JuggleMaster/bin/AndroidManifest.xml b/workspace/JuggleMaster/bin/AndroidManifest.xml
new file mode 100644 (file)
index 0000000..a0dcc8b
--- /dev/null
+++ b/workspace/JuggleMaster/bin/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.jm"
+      android:versionCode="2"
+      android:versionName="1.1.0">
+
+
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" android:debuggable="true">
+        <activity android:name=".Menu1"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    <activity android:name=".Menu2"></activity>
+    <activity android:name=".JuggleView"></activity>
+       <activity android:name=".Edit"></activity>
+       <activity android:name=".GenPattern"></activity>
+    <activity android:name=".Help"></activity>
+    </application>
+    <uses-sdk android:minSdkVersion="7" />
+</manifest>
\ No newline at end of file

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index 1dddb20..3d5fd78 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 5bdbc35..041a5ff 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes.dex and b/workspace/JuggleMaster/bin/classes.dex differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Ball.class b/workspace/JuggleMaster/bin/classes/com/jm/Ball.class
similarity index 56%
rename from workspace/JuggleMaster/bin/com/jm/Ball.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Ball.class
index 7a02af6..54736fa 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Ball.class and b/workspace/JuggleMaster/bin/classes/com/jm/Ball.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Body.class b/workspace/JuggleMaster/bin/classes/com/jm/Body.class
similarity index 93%
rename from workspace/JuggleMaster/bin/com/jm/Body.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Body.class
index ef2cf18..3b6614f 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Body.class and b/workspace/JuggleMaster/bin/classes/com/jm/Body.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/BuildConfig.class b/workspace/JuggleMaster/bin/classes/com/jm/BuildConfig.class
new file mode 100644 (file)
index 0000000..ffe0eac
Binary files /dev/null and b/workspace/JuggleMaster/bin/classes/com/jm/BuildConfig.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$2.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$2.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$3.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$3.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$3.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$4.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$4.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$4.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$5.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class
similarity index 87%
rename from workspace/JuggleMaster/bin/com/jm/Edit$5.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class
index 39fbec8..76a8437 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Edit$5.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$5.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$6$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class
similarity index 81%
rename from workspace/JuggleMaster/bin/com/jm/Edit$6$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$6$1.class
index 16c6af1..25c5772 100644 (file)
Binary files a/workspace/JuggleMaster/bin/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/com/jm/Edit$6$2.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$6$2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$6$2.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$6.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$6.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit$7.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Edit$7.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit$7.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Edit.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit.class
similarity index 73%
rename from workspace/JuggleMaster/bin/com/jm/Edit.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Edit.class
index 9fe56d4..acb6bcd 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Edit.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/GenPattern$1.class b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/GenPattern$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/GenPattern$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/GenPattern$2.class b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern$2.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/GenPattern$2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/GenPattern$2.class

diff --git a/workspace/JuggleMaster/bin/com/jm/GenPattern$3.class b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern$3.class
similarity index 82%
rename from workspace/JuggleMaster/bin/com/jm/GenPattern$3.class
rename to workspace/JuggleMaster/bin/classes/com/jm/GenPattern$3.class
index 1a82eaf..691b366 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/GenPattern$3.class and b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern$3.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/GenPattern.class b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/GenPattern.class
rename to workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Help$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Help$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Help$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Help$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Help.class b/workspace/JuggleMaster/bin/classes/com/jm/Help.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Help.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Help.class

diff --git a/workspace/JuggleMaster/bin/com/jm/JmPattern.class b/workspace/JuggleMaster/bin/classes/com/jm/JmPattern.class
similarity index 63%
rename from workspace/JuggleMaster/bin/com/jm/JmPattern.class
rename to workspace/JuggleMaster/bin/classes/com/jm/JmPattern.class
index 85de8e6..26eeae3 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/JmPattern.class and b/workspace/JuggleMaster/bin/classes/com/jm/JmPattern.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/JuggleMaster$1.class b/workspace/JuggleMaster/bin/classes/com/jm/JuggleMaster$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/JuggleMaster$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/JuggleMaster$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/JuggleMaster.class b/workspace/JuggleMaster/bin/classes/com/jm/JuggleMaster.class
similarity index 65%
rename from workspace/JuggleMaster/bin/com/jm/JuggleMaster.class
rename to workspace/JuggleMaster/bin/classes/com/jm/JuggleMaster.class
index 7f11e30..b6ab808 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/JuggleMaster.class and b/workspace/JuggleMaster/bin/classes/com/jm/JuggleMaster.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/JuggleView.class b/workspace/JuggleMaster/bin/classes/com/jm/JuggleView.class
similarity index 78%
rename from workspace/JuggleMaster/bin/com/jm/JuggleView.class
rename to workspace/JuggleMaster/bin/classes/com/jm/JuggleView.class
index 6f18ab2..aa79307 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/JuggleView.class and b/workspace/JuggleMaster/bin/classes/com/jm/JuggleView.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Juggler.class b/workspace/JuggleMaster/bin/classes/com/jm/Juggler.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Juggler.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Juggler.class

diff --git a/workspace/JuggleMaster/bin/com/jm/JugglingBalls.class b/workspace/JuggleMaster/bin/classes/com/jm/JugglingBalls.class
similarity index 85%
rename from workspace/JuggleMaster/bin/com/jm/JugglingBalls.class
rename to workspace/JuggleMaster/bin/classes/com/jm/JugglingBalls.class
index 1b5d014..9828eda 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/JugglingBalls.class and b/workspace/JuggleMaster/bin/classes/com/jm/JugglingBalls.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Menu1$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu1$1.class
similarity index 78%
rename from workspace/JuggleMaster/bin/com/jm/Menu1$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Menu1$1.class
index 763d0d0..4b7ee29 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Menu1$1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Menu1$1.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Menu1.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Menu1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Menu1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Menu2$1.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu2$1.class
similarity index 83%
rename from workspace/JuggleMaster/bin/com/jm/Menu2$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Menu2$1.class
index 7ca8f38..effe324 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Menu2$1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Menu2$1.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/Menu2$2.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu2$2.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/Menu2$2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Menu2$2.class

diff --git a/workspace/JuggleMaster/bin/com/jm/Menu2.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu2.class
similarity index 66%
rename from workspace/JuggleMaster/bin/com/jm/Menu2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/Menu2.class
index 18ba6a7..88ef5cc 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/Menu2.class and b/workspace/JuggleMaster/bin/classes/com/jm/Menu2.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/PatternList.class b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class
similarity index 98%
rename from workspace/JuggleMaster/bin/com/jm/PatternList.class
rename to workspace/JuggleMaster/bin/classes/com/jm/PatternList.class
index 3412850..88ae701 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/PatternList.class and b/workspace/JuggleMaster/bin/classes/com/jm/PatternList.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/R$attr.class b/workspace/JuggleMaster/bin/classes/com/jm/R$attr.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R$attr.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R$attr.class

diff --git a/workspace/JuggleMaster/bin/com/jm/R$drawable.class b/workspace/JuggleMaster/bin/classes/com/jm/R$drawable.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R$drawable.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R$drawable.class

diff --git a/workspace/JuggleMaster/bin/com/jm/R$id.class b/workspace/JuggleMaster/bin/classes/com/jm/R$id.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R$id.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R$id.class

diff --git a/workspace/JuggleMaster/bin/com/jm/R$layout.class b/workspace/JuggleMaster/bin/classes/com/jm/R$layout.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R$layout.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R$layout.class

diff --git a/workspace/JuggleMaster/bin/com/jm/R$string.class b/workspace/JuggleMaster/bin/classes/com/jm/R$string.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R$string.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R$string.class

diff --git a/workspace/JuggleMaster/bin/com/jm/R.class b/workspace/JuggleMaster/bin/classes/com/jm/R.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/R.class
rename to workspace/JuggleMaster/bin/classes/com/jm/R.class

diff --git a/workspace/JuggleMaster/bin/com/jm/SiteSwap.class b/workspace/JuggleMaster/bin/classes/com/jm/SiteSwap.class
similarity index 98%
rename from workspace/JuggleMaster/bin/com/jm/SiteSwap.class
rename to workspace/JuggleMaster/bin/classes/com/jm/SiteSwap.class
index db32bdc..fcec8c5 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/SiteSwap.class and b/workspace/JuggleMaster/bin/classes/com/jm/SiteSwap.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/SiteswapWriter.class b/workspace/JuggleMaster/bin/classes/com/jm/SiteswapWriter.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/SiteswapWriter.class
rename to workspace/JuggleMaster/bin/classes/com/jm/SiteswapWriter.class

diff --git a/workspace/JuggleMaster/bin/com/jm/db/Dao.class b/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class
similarity index 50%
rename from workspace/JuggleMaster/bin/com/jm/db/Dao.class
rename to workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class
index e184c2a..e2dd57a 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/db/Dao.class and b/workspace/JuggleMaster/bin/classes/com/jm/db/Dao.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/db/DatabaseHelper.class b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class
similarity index 92%
rename from workspace/JuggleMaster/bin/com/jm/db/DatabaseHelper.class
rename to workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class
index ef90d42..d262b10 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/db/DatabaseHelper.class and b/workspace/JuggleMaster/bin/classes/com/jm/db/DatabaseHelper.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/gen/GenProc.class b/workspace/JuggleMaster/bin/classes/com/jm/gen/GenProc.class
similarity index 63%
rename from workspace/JuggleMaster/bin/com/jm/gen/GenProc.class
rename to workspace/JuggleMaster/bin/classes/com/jm/gen/GenProc.class
index b84b598..132862b 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/gen/GenProc.class and b/workspace/JuggleMaster/bin/classes/com/jm/gen/GenProc.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/gen/MainGen.class b/workspace/JuggleMaster/bin/classes/com/jm/gen/MainGen.class
similarity index 63%
rename from workspace/JuggleMaster/bin/com/jm/gen/MainGen.class
rename to workspace/JuggleMaster/bin/classes/com/jm/gen/MainGen.class
index cf7443e..7aceae7 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/gen/MainGen.class and b/workspace/JuggleMaster/bin/classes/com/jm/gen/MainGen.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/gen/MainJudge.class b/workspace/JuggleMaster/bin/classes/com/jm/gen/MainJudge.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/gen/MainJudge.class
rename to workspace/JuggleMaster/bin/classes/com/jm/gen/MainJudge.class

diff --git a/workspace/JuggleMaster/bin/com/jm/gen/StdLib.class b/workspace/JuggleMaster/bin/classes/com/jm/gen/StdLib.class
similarity index 91%
rename from workspace/JuggleMaster/bin/com/jm/gen/StdLib.class
rename to workspace/JuggleMaster/bin/classes/com/jm/gen/StdLib.class
index 40a0ec1..776182c 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/gen/StdLib.class and b/workspace/JuggleMaster/bin/classes/com/jm/gen/StdLib.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/gen/StringEx.class b/workspace/JuggleMaster/bin/classes/com/jm/gen/StringEx.class
new file mode 100644 (file)
index 0000000..bccdc8e
Binary files /dev/null and b/workspace/JuggleMaster/bin/classes/com/jm/gen/StringEx.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/opengl/JuggleDrawer.class b/workspace/JuggleMaster/bin/classes/com/jm/opengl/JuggleDrawer.class
similarity index 95%
rename from workspace/JuggleMaster/bin/com/jm/opengl/JuggleDrawer.class
rename to workspace/JuggleMaster/bin/classes/com/jm/opengl/JuggleDrawer.class
index 3c90027..53fae57 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/opengl/JuggleDrawer.class and b/workspace/JuggleMaster/bin/classes/com/jm/opengl/JuggleDrawer.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLActivityBase.class b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLActivityBase.class
similarity index 85%
rename from workspace/JuggleMaster/bin/com/jm/opengl/OpenGLActivityBase.class
rename to workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLActivityBase.class
index 899e148..86f73e3 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLActivityBase.class and b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLActivityBase.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLGraphics.class b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLGraphics.class
similarity index 96%
rename from workspace/JuggleMaster/bin/com/jm/opengl/OpenGLGraphics.class
rename to workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLGraphics.class
index 1bda530..197b689 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLGraphics.class and b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLGraphics.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLSphere.class b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLSphere.class
similarity index 94%
rename from workspace/JuggleMaster/bin/com/jm/opengl/OpenGLSphere.class
rename to workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLSphere.class
index ddca3cd..5549b83 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/opengl/OpenGLSphere.class and b/workspace/JuggleMaster/bin/classes/com/jm/opengl/OpenGLSphere.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/opengl/PolygonDrawer.class b/workspace/JuggleMaster/bin/classes/com/jm/opengl/PolygonDrawer.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/opengl/PolygonDrawer.class
rename to workspace/JuggleMaster/bin/classes/com/jm/opengl/PolygonDrawer.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand$1.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand$2.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand$2.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand$2.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand$2.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class
similarity index 85%
rename from workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class
index 1c54cda..af69905 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskCommand.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskIF.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskIF.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/AsyncTaskIF.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskIF.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/BaseActivity$1.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity$1.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/BaseActivity$1.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity$1.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/BaseActivity.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class
similarity index 92%
rename from workspace/JuggleMaster/bin/com/jm/utility/BaseActivity.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class
index 3471d67..023291b 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/BaseActivity.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/Debug.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/Debug.class
similarity index 88%
rename from workspace/JuggleMaster/bin/com/jm/utility/Debug.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/Debug.class
index 7bc17cd..1dd4367 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/Debug.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/Debug.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/FPSManager.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/FPSManager.class
similarity index 75%
rename from workspace/JuggleMaster/bin/com/jm/utility/FPSManager.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/FPSManager.class
index a5b658b..a4cf8c2 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/FPSManager.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/FPSManager.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/JmException.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/JmException.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/JmException.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/JmException.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/JmPatternException.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/JmPatternException.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/JmPatternException.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/JmPatternException.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/ListViewArrayAdapter.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/ListViewArrayAdapter.class
similarity index 100%
rename from workspace/JuggleMaster/bin/com/jm/utility/ListViewArrayAdapter.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/ListViewArrayAdapter.class

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/Resource.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class
similarity index 93%
rename from workspace/JuggleMaster/bin/com/jm/utility/Resource.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class
index 745a365..ccd5cb2 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/Resource.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/Resource.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/utility/SpinnersItemSelectedListener.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/SpinnersItemSelectedListener.class
similarity index 81%
rename from workspace/JuggleMaster/bin/com/jm/utility/SpinnersItemSelectedListener.class
rename to workspace/JuggleMaster/bin/classes/com/jm/utility/SpinnersItemSelectedListener.class
index 50b490f..09dbdb6 100644 (file)
Binary files a/workspace/JuggleMaster/bin/com/jm/utility/SpinnersItemSelectedListener.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/SpinnersItemSelectedListener.class differ

diff --git a/workspace/JuggleMaster/bin/com/jm/gen/StringEx.class b/workspace/JuggleMaster/bin/com/jm/gen/StringEx.class
deleted file mode 100644 (file)
index ced4f37..0000000
Binary files a/workspace/JuggleMaster/bin/com/jm/gen/StringEx.class and /dev/null differ

diff --git a/workspace/JuggleMaster/bin/dexedLibs/annotations-d6e9a95a344969e14eebc1e93881faf9.jar b/workspace/JuggleMaster/bin/dexedLibs/annotations-d6e9a95a344969e14eebc1e93881faf9.jar
new file mode 100644 (file)
index 0000000..ba2820c
Binary files /dev/null and b/workspace/JuggleMaster/bin/dexedLibs/annotations-d6e9a95a344969e14eebc1e93881faf9.jar differ

diff --git a/workspace/JuggleMaster/bin/jarlist.cache b/workspace/JuggleMaster/bin/jarlist.cache
new file mode 100644 (file)
index 0000000..1b5ec3f
--- /dev/null
+++ b/workspace/JuggleMaster/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependecy. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8

diff --git a/workspace/JuggleMaster/bin/res/drawable-hdpi/icon.png b/workspace/JuggleMaster/bin/res/drawable-hdpi/icon.png
new file mode 100644 (file)
index 0000000..7585296
Binary files /dev/null and b/workspace/JuggleMaster/bin/res/drawable-hdpi/icon.png differ

diff --git a/workspace/JuggleMaster/bin/res/drawable-ldpi/icon.png b/workspace/JuggleMaster/bin/res/drawable-ldpi/icon.png
new file mode 100644 (file)
index 0000000..ded4ee4
Binary files /dev/null and b/workspace/JuggleMaster/bin/res/drawable-ldpi/icon.png differ

diff --git a/workspace/JuggleMaster/bin/res/drawable-mdpi/icon.png b/workspace/JuggleMaster/bin/res/drawable-mdpi/icon.png
new file mode 100644 (file)
index 0000000..0c51f87
Binary files /dev/null and b/workspace/JuggleMaster/bin/res/drawable-mdpi/icon.png differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index 12bcfd5..881a80c 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/default.properties b/workspace/JuggleMaster/default.properties
deleted file mode 100644 (file)
index 46769a7..0000000
--- a/workspace/JuggleMaster/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-7

diff --git a/workspace/JuggleMaster/gen/com/jm/BuildConfig.java b/workspace/JuggleMaster/gen/com/jm/BuildConfig.java
new file mode 100644 (file)
index 0000000..4e1bc18
--- /dev/null
+++ b/workspace/JuggleMaster/gen/com/jm/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.jm;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file

diff --git a/workspace/JuggleMaster/gen/com/jm/R.java b/workspace/JuggleMaster/gen/com/jm/R.java
index 5e14b7a..0897d99 100644 (file)
--- a/workspace/JuggleMaster/gen/com/jm/R.java
+++ b/workspace/JuggleMaster/gen/com/jm/R.java
@@ -1,118 +1,118 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.\r
- *\r
- * This class was automatically generated by the\r
- * aapt tool from the resource data it found.  It\r
- * should not be modified by hand.\r
- */\r
-\r
-package com.jm;\r
-\r
-public final class R {\r
-    public static final class attr {\r
-    }\r
-    public static final class drawable {\r
-        public static final int icon=0x7f020000;\r
-    }\r
-    public static final class id {\r
-        public static final int CancelButton=0x7f050016;\r
-        public static final int DeleteButton=0x7f050015;\r
-        public static final int DwellLabel=0x7f05000c;\r
-        public static final int DwellValue=0x7f05000d;\r
-        public static final int HeightLabel=0x7f050008;\r
-        public static final int HeightValue=0x7f050009;\r
-        public static final int LinearLayout01=0x7f050007;\r
-        public static final int LinearLayout02=0x7f05000b;\r
-        public static final int LinearLayout03=0x7f050010;\r
-        public static final int LinearLayout04=0x7f050013;\r
-        public static final int LinearLayout74=0x7f050025;\r
-        public static final int Menu1=0x7f050030;\r
-        public static final int Menu2=0x7f050031;\r
-        public static final int MotionEdit=0x7f050005;\r
-        public static final int OkButton=0x7f050014;\r
-        public static final int PatternEdit=0x7f050001;\r
-        public static final int SiteswapEdit=0x7f050003;\r
-        public static final int SpeedLabel=0x7f050011;\r
-        public static final int SpeedValue=0x7f050012;\r
-        public static final int StartButton=0x7f05002f;\r
-        public static final int TextView01=0x7f050006;\r
-        public static final int TextView02=0x7f050000;\r
-        public static final int TextView03=0x7f050002;\r
-        public static final int TextView04=0x7f050004;\r
-        public static final int TextView05=0x7f05000a;\r
-        public static final int TextView06=0x7f05000e;\r
-        public static final int TextView07=0x7f05000f;\r
-        public static final int TextView70=0x7f050017;\r
-        public static final int TextView71=0x7f05001b;\r
-        public static final int TextView72=0x7f05001d;\r
-        public static final int TextView73=0x7f05001f;\r
-        public static final int TextView74=0x7f050020;\r
-        public static final int TextView75=0x7f050023;\r
-        public static final int button71=0x7f050026;\r
-        public static final int button73=0x7f050027;\r
-        public static final int button91=0x7f05002c;\r
-        public static final int radio71=0x7f050019;\r
-        public static final int radio72=0x7f05001a;\r
-        public static final int radiogroup71=0x7f050018;\r
-        public static final int spinner71=0x7f05001c;\r
-        public static final int spinner72=0x7f05001e;\r
-        public static final int spinner73=0x7f050021;\r
-        public static final int spinner74=0x7f050022;\r
-        public static final int spinner75=0x7f050024;\r
-        public static final int tableLayout1=0x7f05002d;\r
-        public static final int tableRow1=0x7f05002e;\r
-        public static final int textView91=0x7f050028;\r
-        public static final int textView92=0x7f050029;\r
-        public static final int textView93=0x7f05002a;\r
-        public static final int textView94=0x7f05002b;\r
-    }\r
-    public static final class layout {\r
-        public static final int edit=0x7f030000;\r
-        public static final int genpattern=0x7f030001;\r
-        public static final int help=0x7f030002;\r
-        public static final int juggleview=0x7f030003;\r
-        public static final int main=0x7f030004;\r
-        public static final int menu1=0x7f030005;\r
-        public static final int menu2=0x7f030006;\r
-    }\r
-    public static final class string {\r
-        public static final int app_name=0x7f040000;\r
-        public static final int bheight=0x7f040017;\r
-        public static final int calculating=0x7f040012;\r
-        public static final int cancel=0x7f040008;\r
-        public static final int close=0x7f040009;\r
-        public static final int common_settings=0x7f04000f;\r
-        public static final int create=0x7f040011;\r
-        public static final int delete=0x7f040007;\r
-        public static final int error_unexpected=0x7f04001f;\r
-        public static final int generate=0x7f04001a;\r
-        public static final int handling=0x7f04000c;\r
-        public static final int height=0x7f04000d;\r
-        public static final int help=0x7f040005;\r
-        public static final int help1=0x7f040001;\r
-        public static final int help2=0x7f040002;\r
-        public static final int help3=0x7f040003;\r
-        public static final int help4=0x7f040004;\r
-        public static final int hold=0x7f04000e;\r
-        public static final int list0_1=0x7f040020;\r
-        public static final int list0_2=0x7f040021;\r
-        public static final int list0_3=0x7f040022;\r
-        public static final int list0_4=0x7f040023;\r
-        public static final int list0_5=0x7f040024;\r
-        public static final int list0_6=0x7f040025;\r
-        public static final int list0_7=0x7f040026;\r
-        public static final int message_delete_pattern=0x7f04001d;\r
-        public static final int message_nopattern=0x7f04001e;\r
-        public static final int normal=0x7f040014;\r
-        public static final int number=0x7f040016;\r
-        public static final int patternMax=0x7f040019;\r
-        public static final int patternTypes=0x7f040013;\r
-        public static final int pattern_name=0x7f04000a;\r
-        public static final int period=0x7f040018;\r
-        public static final int save=0x7f040006;\r
-        public static final int siteswap=0x7f04000b;\r
-        public static final int speed=0x7f040010;\r
-        public static final int synchronization=0x7f040015;\r
-        public static final int title_delete=0x7f04001c;\r
-        public static final int title_system_error=0x7f04001b;\r
-    }\r
-}\r
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.jm;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class id {
+        public static final int CancelButton=0x7f050016;
+        public static final int DeleteButton=0x7f050015;
+        public static final int DwellLabel=0x7f05000c;
+        public static final int DwellValue=0x7f05000d;
+        public static final int HeightLabel=0x7f050008;
+        public static final int HeightValue=0x7f050009;
+        public static final int LinearLayout01=0x7f050007;
+        public static final int LinearLayout02=0x7f05000b;
+        public static final int LinearLayout03=0x7f050010;
+        public static final int LinearLayout04=0x7f050013;
+        public static final int LinearLayout74=0x7f050025;
+        public static final int Menu1=0x7f050030;
+        public static final int Menu2=0x7f050031;
+        public static final int MotionEdit=0x7f050005;
+        public static final int OkButton=0x7f050014;
+        public static final int PatternEdit=0x7f050001;
+        public static final int SiteswapEdit=0x7f050003;
+        public static final int SpeedLabel=0x7f050011;
+        public static final int SpeedValue=0x7f050012;
+        public static final int StartButton=0x7f05002f;
+        public static final int TextView01=0x7f050006;
+        public static final int TextView02=0x7f050000;
+        public static final int TextView03=0x7f050002;
+        public static final int TextView04=0x7f050004;
+        public static final int TextView05=0x7f05000a;
+        public static final int TextView06=0x7f05000e;
+        public static final int TextView07=0x7f05000f;
+        public static final int TextView70=0x7f050017;
+        public static final int TextView71=0x7f05001b;
+        public static final int TextView72=0x7f05001d;
+        public static final int TextView73=0x7f05001f;
+        public static final int TextView74=0x7f050020;
+        public static final int TextView75=0x7f050023;
+        public static final int button71=0x7f050026;
+        public static final int button73=0x7f050027;
+        public static final int button91=0x7f05002c;
+        public static final int radio71=0x7f050019;
+        public static final int radio72=0x7f05001a;
+        public static final int radiogroup71=0x7f050018;
+        public static final int spinner71=0x7f05001c;
+        public static final int spinner72=0x7f05001e;
+        public static final int spinner73=0x7f050021;
+        public static final int spinner74=0x7f050022;
+        public static final int spinner75=0x7f050024;
+        public static final int tableLayout1=0x7f05002d;
+        public static final int tableRow1=0x7f05002e;
+        public static final int textView91=0x7f050028;
+        public static final int textView92=0x7f050029;
+        public static final int textView93=0x7f05002a;
+        public static final int textView94=0x7f05002b;
+    }
+    public static final class layout {
+        public static final int edit=0x7f030000;
+        public static final int genpattern=0x7f030001;
+        public static final int help=0x7f030002;
+        public static final int juggleview=0x7f030003;
+        public static final int main=0x7f030004;
+        public static final int menu1=0x7f030005;
+        public static final int menu2=0x7f030006;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+        public static final int bheight=0x7f040017;
+        public static final int calculating=0x7f040012;
+        public static final int cancel=0x7f040008;
+        public static final int close=0x7f040009;
+        public static final int common_settings=0x7f04000f;
+        public static final int create=0x7f040011;
+        public static final int delete=0x7f040007;
+        public static final int error_unexpected=0x7f04001f;
+        public static final int generate=0x7f04001a;
+        public static final int handling=0x7f04000c;
+        public static final int height=0x7f04000d;
+        public static final int help=0x7f040005;
+        public static final int help1=0x7f040001;
+        public static final int help2=0x7f040002;
+        public static final int help3=0x7f040003;
+        public static final int help4=0x7f040004;
+        public static final int hold=0x7f04000e;
+        public static final int list0_1=0x7f040020;
+        public static final int list0_2=0x7f040021;
+        public static final int list0_3=0x7f040022;
+        public static final int list0_4=0x7f040023;
+        public static final int list0_5=0x7f040024;
+        public static final int list0_6=0x7f040025;
+        public static final int list0_7=0x7f040026;
+        public static final int message_delete_pattern=0x7f04001d;
+        public static final int message_nopattern=0x7f04001e;
+        public static final int normal=0x7f040014;
+        public static final int number=0x7f040016;
+        public static final int patternMax=0x7f040019;
+        public static final int patternTypes=0x7f040013;
+        public static final int pattern_name=0x7f04000a;
+        public static final int period=0x7f040018;
+        public static final int save=0x7f040006;
+        public static final int siteswap=0x7f04000b;
+        public static final int speed=0x7f040010;
+        public static final int synchronization=0x7f040015;
+        public static final int title_delete=0x7f04001c;
+        public static final int title_system_error=0x7f04001b;
+    }
+}

diff --git a/workspace/JuggleMaster/project.properties b/workspace/JuggleMaster/project.properties
new file mode 100644 (file)
index 0000000..22d0dca
--- /dev/null
+++ b/workspace/JuggleMaster/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-7

diff --git a/workspace/JuggleMaster/src/com/jm/Ball.java b/workspace/JuggleMaster/src/com/jm/Ball.java
index 199a3e9..69c02cd 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/Ball.java
+++ b/workspace/JuggleMaster/src/com/jm/Ball.java
@@ -172,7 +172,7 @@ public class Ball {
 \r
                if (!isHand && c < 0) {\r
                        gy = D * tpo[1] * 12;\r
-                       if (tpo[0] == 0) {                                                                      // \83R\83\81\83\93\83g\83A\83E\83g\82µ\82Ä\82à\95Ï\82í\82è\82È\82µ\81H\r
+                       if (tpo[0] == 0) {                                                                      // コメントアウトしても変わりなし？\r
                                gx = 0;\r
                                gy -= (D * tp * 20 / balls.getTW());\r
                        } else if (tpo[0] > 0) {\r
@@ -180,10 +180,10 @@ public class Ball {
                        } else {\r
                                gx = (D * tpo[0] / 10) + (D * tp / 6 / balls.getTW());\r
                        }\r
-               } else if (!isEnable(OBJECT_MOVE)) {                                    //\93®\82«\8en\82ß\82é\91O\82Ì\8eè\82Ì\88Ê\92u\81H\r
+               } else if (!isEnable(OBJECT_MOVE)) {                                    //動き始める前の手の位置？\r
                        gx = D * tpo[0] / 10;\r
                        gy = D * tpo[1] * 12;\r
-               } else {                                                                                                // \93\8a\82°\82½\8cã\82Ì\88Ê\92u\81H\r
+               } else {                                                                                                // 投げた後の位置？\r
                        if (bh == 1) {\r
                                gx = D * 2 * (tp - balls.getAW()) / balls.getTW() + D;\r
                                gy = balls.getHigh(1);\r

diff --git a/workspace/JuggleMaster/src/com/jm/Body.java b/workspace/JuggleMaster/src/com/jm/Body.java
index fb29a90..b6e3cb9 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/Body.java
+++ b/workspace/JuggleMaster/src/com/jm/Body.java
@@ -3,15 +3,15 @@ package com.jm;
 import com.jm.opengl.JuggleDrawer;\r
 \r
 public class Body {\r
-       // \8eè\r
+       // 手\r
        private static final int[] HAND_X = {18, 6};\r
        private static final int[] HAND_Y = {-1,-1};\r
 \r
-       // \93ª\r
+       // 頭\r
        private int hx, hy, hr;\r
-       // \98r\r
+       // 腕\r
        private int[] rx, ry, lx, ly;\r
-       // \8eè\r
+       // 手\r
        private Ball rhand;\r
        private Ball lhand;\r
 \r

diff --git a/workspace/JuggleMaster/src/com/jm/GenPattern.java b/workspace/JuggleMaster/src/com/jm/GenPattern.java
index ab1aeca..9a4844a 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/GenPattern.java
+++ b/workspace/JuggleMaster/src/com/jm/GenPattern.java
@@ -160,7 +160,7 @@ public class GenPattern extends BaseActivity {
                JmPattern[] list = Menu2.getList();\r
                int size = list.length;\r
                \r
-               // \83p\83^\81[\83\93\82ª\96³\82¢\8fê\8d\87\r
+               // パターンが無い場合\r
                if (size <= 0){\r
                        Toast.makeText(this, R.string.message_nopattern, Toast.LENGTH_LONG)\r
                                        .show();\r

diff --git a/workspace/JuggleMaster/src/com/jm/JugglingBalls.java b/workspace/JuggleMaster/src/com/jm/JugglingBalls.java
index 4c29e6c..fc32ad2 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/JugglingBalls.java
+++ b/workspace/JuggleMaster/src/com/jm/JugglingBalls.java
@@ -138,7 +138,7 @@ public class JugglingBalls {
                                }\r
                                r[j]++;\r
                                int k = siteswap.getValue(j, siteswap.size(j) - r[j]);\r
-                               // \83V\83\93\83N\83\8d\83p\83^\81[\83\93\82Å\83N\83\8d\83X\82Ì\8fê\8d\87\81iSiteswap\82Å\81@x \82ª\82Â\82­\95\94\95ª\81j\r
+                               // シンクロパターンでクロスの場合（Siteswapで　x がつく部分）\r
                                if (siteswap.isSynchronous() && k < 0) {\r
                                        if (j % 2 == 0) {\r
                                                j += -k + 1;\r

diff --git a/workspace/JuggleMaster/src/com/jm/Menu2.java b/workspace/JuggleMaster/src/com/jm/Menu2.java
index ac57c17..1446588 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/Menu2.java
+++ b/workspace/JuggleMaster/src/com/jm/Menu2.java
@@ -45,7 +45,7 @@ public class Menu2 extends BaseActivity {
            else {\r
                    try {\r
                        list = Dao.getInstance().get(index);\r
-                       listGen = list; // \95s\97v\82Å\82Í\r
+                       listGen = list; // 不要では\r
                    }\r
                    catch (JmException e){\r
                        showDialog(this, e);            \r
@@ -54,12 +54,12 @@ public class Menu2 extends BaseActivity {
            }\r
            \r
            if (list == null){\r
-               // \88È\89º\82Ì\8eè\8f\87\82Å\83G\83\89\81[\94­\90¶\r
-               // 1. \83p\83^\81[\83\93\90¶\90¬\89æ\96Ê\82Å\83p\83^\81[\83\93\82ð\90¶\90¬\82·\82é\r
-                       // 2. \83\8a\83X\83g\89æ\96Ê\82ð\8aJ\82­\r
-               // 3. \83v\83\8d\83Z\83X\82ð\83o\83b\83N\83O\83\89\83E\83\93\83h\82É\82·\82é\r
-               // 4. OS\82ª\91¼\82Ì\83A\83v\83\8a\82É\83\81\83\82\83\8a\82ð\8a\84\82è\93\96\82Ä\82é\82½\82ß\82É\83v\83\8d\83Z\83X\82ð\8fI\97¹\82·\82é\r
-               // 5. \8dÄ\8bN\93®\r
+               // 以下の手順でエラー発生\r
+               // 1. パターン生成画面でパターンを生成する\r
+                       // 2. リスト画面を開く\r
+               // 3. プロセスをバックグラウンドにする\r
+               // 4. OSが他のアプリにメモリを割り当てるためにプロセスを終了する\r
+               // 5. 再起動\r
                finish();\r
                return;\r
            }\r
@@ -146,7 +146,7 @@ public class Menu2 extends BaseActivity {
                listView.setAdapter(adapter);\r
                \r
                if (topPosition >= 0){\r
-                       // \83\8a\83X\83g\91I\91ð\88Ê\92u\95\9c\8a\88\r
+                       // リスト選択位置復活\r
                        listView.setSelectionFromTop(topPosition, topPositionY);\r
                }\r
        }\r

diff --git a/workspace/JuggleMaster/src/com/jm/PatternList.java b/workspace/JuggleMaster/src/com/jm/PatternList.java
index c7ed705..5e64867 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/PatternList.java
+++ b/workspace/JuggleMaster/src/com/jm/PatternList.java
@@ -8,14 +8,14 @@ public class PatternList {
 \r
        public static JmPattern tempPattern = null;\r
        public static final String[] PACKAGE_INDEX = {\r
-                                                                       "[1] 3\83{\81[\83\8b \82»\82Ì1",\r
-                                                                       "[2] 3\83{\81[\83\8b \82»\82Ì2",\r
-                                                                       "[3] 4\83{\81[\83\8b",\r
-                                                                       "[4] 5\83{\81[\83\8b",\r
-                                                                       "[5] 6\83{\81[\83\8b\88È\8fã",\r
-                                                                       "[6] \83g\83\8c\81[\83j\83\93\83O",\r
-                                                                       "[7] \83}\83C\83p\83^\81[\83\93",\r
-                                                                       "[8] \83p\83^\81[\83\93\90¶\90¬"\r
+                                                                       "[1] 3ボール その1",\r
+                                                                       "[2] 3ボール その2",\r
+                                                                       "[3] 4ボール",\r
+                                                                       "[4] 5ボール",\r
+                                                                       "[5] 6ボール以上",\r
+                                                                       "[6] トレーニング",\r
+                                                                       "[7] マイパターン",\r
+                                                                       "[8] パターン生成"\r
                                                                        };\r
 \r
 // edit {\r
@@ -167,7 +167,7 @@ public class PatternList {
 // }\r
        \r
        /*********************************************************************\r
-        \89Â\94\\82È\82ç\82Î\95Û\91¶\82µ\82½\90Ý\92è\82ð\93Ç\82Ý\8d\9e\82Ý\82Ü\82·\81B\r
+        可能ならば保存した設定を読み込みます。\r
         *********************************************************************/\r
 // edit {\r
 //     private void loadPatterns() {\r
@@ -183,7 +183,7 @@ public class PatternList {
 // }\r
        \r
        /*********************************************************************\r
-        \89Â\94\\82È\82ç\82Î\90Ý\92è\82ð\95Û\91¶\82µ\82Ü\82·\81B\r
+        可能ならば設定を保存します。\r
         *********************************************************************/\r
 // edit {\r
 //     private boolean storePatterns() {\r
@@ -238,40 +238,40 @@ public class PatternList {
 // edit {\r
                int type = 0;\r
 // }\r
-               add(new JmPattern(type, "\83J\83X\83P\81[\83h", "3"));\r
-               add(new JmPattern(type, "\83t\83\89\83b\83V\83\85", "333355500", 30, 50));\r
-               add(new JmPattern(type, "\83e\83j\83X", "3", new byte[][] {{8,0,4,0},{8,0,4,0},{14,3,14,3}}));\r
-               add(new JmPattern(type, "\83n\81[\83t\83V\83\83\83\8f\81[", "3", new byte[][] {{8,0,15,8},{15,8,8,0}}));\r
-               add(new JmPattern(type, "\83\8a\83o\81[\83X\83J\83X\83P\81[\83h", "3", reverse));\r
-               add(new JmPattern(type, "\83E\83C\83\93\83h\83~\83\8b", "3", new byte[][] {{10,0,-10,-2},{-10,4,10,2}}));\r
-               add(new JmPattern(type, "\83\8a\81[\83`\83I\81[\83o\81[", "3", 15, 50, new byte[][] {n,n,n,g,n,{10,0,8,-2},{-13,5,0,2},{13,-3,4,0}}));\r
-               add(new JmPattern(type, "\83\8a\81[\83`\83A\83\93\83_\81[", "3", 15, 50, new byte[][] {n,n,n,g,{13,0,4,-3},{10,4,4,4},{-16,-3,0,0},{13,3,4,0}}));\r
-               add(new JmPattern(type, "\83I\81[\83o\81[\83U\83w\83b\83h", "3", new byte[][] {{12,19,3,19}}));\r
-               add(new JmPattern(type, "\83`\83\87\83b\83v", "(2,4x)(4x,2)", 12, 50, new byte[][] {{4,9,-10,-3},{10,6,7,9},{10,6,7,9},{4,9,-10,-3}}));\r
-               add(new JmPattern(type, "\83\8a\83\93\83S\90H\82×\82¿\82á\82¦", "33333423", new byte[][] {{0,6,-3,4},n,n,n,n,{13,0,2,0},{12,7,0,7},{13,0,-4,0}}));\r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v", "(0,4)(4,4)", 14, 50, new byte[][] {a,b,b,b}));\r
-               add(new JmPattern(type, "\83\88\81[\83\88\81[", "(4,2)", 13, 50,  new byte[][] {{5,2,5,3},{-5,-1,-5,0},{5,13,5,13},{5,-1,5,0}}));\r
-               add(new JmPattern(type, "\83I\83C\83I\83C", "(4,2)", 13, 50, new byte[][] {{5,-1,5,0},{-5,3,-5,4},{5,10,5,10},{5,3,5,4}}));\r
-               add(new JmPattern(type, "\83A\81[\83`", "3", 13, 50, new byte[][] {{20,10,20,10},b,{15,5,15,5},{20,10,20,10},b,{15,5,15,5}}));\r
-               add(new JmPattern(type, "\8e©\97R\82Ì\8f\97\90_", "3", 12, 50, new byte[][] {{3,0,12,4},{10,20,9,19}}));\r
-               add(new JmPattern(type, "\83V\83\83\83b\83t\83\8b", "(4x,2x)", 12, 50, new byte[][] {{0,-5,12,10},{10,0,14,0}}));\r
-               add(new JmPattern(type, "\83\8b\81[\83N\83X\83V\83\83\83b\83t\83\8b", "(4,2x)(2x,4)", 15, 50, new byte[][] {{10,0,14,10},{10,-3,6,0},{10,-3,6,0},{10,0,14,10}}));\r
-               add(new JmPattern(type, "\83\8d\83{\83b\83g", "242334", 15, 50, new byte[][] {{5,4,10,-3},b,{10,-3,10,13},a,{10,13,-10,13},d}));\r
-               add(new JmPattern(type, "\83L\83\83\83\8a\81[", "3", 10, 50, new byte[][] {{7,12,-7,12},{7,0,-7,0}}));\r
-               add(new JmPattern(type, "\83V\83\83\83\8f\81[", "51", 10, 50, shower));\r
-               add(new JmPattern(type, "\93ú\96{\82Ì\82¨\8eè\8bÊ", "51"));\r
-               add(new JmPattern(type, "\83{\83b\83N\83X", "(2x,4)(4,2x)", 12, 50, new byte[][] {b,{10,0,2,0},{10,0,2,0},b}));\r
-               add(new JmPattern(type, "\83E\83B\81[\83u", "(2,4)(2,4x)(4,2)(4x,2)", 10, 50, new byte[][] {{10,1,-7,0},{12,0,12,9},e,{-5,9,0,3},{12,0,12,9},{10,1,-7,0},{-5,9,0,3},e}));\r
-               add(new JmPattern(type, "\83t\83H\83\8d\81[", "423", 10, 50, new byte[][] {{-10,10,-10,4},{10,-3,10,10},{0,4,0,2}}));\r
-               add(new JmPattern(type, "\83{\83X\83g\83\93\83\81\83X A", "3", new byte[][] {{10,-2,10,-2},{10,3,10,3},{0,-2,0,-2},{-10,3,-10,3},{-10,-2,-10,-2},{0,3,0,3}}));\r
-               add(new JmPattern(type, "\83{\83X\83g\83\93\83\81\83X B", "3", new byte[][] {{10,3,10,-2},{10,3,10,3},{0,-2,0,-2},{-10,3,-10,3},{-10,-2,-10,-2},{0,3,0,3},{10,-2,10,3},{10,-2,10,-2},{0,3,0,3},{-10,-2,-10,-2},{-10,3,-10,3},{0,-2,0,-2}}));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X", "3", 13, 50, millsmess));\r
-               add(new JmPattern(type, "\83\8a\83o\81[\83X\83~\83\8b\83Y\83\81\83X", "3", 13, 50, new byte[][] {{-12,0,-1,0},{12,0,0,0},{-12,0,1,0}}));\r
-               add(new JmPattern(type, "\83o\81[\83N\83X\83o\83\89\81[\83W", "423", 10, 50, new byte[][] {{12,12,-6,-2},{-6,5,-6,12},{0,5,0,5}}));\r
-               add(new JmPattern(type, "\83\8b\81[\83x\83\93\83V\83\85\83^\83C\83\93\83Y\83\8a\83x\83\93\83W", "35223", 15, 50, new byte[][] {{3,1,13,8},{7,-2,-10,-3},{3,6,-12,2},{-1,0,12,2},{-2,2,-10,-2}}));\r
-               add(new JmPattern(type, "\95Ð\8eè\82R\8cÂ", "60"));\r
-               add(new JmPattern(type, "\95Ð\8eè\83J\83X\83P\81[\83h", "60", new byte[][] {{-6,0,2,0},g,{18,0,10,0},g}));\r
-               add(new JmPattern(type, "\95Ð\8eè\82R\8cÂ\82Ì\83}\83\8b\83`", "[46]06020"));\r
+               add(new JmPattern(type, "カスケード", "3"));\r
+               add(new JmPattern(type, "フラッシュ", "333355500", 30, 50));\r
+               add(new JmPattern(type, "テニス", "3", new byte[][] {{8,0,4,0},{8,0,4,0},{14,3,14,3}}));\r
+               add(new JmPattern(type, "ハーフシャワー", "3", new byte[][] {{8,0,15,8},{15,8,8,0}}));\r
+               add(new JmPattern(type, "リバースカスケード", "3", reverse));\r
+               add(new JmPattern(type, "ウインドミル", "3", new byte[][] {{10,0,-10,-2},{-10,4,10,2}}));\r
+               add(new JmPattern(type, "リーチオーバー", "3", 15, 50, new byte[][] {n,n,n,g,n,{10,0,8,-2},{-13,5,0,2},{13,-3,4,0}}));\r
+               add(new JmPattern(type, "リーチアンダー", "3", 15, 50, new byte[][] {n,n,n,g,{13,0,4,-3},{10,4,4,4},{-16,-3,0,0},{13,3,4,0}}));\r
+               add(new JmPattern(type, "オーバーザヘッド", "3", new byte[][] {{12,19,3,19}}));\r
+               add(new JmPattern(type, "チョップ", "(2,4x)(4x,2)", 12, 50, new byte[][] {{4,9,-10,-3},{10,6,7,9},{10,6,7,9},{4,9,-10,-3}}));\r
+               add(new JmPattern(type, "リンゴ食べちゃえ", "33333423", new byte[][] {{0,6,-3,4},n,n,n,n,{13,0,2,0},{12,7,0,7},{13,0,-4,0}}));\r
+               add(new JmPattern(type, "1アップ2アップ", "(0,4)(4,4)", 14, 50, new byte[][] {a,b,b,b}));\r
+               add(new JmPattern(type, "ヨーヨー", "(4,2)", 13, 50,  new byte[][] {{5,2,5,3},{-5,-1,-5,0},{5,13,5,13},{5,-1,5,0}}));\r
+               add(new JmPattern(type, "オイオイ", "(4,2)", 13, 50, new byte[][] {{5,-1,5,0},{-5,3,-5,4},{5,10,5,10},{5,3,5,4}}));\r
+               add(new JmPattern(type, "アーチ", "3", 13, 50, new byte[][] {{20,10,20,10},b,{15,5,15,5},{20,10,20,10},b,{15,5,15,5}}));\r
+               add(new JmPattern(type, "自由の女神", "3", 12, 50, new byte[][] {{3,0,12,4},{10,20,9,19}}));\r
+               add(new JmPattern(type, "シャッフル", "(4x,2x)", 12, 50, new byte[][] {{0,-5,12,10},{10,0,14,0}}));\r
+               add(new JmPattern(type, "ルークスシャッフル", "(4,2x)(2x,4)", 15, 50, new byte[][] {{10,0,14,10},{10,-3,6,0},{10,-3,6,0},{10,0,14,10}}));\r
+               add(new JmPattern(type, "ロボット", "242334", 15, 50, new byte[][] {{5,4,10,-3},b,{10,-3,10,13},a,{10,13,-10,13},d}));\r
+               add(new JmPattern(type, "キャリー", "3", 10, 50, new byte[][] {{7,12,-7,12},{7,0,-7,0}}));\r
+               add(new JmPattern(type, "シャワー", "51", 10, 50, shower));\r
+               add(new JmPattern(type, "日本のお手玉", "51"));\r
+               add(new JmPattern(type, "ボックス", "(2x,4)(4,2x)", 12, 50, new byte[][] {b,{10,0,2,0},{10,0,2,0},b}));\r
+               add(new JmPattern(type, "ウィーブ", "(2,4)(2,4x)(4,2)(4x,2)", 10, 50, new byte[][] {{10,1,-7,0},{12,0,12,9},e,{-5,9,0,3},{12,0,12,9},{10,1,-7,0},{-5,9,0,3},e}));\r
+               add(new JmPattern(type, "フォロー", "423", 10, 50, new byte[][] {{-10,10,-10,4},{10,-3,10,10},{0,4,0,2}}));\r
+               add(new JmPattern(type, "ボストンメス A", "3", new byte[][] {{10,-2,10,-2},{10,3,10,3},{0,-2,0,-2},{-10,3,-10,3},{-10,-2,-10,-2},{0,3,0,3}}));\r
+               add(new JmPattern(type, "ボストンメス B", "3", new byte[][] {{10,3,10,-2},{10,3,10,3},{0,-2,0,-2},{-10,3,-10,3},{-10,-2,-10,-2},{0,3,0,3},{10,-2,10,3},{10,-2,10,-2},{0,3,0,3},{-10,-2,-10,-2},{-10,3,-10,3},{0,-2,0,-2}}));\r
+               add(new JmPattern(type, "ミルズメス", "3", 13, 50, millsmess));\r
+               add(new JmPattern(type, "リバースミルズメス", "3", 13, 50, new byte[][] {{-12,0,-1,0},{12,0,0,0},{-12,0,1,0}}));\r
+               add(new JmPattern(type, "バークスバラージ", "423", 10, 50, new byte[][] {{12,12,-6,-2},{-6,5,-6,12},{0,5,0,5}}));\r
+               add(new JmPattern(type, "ルーベンシュタインズリベンジ", "35223", 15, 50, new byte[][] {{3,1,13,8},{7,-2,-10,-3},{3,6,-12,2},{-1,0,12,2},{-2,2,-10,-2}}));\r
+               add(new JmPattern(type, "片手３個", "60"));\r
+               add(new JmPattern(type, "片手カスケード", "60", new byte[][] {{-6,0,2,0},g,{18,0,10,0},g}));\r
+               add(new JmPattern(type, "片手３個のマルチ", "[46]06020"));\r
                add(new JmPattern(type, "8040"));\r
        }\r
        \r
@@ -285,76 +285,76 @@ public class PatternList {
                add(new JmPattern(type, "5241"));\r
                add(new JmPattern(type, "51414"));\r
                add(new JmPattern(type, "72312"));\r
-               add(new JmPattern(type, "\83\8f\83C\83h\83J\83X\83P\81[\83h", "3", 12, 50, new byte[][] {{21,9,18,4}}));\r
-               add(new JmPattern(type, "\83\8f\83C\83h\83\8a\83o\81[\83X\83J\83X\83P\81[\83h", "3", new byte[][] {{-8,0,12,0}}));\r
-               add(new JmPattern(type, "\83\8a\81[\83`\83I\81[\83o\81[\98A\91±", "3", 15, 50, new byte[][] {{10,0,3,-2},{-13,5,13,0},{13,-3,4,0}}));\r
-               add(new JmPattern(type, "\83\8a\81[\83`\83A\83\93\83_\81[\98A\91±", "3", 15, 50, new byte[][] {{10,4,3,4},{-13,-5,13,0},{13,3,4,0}}));\r
-               add(new JmPattern(type, "\83N\83\8d\83X \83A\81[\83\80", "3", new byte[][] {{-4,0,-12,0}}));\r
-               add(new JmPattern(type, "\83\8a\83\93\83S\90H\82×\95ú\91è", "(2,4x)(4x,2)", 12, 50, new byte[][] {{0,7,-3,-3},{12,10,0,8},{12,10,0,8},{0,7,-3,-3}}));\r
+               add(new JmPattern(type, "ワイドカスケード", "3", 12, 50, new byte[][] {{21,9,18,4}}));\r
+               add(new JmPattern(type, "ワイドリバースカスケード", "3", new byte[][] {{-8,0,12,0}}));\r
+               add(new JmPattern(type, "リーチオーバー連続", "3", 15, 50, new byte[][] {{10,0,3,-2},{-13,5,13,0},{13,-3,4,0}}));\r
+               add(new JmPattern(type, "リーチアンダー連続", "3", 15, 50, new byte[][] {{10,4,3,4},{-13,-5,13,0},{13,3,4,0}}));\r
+               add(new JmPattern(type, "クロス アーム", "3", new byte[][] {{-4,0,-12,0}}));\r
+               add(new JmPattern(type, "リンゴ食べ放題", "(2,4x)(4x,2)", 12, 50, new byte[][] {{0,7,-3,-3},{12,10,0,8},{12,10,0,8},{0,7,-3,-3}}));\r
                \r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v B", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50, new byte[][] {o,o,{14,0,0,0},o,o,o,o,{14,0,0,0}}));\r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v C", "(4,4)(0,4x)(4,4)(4,0)(4,4)(4x,0)(4,4)(0,4)", 14, 50, new byte[][] {o,o,{14,0,14,0},o,o,o,o,a,o,o,o,{14,0,14,0},o,o,a,o}));\r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v D", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50, new byte[][] {{12,0,-6,0},{-6,0,12,0},a,d,{-6,0,12,0},{12,0,-6,0},d,a}));\r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v E", "(4,4)(0,4)", 14, 50, new byte[][] {f,f,{13,0,-13,0},f}));\r
-               add(new JmPattern(type, "1\83A\83b\83v2\83A\83b\83v F", "(6,6)(0,2x)(4x,0)", 10, 50, new byte[][] {f,f,{13,7,4,0},f,f,{4,0,13,7}}));\r
+               add(new JmPattern(type, "1アップ2アップ B", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50, new byte[][] {o,o,{14,0,0,0},o,o,o,o,{14,0,0,0}}));\r
+               add(new JmPattern(type, "1アップ2アップ C", "(4,4)(0,4x)(4,4)(4,0)(4,4)(4x,0)(4,4)(0,4)", 14, 50, new byte[][] {o,o,{14,0,14,0},o,o,o,o,a,o,o,o,{14,0,14,0},o,o,a,o}));\r
+               add(new JmPattern(type, "1アップ2アップ D", "(4,4)(0,4x)(4,4)(4x,0)", 14, 50, new byte[][] {{12,0,-6,0},{-6,0,12,0},a,d,{-6,0,12,0},{12,0,-6,0},d,a}));\r
+               add(new JmPattern(type, "1アップ2アップ E", "(4,4)(0,4)", 14, 50, new byte[][] {f,f,{13,0,-13,0},f}));\r
+               add(new JmPattern(type, "1アップ2アップ F", "(6,6)(0,2x)(4x,0)", 10, 50, new byte[][] {f,f,{13,7,4,0},f,f,{4,0,13,7}}));\r
 \r
                byte[] fake1 = {10,-1,10,0};\r
                byte[] fake2 = {0,-1,0,0};\r
                byte[] fake3 = {10,10,10,10};\r
-               add(new JmPattern(type, "\83t\83F\83C\83N A", "(2,4)", 14, 50, new byte[][] {fake1,fake1,fake2,fake3}));\r
-               add(new JmPattern(type, "\83t\83F\83C\83N B", "(2,4)", 14, 50, new byte[][] {fake2,fake1,fake1,fake3}));\r
-               add(new JmPattern(type, "\83t\83F\83C\83N C", "(4,2)(4x,2)(2,4)(2,4x)", 13, 50, new byte[][] {fake1,fake1,fake3,fake2,fake1,fake1,fake2,fake3}));\r
-               add(new JmPattern(type, "\83\88\81[\83\88\81[\82ð\88ê\8eü", "(4,2)", 13, 50, new byte[][] {{0,2,0,3},fake2,{0,13,0,13},{10,-1,-10,-1}}));\r
-               add(new JmPattern(type, "\83\88\81[\83\88\81[(\83g\83\8b\83l\81[\83h)", "(2,4)", new byte[][] {e,{15,15,-15,14},{-5,0,-5,0},{15,14,-15,15}}));\r
-               add(new JmPattern(type, "\83\88\81[\83\88\81[(\89¡\92f)", "(2,4)", new byte[][] {e,{15,12,0,12},{-5,0,-5,0},{-15,12,0,12}}));\r
+               add(new JmPattern(type, "フェイク A", "(2,4)", 14, 50, new byte[][] {fake1,fake1,fake2,fake3}));\r
+               add(new JmPattern(type, "フェイク B", "(2,4)", 14, 50, new byte[][] {fake2,fake1,fake1,fake3}));\r
+               add(new JmPattern(type, "フェイク C", "(4,2)(4x,2)(2,4)(2,4x)", 13, 50, new byte[][] {fake1,fake1,fake3,fake2,fake1,fake1,fake2,fake3}));\r
+               add(new JmPattern(type, "ヨーヨーを一周", "(4,2)", 13, 50, new byte[][] {{0,2,0,3},fake2,{0,13,0,13},{10,-1,-10,-1}}));\r
+               add(new JmPattern(type, "ヨーヨー(トルネード)", "(2,4)", new byte[][] {e,{15,15,-15,14},{-5,0,-5,0},{15,14,-15,15}}));\r
+               add(new JmPattern(type, "ヨーヨー(横断)", "(2,4)", new byte[][] {e,{15,12,0,12},{-5,0,-5,0},{-15,12,0,12}}));\r
                add(new JmPattern(type, "(4x,2x)(2,4)"));\r
                add(new JmPattern(type, "(4x,6)(0,2x)"));\r
-               add(new JmPattern(type, "\83e\83j\83X B", "(2,4)(2,4x)(4,2)(4x,2)", 14, 50, new byte[][] {e,e,{15,3,15,3},e,e,e,e,{15,3,15,3}}));\r
-               add(new JmPattern(type, "\8e©\97R\82Ì\8f\97\90_ B", "3", 14, 50, new byte[][] {{3,4,12,0},{10,17,9,19}}));\r
+               add(new JmPattern(type, "テニス B", "(2,4)(2,4x)(4,2)(4x,2)", 14, 50, new byte[][] {e,e,{15,3,15,3},e,e,e,e,{15,3,15,3}}));\r
+               add(new JmPattern(type, "自由の女神 B", "3", 14, 50, new byte[][] {{3,4,12,0},{10,17,9,19}}));\r
                add(new JmPattern(type, "441", 13, 50));\r
-               add(new JmPattern(type, "441 \8aO\89ñ\82è", "441", 13, 50, new byte[][] {r,r,{4,0,0,0}}));\r
-               add(new JmPattern(type, "441 \83V\83\83\83b\83t\83\8b", "441", 10, 50, new byte[][] {{5,-2,5,-2},d,{15,4,9,10}}));\r
-               add(new JmPattern(type, "\83{\83X\83T\83C\83h\83X\83\89\83\80", "(4x,2x)(2,4x)(2x,4x)(4x,2)", 10, 50, new byte[][] {{6,0,12,10},b,{10,0,4,0},d,b,{6,0,12,10},d,{10,0,4,0}}));\r
-               add(new JmPattern(type, "\83C\83N\83X\83`\83F\83\93\83W", "2334", 13, 50, new byte[][] {{0,11,10,11},{10,0,0,0},{0,12,-10,12},{10,0,0,0}}));\r
+               add(new JmPattern(type, "441 外回り", "441", 13, 50, new byte[][] {r,r,{4,0,0,0}}));\r
+               add(new JmPattern(type, "441 シャッフル", "441", 10, 50, new byte[][] {{5,-2,5,-2},d,{15,4,9,10}}));\r
+               add(new JmPattern(type, "ボスサイドスラム", "(4x,2x)(2,4x)(2x,4x)(4x,2)", 10, 50, new byte[][] {{6,0,12,10},b,{10,0,4,0},d,b,{6,0,12,10},d,{10,0,4,0}}));\r
+               add(new JmPattern(type, "イクスチェンジ", "2334", 13, 50, new byte[][] {{0,11,10,11},{10,0,0,0},{0,12,-10,12},{10,0,0,0}}));\r
 \r
                byte[] eb = {3,0,10,0};\r
-               add(new JmPattern(type, "\83n\81[\83t\83V\83\83\83\8f\81[ B", "5223", shower));\r
-               add(new JmPattern(type, "\98r\82Ì\89º\83V\83\83\83\8f\81[", "(2x,4x)", new byte[][] {{5,0,-10,0},{3,4,-3,4}}));\r
-               add(new JmPattern(type, "\98r\82Ì\89º\83V\83\83\83\8f\81[(\8cð\8cÝ)", "(2x,4x)", new byte[][] {eb,{5,4,0,4},{3,0,-10,0},{5,4,0,4}}));\r
-               add(new JmPattern(type, "\83V\83\93\83N\83\8d\83V\83\83\83\8f\81[", "(2x,4x)", shower));\r
-               add(new JmPattern(type, "\83n\83C\83\8d\81[\83V\83\83\83\8f\81[ A", "7131", shower));\r
-               add(new JmPattern(type, "\83n\83C\83\8d\81[\83V\83\83\83\8f\81[ B", "(2x,6x)(2x,2x)", 15, 50, new byte[][] {{6,0,12,3},{6,3,6,0},{6,0,6,3},{12,3,6,0}}));\r
-               add(new JmPattern(type, "\83n\83C\83\8d\81[\83V\83\83\83\8f\81[ C", "315171", shower));\r
-               add(new JmPattern(type, "\83n\81[\83t\83\81\83X", "3", 13, 50, new byte[][] {c,{0,0,-12,-3},{0,2,-12,2},{0,-3,-6,0}}));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X 423", "423", millsmess));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X 414", "414", millsmess));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X 315", "315", millsmess));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X 44133", "44133", 13, 50, new byte[][] {{-2,0,-12,5},{2,-2,12,0},{0,2,-3,0},{10,0,10,2},{7,-2,-10,-3}}));\r
-               add(new JmPattern(type, "\83~\83\8b\83Y\83\81\83X \83{\83b\83N\83X", "612", millsmess));\r
-               add(new JmPattern(type, "\83{\83b\83N\83X\82à\82Ç\82« A", "126", 15, 50));\r
-               add(new JmPattern(type, "\83{\83b\83N\83X\82à\82Ç\82« B", "630", 15, 50));\r
-               add(new JmPattern(type, "\83_\83u\83\8b\83{\83b\83N\83X", "(4x,2x)(4,2x)(2x,4x)(2x,4)", 11, 50, new byte[][] {{14,0,7,0},a,{14,0,0,0},{0,0,14,0},a,{14,0,7,0},{0,0,14,0},{14,0,0,0}}));\r
-               add(new JmPattern(type, "\8ag\92£\83{\83b\83N\83X", "(2x,8)(2x,4)(0,2x)(8,2x)(4,2x)(2x,0)", new byte[][] {eb,h,eb,h,h,eb,h,eb,h,eb,eb,h}));\r
+               add(new JmPattern(type, "ハーフシャワー B", "5223", shower));\r
+               add(new JmPattern(type, "腕の下シャワー", "(2x,4x)", new byte[][] {{5,0,-10,0},{3,4,-3,4}}));\r
+               add(new JmPattern(type, "腕の下シャワー(交互)", "(2x,4x)", new byte[][] {eb,{5,4,0,4},{3,0,-10,0},{5,4,0,4}}));\r
+               add(new JmPattern(type, "シンクロシャワー", "(2x,4x)", shower));\r
+               add(new JmPattern(type, "ハイローシャワー A", "7131", shower));\r
+               add(new JmPattern(type, "ハイローシャワー B", "(2x,6x)(2x,2x)", 15, 50, new byte[][] {{6,0,12,3},{6,3,6,0},{6,0,6,3},{12,3,6,0}}));\r
+               add(new JmPattern(type, "ハイローシャワー C", "315171", shower));\r
+               add(new JmPattern(type, "ハーフメス", "3", 13, 50, new byte[][] {c,{0,0,-12,-3},{0,2,-12,2},{0,-3,-6,0}}));\r
+               add(new JmPattern(type, "ミルズメス 423", "423", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 414", "414", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 315", "315", millsmess));\r
+               add(new JmPattern(type, "ミルズメス 44133", "44133", 13, 50, new byte[][] {{-2,0,-12,5},{2,-2,12,0},{0,2,-3,0},{10,0,10,2},{7,-2,-10,-3}}));\r
+               add(new JmPattern(type, "ミルズメス ボックス", "612", millsmess));\r
+               add(new JmPattern(type, "ボックスもどき A", "126", 15, 50));\r
+               add(new JmPattern(type, "ボックスもどき B", "630", 15, 50));\r
+               add(new JmPattern(type, "ダブルボックス", "(4x,2x)(4,2x)(2x,4x)(2x,4)", 11, 50, new byte[][] {{14,0,7,0},a,{14,0,0,0},{0,0,14,0},a,{14,0,7,0},{0,0,14,0},{14,0,0,0}}));\r
+               add(new JmPattern(type, "拡張ボックス", "(2x,8)(2x,4)(0,2x)(8,2x)(4,2x)(2x,0)", new byte[][] {eb,h,eb,h,h,eb,h,eb,h,eb,eb,h}));\r
        }\r
        \r
        public void setPackage02() throws JmException {\r
 // edit {\r
                int type = 2;\r
 // }\r
-               add(new JmPattern(type, "\83t\83@\83E\83\93\83e\83\93", "4"));\r
-               add(new JmPattern(type, "\83V\83\93\83N\83\8d\83t\83@\83E\83\93\83e\83\93", "(4,4)"));\r
-               add(new JmPattern(type, "\83\8a\83o\81[\83X\83t\83@\83E\83\93\83e\83\93", "4", reverse));\r
-               add(new JmPattern(type, "\83\8a\83o\81[\83X\83V\83\93\83N\83\8d\83t\83@\83E\83\93\83e\83\93", "(4,4)", reverse));\r
-               add(new JmPattern(type, "4\83R\83\89\83\80\83X \83X\83C\83b\83`", "(4x,4x)(4,4)", new byte[][] {{12,0,12,2},{12,2,12,0},f,f}));\r
-               add(new JmPattern(type, "4\83R\83\89\83\80\83X \83s\83X\83g\83\93", "4", columns));\r
-               add(new JmPattern(type, "4\83R\83\89\83\80\83X \83V\83\93\83N\83\8d(\94ñ\91Î\8fÌ)", "(4,4)", columns));\r
-               add(new JmPattern(type, "4\83R\83\89\83\80\83X \83V\83\93\83N\83\8d(\91Î\8fÌ)", "(4,4)", new byte[][] {c,c,f,f}));\r
-               add(new JmPattern(type, "4\83R\83\89\83\80\83X \83V\83\93\83N\83\8d(Splits)", "(4,4)", new byte[][] {c,{-4,0,-4,0},{-4,0,-4,0},c}));\r
+               add(new JmPattern(type, "ファウンテン", "4"));\r
+               add(new JmPattern(type, "シンクロファウンテン", "(4,4)"));\r
+               add(new JmPattern(type, "リバースファウンテン", "4", reverse));\r
+               add(new JmPattern(type, "リバースシンクロファウンテン", "(4,4)", reverse));\r
+               add(new JmPattern(type, "4コラムス スイッチ", "(4x,4x)(4,4)", new byte[][] {{12,0,12,2},{12,2,12,0},f,f}));\r
+               add(new JmPattern(type, "4コラムス ピストン", "4", columns));\r
+               add(new JmPattern(type, "4コラムス シンクロ(非対称)", "(4,4)", columns));\r
+               add(new JmPattern(type, "4コラムス シンクロ(対称)", "(4,4)", new byte[][] {c,c,f,f}));\r
+               add(new JmPattern(type, "4コラムス シンクロ(Splits)", "(4,4)", new byte[][] {c,{-4,0,-4,0},{-4,0,-4,0},c}));\r
                byte[] cross1 = {13,0,7,3};\r
                byte[] cross2 = {13,3,7,0};\r
-               add(new JmPattern(type, "4\83N\83\8d\83X A", "(4x,4x)", new byte[][] {cross1,cross2}));\r
-               add(new JmPattern(type, "4\83N\83\8d\83X B", "(4x,4x)", new byte[][] {cross1,cross2,cross2,cross1}));\r
-               add(new JmPattern(type, "4\83e\83j\83X", "44453",      new byte[][] {{9,0,4,0},{9,0,4,0},{0,0,4,0},{15,3,15,3},{9,0,4,0}}));\r
+               add(new JmPattern(type, "4クロス A", "(4x,4x)", new byte[][] {cross1,cross2}));\r
+               add(new JmPattern(type, "4クロス B", "(4x,4x)", new byte[][] {cross1,cross2,cross2,cross1}));\r
+               add(new JmPattern(type, "4テニス", "44453",   new byte[][] {{9,0,4,0},{9,0,4,0},{0,0,4,0},{15,3,15,3},{9,0,4,0}}));\r
                add(new JmPattern(type, "444447333", 30, 50));\r
                add(new JmPattern(type, "53"));\r
                add(new JmPattern(type, "561"));\r
@@ -368,35 +368,35 @@ public class PatternList {
                add(new JmPattern(type, "(2,6x)(2x,6)(6x,2)(6,2x)"));\r
                add(new JmPattern(type, "(2,4)([44x],2x)"));\r
 \r
-               add(new JmPattern(type, "4\83n\81[\83t\83V\83\83\83\8f\81[", "53", shower));\r
-               add(new JmPattern(type, "4\83V\83\83\83\8f\81[", "71", shower));\r
-               add(new JmPattern(type, "4\83V\83\93\83N\83\8d\83V\83\83\83\8f\81[", "(2x,6x)", shower));\r
-               add(new JmPattern(type, "4\83n\83C\83\8d\81[\83V\83\83\83\8f\81[", "9151", shower));\r
+               add(new JmPattern(type, "4ハーフシャワー", "53", shower));\r
+               add(new JmPattern(type, "4シャワー", "71", shower));\r
+               add(new JmPattern(type, "4シンクロシャワー", "(2x,6x)", shower));\r
+               add(new JmPattern(type, "4ハイローシャワー", "9151", shower));\r
 \r
-               add(new JmPattern(type, "4\83{\83b\83N\83X", "(2x,8)(2x,4)(8,2x)(4,2x)", new byte[][] {b,h,b,h,h,b,h,b}));\r
-               add(new JmPattern(type, "4\83{\83b\83N\83X\82à\82Ç\82« A", "633", new byte[][] {b,{7,0,0,0},{7,0,0,0}}));\r
-               add(new JmPattern(type, "4\83{\83b\83N\83X\82à\82Ç\82« B", "(2x,6)(2x,6)(6,2x)(6,2x)"));\r
+               add(new JmPattern(type, "4ボックス", "(2x,8)(2x,4)(8,2x)(4,2x)", new byte[][] {b,h,b,h,h,b,h,b}));\r
+               add(new JmPattern(type, "4ボックスもどき A", "633", new byte[][] {b,{7,0,0,0},{7,0,0,0}}));\r
+               add(new JmPattern(type, "4ボックスもどき B", "(2x,6)(2x,6)(6,2x)(6,2x)"));\r
 \r
-               add(new JmPattern(type, "4\83~\83\8b\83Y\83\81\83X", "4", millsmess));\r
-               add(new JmPattern(type, "4\83~\83\8b\83Y\83\81\83X 534", "534", millsmess));\r
-               add(new JmPattern(type, "4\83~\83\8b\83Y\83\81\83X 552", "552", millsmess));\r
-               add(new JmPattern(type, "4\83~\83\8b\83Y\83\81\83X 642", "642", millsmess));\r
-               add(new JmPattern(type, "4\83o\81[\83N\83X\83o\83\89\81[\83W", "525", 12, 50, new byte[][] {{14,14,-5,-2},{-9,3,-9,14},{0,0,3,0}}));\r
+               add(new JmPattern(type, "4ミルズメス", "4", millsmess));\r
+               add(new JmPattern(type, "4ミルズメス 534", "534", millsmess));\r
+               add(new JmPattern(type, "4ミルズメス 552", "552", millsmess));\r
+               add(new JmPattern(type, "4ミルズメス 642", "642", millsmess));\r
+               add(new JmPattern(type, "4バークスバラージ", "525", 12, 50, new byte[][] {{14,14,-5,-2},{-9,3,-9,14},{0,0,3,0}}));\r
 \r
-               add(new JmPattern(type, "4\83}\83\8b\83` [34]1", "[34]1"));\r
-               add(new JmPattern(type, "4\83}\83\8b\83` 4[43]1", "4[43]1"));\r
-               add(new JmPattern(type, "4\83}\83\8b\83` \83~\83\8b\83Y\83\81\83X", "[34]23", millsmess));\r
-               add(new JmPattern(type, "\83_\83\93\83V\81[\83Y\83f\83r\83\8b\83\81\83\93\83g", "3[53]22[32]", 15, 50, new byte[][] {{3,1,13,8},{7,-2,-10,-3},{3,6,-12,2},{-1,0,12,2},{-2,2,-10,-2}}));\r
+               add(new JmPattern(type, "4マルチ [34]1", "[34]1"));\r
+               add(new JmPattern(type, "4マルチ 4[43]1", "4[43]1"));\r
+               add(new JmPattern(type, "4マルチ ミルズメス", "[34]23", millsmess));\r
+               add(new JmPattern(type, "ダンシーズデビルメント", "3[53]22[32]", 15, 50, new byte[][] {{3,1,13,8},{7,-2,-10,-3},{3,6,-12,2},{-1,0,12,2},{-2,2,-10,-2}}));\r
        }\r
        \r
        public void setPackage03() throws JmException {\r
 // edit {\r
                int type = 3;\r
 // }\r
-               add(new JmPattern(type, "5\83J\83X\83P\81[\83h", "5"));\r
-               add(new JmPattern(type, "5\83\8a\83o\81[\83X\83J\83X\83P\81[\83h", "5", reverse));\r
+               add(new JmPattern(type, "5カスケード", "5"));\r
+               add(new JmPattern(type, "5リバースカスケード", "5", reverse));\r
                add(new JmPattern(type, "555555744", 30, 50));\r
-               add(new JmPattern(type, "\89E\82R\8c \8d¶\82Q\8cÂ", "64"));\r
+               add(new JmPattern(type, "右３個 左２個", "64"));\r
                add(new JmPattern(type, "744"));\r
                add(new JmPattern(type, "753"));\r
                add(new JmPattern(type, "66661"));\r
@@ -404,70 +404,70 @@ public class PatternList {
                add(new JmPattern(type, "75751"));\r
                add(new JmPattern(type, "123456789", center));\r
 \r
-               add(new JmPattern(type, "5\83n\81[\83t\83V\83\83\83\8f\81[ A", "5", new byte[][] {{8,0,15,8},{15,8,8,0}}));\r
-               add(new JmPattern(type, "5\83n\81[\83t\83V\83\83\83\8f\81[ B", "73", shower));\r
-               add(new JmPattern(type, "5\83n\81[\83t\83V\83\83\83\8f\81[ C", "(4x,6x)", shower));\r
-               add(new JmPattern(type, "5\83V\83\83\83\8f\81[", "91", shower));\r
-               add(new JmPattern(type, "5\83}\83\8b\83`\83V\83\83\83\8f\81[", "[97]121", shower));\r
-               add(new JmPattern(type, "5\83{\83b\83N\83X", "(4x,6)(6,4x)"));\r
+               add(new JmPattern(type, "5ハーフシャワー A", "5", new byte[][] {{8,0,15,8},{15,8,8,0}}));\r
+               add(new JmPattern(type, "5ハーフシャワー B", "73", shower));\r
+               add(new JmPattern(type, "5ハーフシャワー C", "(4x,6x)", shower));\r
+               add(new JmPattern(type, "5シャワー", "91", shower));\r
+               add(new JmPattern(type, "5マルチシャワー", "[97]121", shower));\r
+               add(new JmPattern(type, "5ボックス", "(4x,6)(6,4x)"));\r
 \r
-               add(new JmPattern(type, "5\83~\83\8b\83Y\83\81\83X", "5", millsmess));\r
-               add(new JmPattern(type, "5\83o\81[\83N\83X\83o\83\89\81[\83W", "726", 12, 50, new byte[][] {{16,14,-3,-4},{-9,0,-10,14},{2,-2,4,0}}));\r
-               add(new JmPattern(type, "5\83R\83\89\83\80\83X", "(6,6)(6,6)(0,6)", new byte[][] {c,c,d,d,a,d}));\r
-               add(new JmPattern(type, "5\83~\83\8b\83Y\83\81\83X \83R\83\89\83\80\83X A", "5", new byte[][] {{-12,0,-12,0},{-6,0,-6,0},a,d,c,c,d,a,{-6,0,-6,0},{-12,0,-12,0}}));\r
-               add(new JmPattern(type, "5\83~\83\8b\83Y\83\81\83X \83R\83\89\83\80\83X B", "5", new byte[][] {c,d,d,c,a,{-12,0,-12,0},{-6,0,-6,0},{-6,0,-6,0},{-12,0,-12,0},a}));\r
-               add(new JmPattern(type, "5\83~\83\8b\83Y\83\81\83X \83R\83\89\83\80\83X C", "5", new byte[][] {{12,3,12,3},{-6,0,-6,0},{0,3,0,3},d,{-12,3,-12,3},{-12,0,-12,0},{6,3,6,3},a,{-6,3,-6,3},c}));\r
-               add(new JmPattern(type, "5\83}\83\8b\83` \83R\83\89\83\80\83X", "([46],[46])(0,6)(2,2)", new byte[][] {g,g,a,g,g,g}));\r
+               add(new JmPattern(type, "5ミルズメス", "5", millsmess));\r
+               add(new JmPattern(type, "5バークスバラージ", "726", 12, 50, new byte[][] {{16,14,-3,-4},{-9,0,-10,14},{2,-2,4,0}}));\r
+               add(new JmPattern(type, "5コラムス", "(6,6)(6,6)(0,6)", new byte[][] {c,c,d,d,a,d}));\r
+               add(new JmPattern(type, "5ミルズメス コラムス A", "5", new byte[][] {{-12,0,-12,0},{-6,0,-6,0},a,d,c,c,d,a,{-6,0,-6,0},{-12,0,-12,0}}));\r
+               add(new JmPattern(type, "5ミルズメス コラムス B", "5", new byte[][] {c,d,d,c,a,{-12,0,-12,0},{-6,0,-6,0},{-6,0,-6,0},{-12,0,-12,0},a}));\r
+               add(new JmPattern(type, "5ミルズメス コラムス C", "5", new byte[][] {{12,3,12,3},{-6,0,-6,0},{0,3,0,3},d,{-12,3,-12,3},{-12,0,-12,0},{6,3,6,3},a,{-6,3,-6,3},c}));\r
+               add(new JmPattern(type, "5マルチ コラムス", "([46],[46])(0,6)(2,2)", new byte[][] {g,g,a,g,g,g}));\r
 \r
                add(new JmPattern(type, "Martin", "[62]25", new byte[][] {g,n,n}));\r
                add(new JmPattern(type, "25[75]51"));\r
                add(new JmPattern(type, "(2,[62])([22],6x)([62],2)(6x,[22])"));\r
-               add(new JmPattern(type, "5\83}\83\8b\83` A", "[54][22]2"));\r
-               add(new JmPattern(type, "5\83}\83\8b\83` B", "24[54]"));\r
+               add(new JmPattern(type, "5マルチ A", "[54][22]2"));\r
+               add(new JmPattern(type, "5マルチ B", "24[54]"));\r
        }\r
        \r
        public void setPackage04() throws JmException {\r
 // edit {\r
                int type = 4;\r
 // }\r
-               add(new JmPattern(type, "6\83t\83@\83E\83\93\83e\83\93", "6"));\r
-               add(new JmPattern(type, "6\83V\83\93\83N\83\8d\83t\83@\83E\83\93\83e\83\93", "(6,6)"));\r
-               add(new JmPattern(type, "7\83J\83X\83P\81[\83h", "7"));\r
-               add(new JmPattern(type, "8\83t\83@\83E\83\93\83e\83\93", "8"));\r
-               add(new JmPattern(type, "9\83J\83X\83P\81[\83h", "9"));\r
+               add(new JmPattern(type, "6ファウンテン", "6"));\r
+               add(new JmPattern(type, "6シンクロファウンテン", "(6,6)"));\r
+               add(new JmPattern(type, "7カスケード", "7"));\r
+               add(new JmPattern(type, "8ファウンテン", "8"));\r
+               add(new JmPattern(type, "9カスケード", "9"));\r
 \r
-               add(new JmPattern(type, "6\83n\81[\83t\83V\83\83\83\8f\81[", "75", shower));\r
-               add(new JmPattern(type, "6\83V\83\83\83\8f\81[", "b1", shower));\r
-               add(new JmPattern(type, "7\83V\83\83\83\8f\81[", "d1", shower));\r
+               add(new JmPattern(type, "6ハーフシャワー", "75", shower));\r
+               add(new JmPattern(type, "6シャワー", "b1", shower));\r
+               add(new JmPattern(type, "7シャワー", "d1", shower));\r
 \r
-               add(new JmPattern(type, "6\83R\83\89\83\80\83X", "(6,6)",\r
+               add(new JmPattern(type, "6コラムス", "(6,6)",\r
                 new byte[][] {{15,0,15,0},{15,0,15,0},{9,0,9,0},{9,0,9,0},{3,0,3,0},{3,0,3,0}}));\r
-               add(new JmPattern(type, "6\83~\83\8b\83Y\83\81\83X", "6", millsmess));\r
-               add(new JmPattern(type, "6\83~\83\8b\83Y\83\81\83X 864", "864", millsmess));\r
+               add(new JmPattern(type, "6ミルズメス", "6", millsmess));\r
+               add(new JmPattern(type, "6ミルズメス 864", "864", millsmess));\r
 \r
-               add(new JmPattern(type, "7\83X\83v\83\8a\83b\83g A", "[456][22]2"));\r
-               add(new JmPattern(type, "7\83X\83v\83\8a\83b\83g B", "([66x],2)(2,[66x])", center));\r
+               add(new JmPattern(type, "7スプリット A", "[456][22]2"));\r
+               add(new JmPattern(type, "7スプリット B", "([66x],2)(2,[66x])", center));\r
                add(new JmPattern(type, "26[76]"));\r
                add(new JmPattern(type, "[234]57"));\r
 \r
-               add(new JmPattern(type, "9\83}\83\8b\83`", "[54]"));\r
-               add(new JmPattern(type, "35\83J\83X\83P\81[\83h", "z"));\r
-               add(new JmPattern(type, "18\83V\83\83\83\8f\81[", "z1", shower));\r
-               add(new JmPattern(type, "35\83}\83\8b\83` \83V\83\83\83\8f\81[", "[9bdfh][11111]", shower));\r
-               add(new JmPattern(type, "12\83~\83\8b\83Y\83\81\83X 333666999cccfffiiilll", "333666999cccfffiiilll", millsmess));\r
+               add(new JmPattern(type, "9マルチ", "[54]"));\r
+               add(new JmPattern(type, "35カスケード", "z"));\r
+               add(new JmPattern(type, "18シャワー", "z1", shower));\r
+               add(new JmPattern(type, "35マルチ シャワー", "[9bdfh][11111]", shower));\r
+               add(new JmPattern(type, "12ミルズメス 333666999cccfffiiilll", "333666999cccfffiiilll", millsmess));\r
                add(new JmPattern(type, "[b9753]0020[22]0[222]0[2222]0"));\r
                add(new JmPattern(type, "123456789abcdefghijklmnopqrstuvwxyz", center));\r
 \r
                byte[] box1 = {13,0,3,0};\r
                byte[] box2 = JmPattern.reverse(box1);\r
-               add(new JmPattern(type, "9\83{\83b\83N\83X", "u1q1m1i1e1a1612",\r
+               add(new JmPattern(type, "9ボックス", "u1q1m1i1e1a1612",\r
                 new byte[][] {g,box1,box2,box1,box2,box1,box2,box1,box2,box1,box2,box1,box2,box1,g}));\r
                add(new JmPattern(type, "trpnljhfdb97531"));\r
                add(new JmPattern(type, "Ken", "ken"));\r
-               add(new JmPattern(type, "\83y\83\93\83^\83}\83\8b\83`", "[56789]"));\r
-               add(new JmPattern(type, "20\83R\83\89\83\80\83X A", "(k,k)", 10, 50,\r
+               add(new JmPattern(type, "ペンタマルチ", "[56789]"));\r
+               add(new JmPattern(type, "20コラムス A", "(k,k)", 10, 50,\r
                 new byte[][] {{29,3,29,3},{2,3,2,3},{26,3,26,3},{5,3,5,3},{23,3,23,3},{8,3,8,3},{20,3,20,3},{11,3,11,3},{17,3,17,3},{14,3,14,3},{14,3,14,3},{17,3,17,3},{11,3,11,3},{20,3,20,3},{8,3,8,3},{23,3,23,3},{5,3,5,3},{26,3,26,3},{2,3,2,3},{29,3,29,3}}));\r
-               add(new JmPattern(type, "20\83R\83\89\83\80\83X B", "k", 10, 50,\r
+               add(new JmPattern(type, "20コラムス B", "k", 10, 50,\r
                 new byte[][] {{20,3,20,3},{18,3,18,3},{16,3,16,3},{14,3,14,3},{12,3,12,3},{10,3,10,3},{8,3,8,3},{6,3,6,3},{4,3,4,3},{2,3,2,3},{2,3,2,3},{4,3,4,3},{6,3,6,3},{8,3,8,3},{10,3,10,3},{12,3,12,3},{14,3,14,3},{16,3,16,3},{18,3,18,3},{20,3,20,3}}));\r
        }\r
 \r
@@ -475,30 +475,30 @@ public class PatternList {
 // edit {\r
                int type = 5;\r
 // }\r
-               add(new JmPattern(type, "1\8cÂ\82Ì\93\8a\82°\95û", "300"));\r
-               add(new JmPattern(type, "2\8cÂ\82Ì\93\8a\82°\95û", "33022"));\r
-               add(new JmPattern(type, "2\8cÂ\82Ì\98A\91±", "330"));\r
-               add(new JmPattern(type, "3\8cÂ\82Ì\97û\8fK \82Ü\82¸\82R\89ñ\93\8a\82°\82æ\82¤", "[32]3322"));\r
-               add(new JmPattern(type, "3\8cÂ\82Ì\97û\8fK 3\83X\83\8d\81[\83J\83X\83P\81[\83h", "3", 20, 75));\r
-               add(new JmPattern(type, "4\8cÂ\82Ì\97û\8fK \95Ð\8eè", "40"));\r
-               add(new JmPattern(type, "4\8cÂ\82Ì\97û\8fK \95Ð\8eè\83R\83\89\83\80\83X", "40", new byte[][] {a,g,b,g}));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 2\8cÂ", "50500"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 3\83`\83F\83C\83X", "50505"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 3\83t\83\89\83b\83V\83\85", "55500"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 3\8cÂ", "52512"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 4\83t\83\89\83b\83V\83\85", "[52][52]55022[22][22]"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK \83M\83\83\83b\83v A", "55550"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK \83M\83\83\83b\83v B", "552"));\r
-               add(new JmPattern(type, "5\8cÂ\82Ì\97û\8fK 4\8cÂ", "5551"));\r
-               add(new JmPattern(type, "5\83t\83\89\83b\83V\83\85", "[522][52][52]5522[22][22]"));\r
-               add(new JmPattern(type, "3 -> 5\83J\83X\83P\81[\83h", "[32][32][32][32][32][32][52][52][52]555555522"));\r
+               add(new JmPattern(type, "1個の投げ方", "300"));\r
+               add(new JmPattern(type, "2個の投げ方", "33022"));\r
+               add(new JmPattern(type, "2個の連続", "330"));\r
+               add(new JmPattern(type, "3個の練習 まず３回投げよう", "[32]3322"));\r
+               add(new JmPattern(type, "3個の練習 3スローカスケード", "3", 20, 75));\r
+               add(new JmPattern(type, "4個の練習 片手", "40"));\r
+               add(new JmPattern(type, "4個の練習 片手コラムス", "40", new byte[][] {a,g,b,g}));\r
+               add(new JmPattern(type, "5個の練習 2個", "50500"));\r
+               add(new JmPattern(type, "5個の練習 3チェイス", "50505"));\r
+               add(new JmPattern(type, "5個の練習 3フラッシュ", "55500"));\r
+               add(new JmPattern(type, "5個の練習 3個", "52512"));\r
+               add(new JmPattern(type, "5個の練習 4フラッシュ", "[52][52]55022[22][22]"));\r
+               add(new JmPattern(type, "5個の練習 ギャップ A", "55550"));\r
+               add(new JmPattern(type, "5個の練習 ギャップ B", "552"));\r
+               add(new JmPattern(type, "5個の練習 4個", "5551"));\r
+               add(new JmPattern(type, "5フラッシュ", "[522][52][52]5522[22][22]"));\r
+               add(new JmPattern(type, "3 -> 5カスケード", "[32][32][32][32][32][32][52][52][52]555555522"));\r
 \r
-               add(new JmPattern(type, "3\83{\83b\83N\83X\82Ì\97û\8fK", "(2x,4)(0,2x)", 12, 50, new byte[][] {b,{10,0,2,0},{10,0,2,0},b}));\r
-               add(new JmPattern(type, "3\83~\83\8b\83Y\83\81\83X\82Ì\97û\8fK", "330", 13, 50, millsmess));\r
+               add(new JmPattern(type, "3ボックスの練習", "(2x,4)(0,2x)", 12, 50, new byte[][] {b,{10,0,2,0},{10,0,2,0},b}));\r
+               add(new JmPattern(type, "3ミルズメスの練習", "330", 13, 50, millsmess));\r
        }\r
        \r
        public void setPackage06() throws JmException {\r
                int type = 6;\r
-               add(new JmPattern(type, "[\90V\8bK\8dì\90¬]", "1"));\r
+               add(new JmPattern(type, "[新規作成]", "1"));\r
        }\r
 }\r

diff --git a/workspace/JuggleMaster/src/com/jm/SiteSwap.java b/workspace/JuggleMaster/src/com/jm/SiteSwap.java
index 3c3e5a5..c6ebd90 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/SiteSwap.java
+++ b/workspace/JuggleMaster/src/com/jm/SiteSwap.java
@@ -17,7 +17,7 @@ public class SiteSwap implements Serializable {
        private static final byte ERROR = Byte.MIN_VALUE;\r
 \r
        /*********************************************************************\r
-        \83C\83\93\83X\83^\83\93\83X\82ð\8eæ\93¾\82µ\82Ü\82·\r
+        インスタンスを取得します\r
         *********************************************************************/\r
        protected static SiteSwap getInstance(String siteswap) {\r
                if (MAP.containsKey(siteswap)) return (SiteSwap)MAP.get(siteswap);\r
@@ -66,7 +66,7 @@ public class SiteSwap implements Serializable {
        private int             number;\r
 \r
        /*********************************************************************\r
-        \83C\83\93\83X\83^\83\93\83X\82ð\90¶\90¬\82µ\82Ü\82·\r
+        インスタンスを生成します\r
         *********************************************************************/\r
        private SiteSwap()\r
        {\r
@@ -77,8 +77,8 @@ public class SiteSwap implements Serializable {
        }\r
        \r
        /*********************************************************************\r
-        i\94Ô\96Ú\82Ì\83T\83C\83g\83X\83\8f\83b\83v\92l\82ð\95Ô\82µ\82Ü\82·\r
-        i\94Ô\96Ú\82ª\83}\83\8b\83`\82Ì\8fê\8d\87\82Í\82»\82Ì j\8cÂ\96Ú\82ð\95Ô\82µ\82Ü\82·\81B\r
+        i番目のサイトスワップ値を返します\r
+        i番目がマルチの場合はその j個目を返します。\r
         *********************************************************************/\r
        public byte getValue(int i, int j) {\r
                i = i % siteswap.length;\r
@@ -86,35 +86,35 @@ public class SiteSwap implements Serializable {
        }\r
 \r
        /*********************************************************************\r
-        \83T\83C\83g\83X\83\8f\83b\83v\92l\82Ì\8dÅ\91å\92l\82ð\95Ô\82µ\82Ü\82·\r
+        サイトスワップ値の最大値を返します\r
         *********************************************************************/\r
        public int getMaxValue() {\r
                return maxValue;\r
        }\r
 \r
        /*********************************************************************\r
-        \83{\81[\83\8b\82Ì\8cÂ\90\94\82ð\95Ô\82µ\82Ü\82·\r
+        ボールの個数を返します\r
         *********************************************************************/\r
        public int getNumberOfBalls() {\r
                return number;\r
        }\r
        \r
        /*********************************************************************\r
-        \83V\83\93\83N\83\8d\82È\82ç\82Îtrue\82ð\95Ô\82µ\82Ü\82·\r
+        シンクロならばtrueを返します\r
         *********************************************************************/\r
        public boolean isSynchronous() {\r
                return isSynchronous;\r
        }\r
 \r
        /*********************************************************************\r
-        \83T\83C\83g\83X\83\8f\83b\83v\82Ì\92·\82³\82ð\95Ô\82µ\82Ü\82·\r
+        サイトスワップの長さを返します\r
         *********************************************************************/\r
        public int size() {\r
                return siteswap.length;\r
        }\r
        \r
        /*********************************************************************\r
-        index\94Ô\96Ú\82Ì\83T\83C\83g\83X\83\8f\83b\83v\92l\82Ì\83}\83\8b\83`\90\94\82ð\95Ô\82µ\82Ü\82·\r
+        index番目のサイトスワップ値のマルチ数を返します\r
         *********************************************************************/\r
        public int size(int index) {\r
                return siteswap[index % siteswap.length].length;\r
@@ -165,9 +165,9 @@ public class SiteSwap implements Serializable {
        }\r
        \r
        /*********************************************************************\r
-        \83T\83C\83g\83X\83\8f\83b\83v\95\\8bL\96@\82Å\8f\91\82©\82ê\82½\95¶\8e\9a\97ñ\82ð\89ð\90Í\82µ\82Ä\83Z\83b\83g\82µ\82Ü\82·\r
+        サイトスワップ表記法で書かれた文字列を解析してセットします\r
         \r
-        @return        \95¶\96@\83G\83\89\81[\82È\82ç\82Îfalse\r
+        @return        文法エラーならばfalse\r
         *********************************************************************/\r
        private boolean setSiteswap(String s) {\r
                if (number != 0)                                        return false;\r

diff --git a/workspace/JuggleMaster/src/com/jm/gen/GenProc.java b/workspace/JuggleMaster/src/com/jm/gen/GenProc.java
index 87cdaac..46ba980 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/gen/GenProc.java
+++ b/workspace/JuggleMaster/src/com/jm/gen/GenProc.java
@@ -49,7 +49,7 @@ public class GenProc {
 \r
                if (miMode == MainGen.SPT_SYNCHRO)\r
                        for (j = i = 0; i < miLength; i += 2) {\r
-                               j++; // '(' \82ð\94ò\82Î\82·\r
+                               j++; // '(' を飛ばす\r
                                // if((j+1)[sPatt]=='x'){\r
                                if (sPatt[j + 1] == 'x') {\r
                                        iPatt[i] = StdLib.ctod(sPatt[j]) + 1;\r
@@ -59,7 +59,7 @@ public class GenProc {
                                        iPatt[i] = StdLib.ctod(sPatt[j]);\r
                                        j++;\r
                                }\r
-                               j++; // ',' \82ð\94ò\82Î\82·\r
+                               j++; // ',' を飛ばす\r
                                if (sPatt[j + 1] == 'x') {\r
                                        iPatt[i + 1] = StdLib.ctod(sPatt[j]) - 1;\r
                                        j += 2;\r
@@ -67,7 +67,7 @@ public class GenProc {
                                        iPatt[i + 1] = StdLib.ctod(sPatt[j]);\r
                                        j++;\r
                                }\r
-                               j++; // ')' \82ð\94ò\82Î\82·\r
+                               j++; // ')' を飛ばす\r
                        }\r
                return true;\r
        }\r
@@ -197,7 +197,7 @@ public class GenProc {
                                                temp = (iBasePatt[j] + miLength - 1) % miLength;\r
                                                iBasePatt[j] = (iBasePatt[j + 1] + 1) % miLength;\r
                                                iBasePatt[j + 1] = temp;\r
-                                               if (miMode == MainGen.SPT_SYNCHRO) { // 0x \82ª\8fo\82È\82¢\82æ\82¤\82É\82·\82é\r
+                                               if (miMode == MainGen.SPT_SYNCHRO) { // 0x が出ないようにする\r
                                                        if (StdLib.toBoolean(j & 1)) {\r
                                                                if (iBasePatt[j + 1] == 1) {\r
                                                                        iBasePatt[j + 1] += miLength;\r
@@ -212,7 +212,7 @@ public class GenProc {
                                                                + StdLib.toInt(iBasePatt[j] > miMax)\r
                                                                + StdLib.toInt(iBasePatt[j + 1] > miMax);\r
                                                \r
-                                               // \92Ç\89Á\r
+                                               // 追加\r
                                                if (miOverMax >= miBalls && miBalls == miMax){\r
                                                        return false;\r
                                                }\r
@@ -275,11 +275,11 @@ public class GenProc {
                                return false;\r
                        for (i = 0; i < miLength; i++)\r
                                iPatt[i] = iBasePatt[i] + iAddPatt[i];\r
-                       // \8f\9c\82­\82×\82«\90\94\8e\9a\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82È\82¢\r
+                       // 除くべき数字が含まれていない\r
                        // for(i=0;i<miLength;i++)\r
                        // if(mbExclude[iPatt[i]]==true)\r
                        // return false;\r
-                       // \8aÜ\82Þ\82×\82«\90\94\8e\9a\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82é\r
+                       // 含むべき数字が含まれている\r
                        // for(i=0;miInclude[i]!=-1;i++){\r
                        // for(j=0;j<miLength&&iPatt[j]!=miInclude[i];j++);\r
                        // if(j==miLength)\r
@@ -345,11 +345,11 @@ public class GenProc {
                        }\r
                        for (i = 0; i < miLength; i++)\r
                                iPatt[i] = iBasePatt[i] + iAddPatt[i];\r
-                       // \8f\9c\82­\82×\82«\90\94\8e\9a\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82È\82¢\r
+                       // 除くべき数字が含まれていない\r
                        // for(i=0;i<miLength;i++)\r
                        // if(mbExclude[iPatt[i]+(i&1)*(iPatt[i]&1)*2]==true)\r
                        // return false;\r
-                       // \8aÜ\82Þ\82×\82«\90\94\8e\9a\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82é\r
+                       // 含むべき数字が含まれている\r
                        // for(i=0;miInclude[i]!=-1;i++){\r
                        // for(j=0;j<miLength&&iPatt[j]+(j&1)*(iPatt[j]&1)*2!=miInclude[i];j++);\r
                        // if(j==miLength)\r
@@ -357,7 +357,7 @@ public class GenProc {
                        // }\r
                        return true;\r
                }\r
-               // \92Ç\89Á\r
+               // 追加\r
                return true;\r
        }\r
 \r
@@ -453,23 +453,23 @@ public class GenProc {
                int i;\r
                // int j;\r
 \r
-               // \83V\83\93\83N\83\8d\82Å\8eü\8aú\82ª\8aï\90\94\82Ì\82à\82Ì\82Í\8dl\82¦\82È\82¢\r
+               // シンクロで周期が奇数のものは考えない\r
                if (miMode == MainGen.SPT_SYNCHRO && StdLib.toBoolean(miLength & 1))\r
                        return -1;\r
 \r
-               // BUFFLEN \82ð\89z\82¦\82é\83p\83^\81[\83\93\82ª\90¶\90¬\82³\82ê\82»\82¤\82È\92ö,\92·\82¢\8eü\8aú\82Í\8dl\82¦\82È\82¢\r
+               // BUFFLEN を越えるパターンが生成されそうな程,長い周期は考えない\r
                if (miLength > StdLib.BUFFLEN || miMode == MainGen.SPT_SYNCHRO\r
                                && miLength > StdLib.BUFFLEN / 7)\r
                        return -1;\r
 \r
-               // Exclude,Include \82Ì\90Ý\92è\r
-               // \8dí\8f\9c\r
+               // Exclude,Include の設定\r
+               // 削除\r
 \r
-               // miMax \82ð Exclude \82©\82ç\8b\81\82ß\82é\81B\r
-               // \8fC\90³\r
+               // miMax を Exclude から求める。\r
+               // 修正\r
                //miMax = 5;\r
 \r
-               // iPatt,iBasePatt\81c \82Ì\8am\95Û\r
+               // iPatt,iBasePatt… の確保\r
                TermGenerator();\r
                iPatt = new int[miLength];\r
                iBasePatt = new int[miLength];\r
@@ -477,7 +477,7 @@ public class GenProc {
                d = new int[miLength];\r
                p = new int[miLength];\r
 \r
-               // sPatt \82É\8d\87\82í\82¹\82Ä,iBasePatt,iAddPatt \81c\82ð\90Ý\92è\82µ,\8e\9f\82Ì\83p\83^\81[\83\93\82ð\90¶\90¬\r
+               // sPatt に合わせて,iBasePatt,iAddPatt …を設定し,次のパターンを生成\r
                if (StdLib.strlen(sPatt) == 0) {\r
                        for (i = 0; i < miLength; i++) {\r
                                p[i] = 0;\r

diff --git a/workspace/JuggleMaster/src/com/jm/gen/MainGen.java b/workspace/JuggleMaster/src/com/jm/gen/MainGen.java
index 63162ce..4157653 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/gen/MainGen.java
+++ b/workspace/JuggleMaster/src/com/jm/gen/MainGen.java
@@ -10,7 +10,7 @@ import com.jm.utility.AsyncTaskIF;
 import com.jm.utility.Debug;\r
 \r
 public class MainGen implements AsyncTaskIF {\r
-       // \83G\83\89\81[\83R\81[\83h\r
+       // エラーコード\r
        public static final int GEN_ERR_UNKNOWN = -1;\r
        public static final int GEN_ERR_MALLOC = -2;\r
        public static final int GEN_ERR_BUFFSIZE = -3;\r
@@ -18,7 +18,7 @@ public class MainGen implements AsyncTaskIF {
 \r
        public static final int GEN_LENGTH_MIN = 1;\r
        public static final int GEN_LENGTH_MAX = 255;\r
-       // \83T\83C\83g\83X\83\8f\83b\83v\82Ì\8eí\97Þ\r
+       // サイトスワップの種類\r
        public static final int SPT_NORMAL = 0x00;\r
        public static final int SPT_SYNCHRO = 0x01;\r
        public static final int SPT_ALL = (SPT_NORMAL | SPT_SYNCHRO);\r
@@ -76,7 +76,7 @@ public class MainGen implements AsyncTaskIF {
            \r
            iMax = maxPattern;\r
 \r
-           // \8eü\8aú\82ð\95\\82·\90®\90\94\94z\97ñ\82Ì\8dì\90¬\r
+           // 周期を表す整数配列の作成\r
            iLen = StringEx.TextToIntArray(sLength, null, 0, true);\r
            if(iLen < 0)\r
                return GEN_ERR_UNKNOWN;\r
@@ -85,13 +85,13 @@ public class MainGen implements AsyncTaskIF {
            //    return GEN_ERR_MALLOC;\r
            StringEx.TextToIntArray(sLength, pdwLen, iLen, true);\r
 \r
-           // \83T\83C\83g\83X\83\8f\83b\83v\90¶\90¬\r
+           // サイトスワップ生成\r
            iCount = 0;\r
            //for(i = 0; i < iLen && iCount < iMax && !(*pbStop); i++){\r
                for(i = 0; i < iLen && iCount < iMax && !isCancel(); i++){\r
                iStart = (int)StdLib.LOWORD(pdwLen[i]);\r
                iEnd   = (int)StdLib.HIWORD(pdwLen[i]);\r
-               // \8eü\8aú\82Ì\91Ã\93\96\90«\83`\83F\83b\83N\r
+               // 周期の妥当性チェック\r
                if(iStart < GEN_LENGTH_MIN)\r
                    iStart = GEN_LENGTH_MIN;\r
                if(iEnd > GEN_LENGTH_MAX)\r
@@ -102,7 +102,7 @@ public class MainGen implements AsyncTaskIF {
                    break;\r
                //for(j = iStart; j <= iEnd && iCount < iMax && !(*pbStop); j++){\r
                    for(j = iStart; j <= iEnd && iCount < iMax && !isCancel(); j++){\r
-                       // \91¬\93x\83A\83b\83v\82Ì\82½\82ß\92Ç\89Á(\83{\81[\83\8b\82Ì\8cÂ\90\94\82Æ\8d\82\82³\82ª\93¯\82¶\8fê\8d\87)\r
+                       // 速度アップのため追加(ボールの個数と高さが同じ場合)\r
                        if (balls == height){\r
                                if (mode == MainGen.SPT_NORMAL){\r
                                        if (j != 1){\r
@@ -129,7 +129,7 @@ public class MainGen implements AsyncTaskIF {
                    iSize = pgs.InitGenerator(sBuff);\r
                Debug.d(this, "InitGenerator " + j);\r
                \r
-                   // \83p\83^\81[\83\93\82ð1\82Â\82¸\82Â\90¶\90¬\r
+                   // パターンを1つずつ生成\r
                    //while(iSize > 0 && iCount < iMax && !(*pbStop)){\r
                        while(iSize > 0 && iCount < iMax && !isCancel()){\r
                        if(iSize >= StdLib.BUFFLEN){\r
@@ -137,7 +137,7 @@ public class MainGen implements AsyncTaskIF {
                                pdwLen = null;\r
                            return GEN_ERR_BUFFSIZE;\r
                        }\r
-                       // \83\8a\83X\83g\83{\83b\83N\83X\82É\8ai\94[\r
+                       // リストボックスに格納\r
                        //if(SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)sBuff) == LB_ERRSPACE || SendMessage(hName, LB_ADDSTRING, 0, (LPARAM)sBuff) == LB_ERRSPACE){\r
                        //    free(pdwLen);\r
                        //    return GEN_ERR_MALLOC;\r
@@ -184,10 +184,10 @@ public class MainGen implements AsyncTaskIF {
                                patterns[i] = pattern;\r
                        }\r
 \r
-                       // \83C\83\93\83e\83\93\83g\8co\97R\82¾\82Æ\8fd\82·\82¬\82é\82Ì\82Å\r
+                       // インテント経由だと重すぎるので\r
                        Menu2.setList(patterns);\r
 \r
-                       // \83\81\83\82\83\8a\95s\91«\89ñ\94ð\r
+                       // メモリ不足回避\r
                        list = null;\r
                        System.gc();                    \r
                }\r

diff --git a/workspace/JuggleMaster/src/com/jm/gen/MainJudge.java b/workspace/JuggleMaster/src/com/jm/gen/MainJudge.java
index 2dbfc75..5cfd3c1 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/gen/MainJudge.java
+++ b/workspace/JuggleMaster/src/com/jm/gen/MainJudge.java
@@ -6,12 +6,12 @@ public class MainJudge {
            boolean bSynchro, bMulti;\r
            int  i, iLen, iCount;\r
 \r
-           // \88ø\90\94\83`\83F\83b\83N\r
+           // 引数チェック\r
            iLen = StdLib.strlen(sPatt);\r
            if(!StdLib.toBoolean(iLen))\r
                return 0;\r
 \r
-           // \8eü\8aú\8eæ\93¾\r
+           // 周期取得\r
            bSynchro = bMulti = false;\r
            iCount = 0;\r
            for(i = 0; i < iLen; i++){\r

diff --git a/workspace/JuggleMaster/src/com/jm/gen/StringEx.java b/workspace/JuggleMaster/src/com/jm/gen/StringEx.java
index ebbdc05..8028e8d 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/gen/StringEx.java
+++ b/workspace/JuggleMaster/src/com/jm/gen/StringEx.java
@@ -7,7 +7,7 @@ public class StringEx {
            int sFound;\r
            int  uLen1, uLen2;\r
 \r
-           // \94ä\8ar\89Â\94\\90«\82ð\83`\83F\83b\83N\r
+           // 比較可能性をチェック\r
            uLen1 = StdLib.strlen(sText1);\r
            uLen2 = StdLib.strlen(sText2);\r
            if(!(uLen1 > 0) || !(uLen2 > 0) || !(uStart > 0) || uStart > (uLen1 - uLen2 + 1))\r
@@ -41,21 +41,21 @@ public class StringEx {
            int iStart;\r
            int iEnd;\r
 \r
-           // \88ø\90\94\83`\83F\83b\83N\r
+           // 引数チェック\r
            iLen = StdLib.strlen(sText);\r
            if(!StdLib.toBoolean(iLen))\r
                return 0;\r
 //         for(i = 0; i < iLen; i++)\r
-//             // 2\83o\83C\83g\95¶\8e\9a\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82½\82ç\92\86\8e~\r
+//             // 2バイト文字が含まれていたら中止\r
 //             if(_ismbblead(sText[i]))\r
 //                 return -1;\r
 \r
-           // \95¶\8e\9a\97ñ\82Ì\90®\8c`\r
+           // 文字列の整形\r
            sBuff = new char[iLen * 4 + 1];\r
            iCount = 0;\r
            for(i = 0; i < iLen; i++){\r
                if(StdLib.isalpha(sText[i])){\r
-                   // a\81`z \82ð 10\81`35 \82É\95Ï\8a·\r
+                   // a〜z を 10〜35 に変換\r
                    sBuff[iCount] = '\0';\r
                    //wsprintf(sNum, " %02d ", StdLib.tolower(sText[i]) - 'a' + 10);\r
                    StdLib.wsprintf(sNum, StdLib.tolower(sText[i]) - 'a' + 10);\r
@@ -68,14 +68,14 @@ public class StringEx {
                }\r
            }\r
            iLen = iCount;\r
-           // \8bL\8d\86\82ð\95Ï\8a·\r
+           // 記号を変換\r
            sTrans = new char[iLen + 1];\r
            iCount = 0;\r
            ch = ' ';\r
-           // \93à\95\94\8fó\91Ô ch \82ª\8eæ\82è\82¤\82é\92l\82Í '0'\81A'1'\81A' '\81A'-' \82Ì4\82Â\82Å\81A\82»\82ê\82¼\82ê\r
-           // \81u\8bæ\90Ø\82ç\82ê\82½\90\94\8e\9a\81v\81u\8bæ\90Ø\82ç\82ê\82Ä\82¢\82È\82¢\90\94\8e\9a\81v\81u\8bæ\90Ø\82è\81v\81u\8cp\91±\81v\82ð\95\\82·\r
+           // 内部状態 ch が取りうる値は '0'、'1'、' '、'-' の4つで、それぞれ\r
+           // 「区切られた数字」「区切られていない数字」「区切り」「継続」を表す\r
            for(i = 0; i < iLen; i++){\r
-               // \8fç\92·\82È\8bL\8d\86\82ð\8dí\8f\9c\r
+               // 冗長な記号を削除\r
                switch(sBuff[i])\r
                    {\r
                    case '0':\r
@@ -88,49 +88,49 @@ public class StringEx {
                    case '7':\r
                    case '8':\r
                    case '9':\r
-                       // \90\94\8e\9a\82Ì\82Æ\82«\r
+                       // 数字のとき\r
                        if(ch == '0'){\r
-                           // \93à\95\94\8fó\91Ô\82ª\8bæ\90Ø\82ç\82ê\82½\90\94\8e\9a\82È\82ç\8bó\94\92\82ð\8fo\97Í\r
+                           // 内部状態が区切られた数字なら空白を出力\r
                            sTrans[iCount] = ' ';\r
                            iCount++;\r
                        }\r
-                       // \90\94\8e\9a\82ð\8fo\97Í\82µ\82Ä\81A\93à\95\94\8fó\91Ô\82ð\8bæ\90Ø\82ç\82ê\82Ä\82¢\82È\82¢\90\94\8e\9a\82É\95Ï\8dX\r
+                       // 数字を出力して、内部状態を区切られていない数字に変更\r
                        sTrans[iCount] = sBuff[i];\r
                        iCount++;\r
                        ch = '1';\r
                        break;\r
 \r
                    case ' ':\r
-                       // \8bó\94\92\82Ì\82Æ\82«\r
+                       // 空白のとき\r
                        if(ch == '1')\r
-                           // \93à\95\94\8fó\91Ô\82ª\8bæ\90Ø\82ç\82ê\82Ä\82¢\82È\82¢\90\94\8e\9a\82È\82ç\81A\82±\82ê\82ð\8bæ\90Ø\82ç\82ê\82½\90\94\8e\9a\82É\95Ï\8dX\r
+                           // 内部状態が区切られていない数字なら、これを区切られた数字に変更\r
                            ch = '0';\r
                        break;\r
 \r
                    case ',':\r
-                       // \83R\83\93\83}\82Ì\82Æ\82«\r
+                       // コンマのとき\r
                        if(ch != ' '){\r
-                            // \93à\95\94\8fó\91Ô\82ª\8bæ\90Ø\82è\82Å\82È\82¯\82ê\82Î\8bó\94\92\82ð\8fo\97Í\r
+                            // 内部状態が区切りでなければ空白を出力\r
                            sTrans[iCount] = ' ';\r
                            iCount++;\r
                        }\r
-                       // \93à\95\94\8fó\91Ô\82ð\8bæ\90Ø\82è\82É\95Ï\8dX\r
+                       // 内部状態を区切りに変更\r
                        ch = ' ';\r
                        break;\r
 \r
                    case '-':\r
-                       // \94Í\88Í\8bL\8d\86\82Ì\82Æ\82«\r
+                       // 範囲記号のとき\r
                        if(ch != '-'){\r
-                            // \93à\95\94\8fó\91Ô\82ª\8cp\91±\82Å\82È\82¯\82ê\82Î\94Í\88Í\8bL\8d\86\82ð\8fo\97Í\r
+                            // 内部状態が継続でなければ範囲記号を出力\r
                            sTrans[iCount] = '-';\r
                            iCount++;\r
                        }\r
-                       // \93à\95\94\8fó\91Ô\82ð\8cp\91±\82É\95Ï\8dX\r
+                       // 内部状態を継続に変更\r
                        ch = '-';\r
                        break;\r
 \r
                    default:\r
-                       // \82»\82ê\88È\8aO\82È\82ç\92\86\8e~\r
+                       // それ以外なら中止\r
                        //free(sTrans);\r
                        //free(sBuff);\r
                        sTrans = null;\r
@@ -141,7 +141,7 @@ public class StringEx {
            }\r
            sTrans[iCount] = '\0';\r
 \r
-           // \92P\93Æ\82Ì\83n\83C\83t\83\93\82ð\8f\9c\8b\8e\r
+           // 単独のハイフンを除去\r
            iIndex = InStrEx(1, sTrans, StdLib.stoc(" - "));\r
            while(iIndex > 0){\r
                sTrans[iIndex] = '\0';\r
@@ -152,7 +152,7 @@ public class StringEx {
                iIndex = InStrEx(1, sTrans, StdLib.stoc(" - "));\r
            }\r
            if(sTrans[0] == '-' && sTrans[1] == ' '){\r
-               // \90æ\93ª\82Ì\92P\93Æ\83n\83C\83t\83\93\82à\8f\9c\8b\8e\r
+               // 先頭の単独ハイフンも除去\r
                //StdLib.strcpy(sBuff, sTrans + 2);\r
                StdLib.strcpy(sBuff, sTrans, 2);\r
                StdLib.strcpy(sTrans, sBuff);\r
@@ -160,10 +160,10 @@ public class StringEx {
            iCount = StdLib.strlen(sTrans);\r
            if(iCount > 1)\r
                if(sTrans[iCount - 1] == '-' && sTrans[iCount - 2] == ' ')\r
-                   // \96\96\94ö\82Ì\92P\93Æ\83n\83C\83t\83\93\82à\8f\9c\8b\8e\r
+                   // 末尾の単独ハイフンも除去\r
                    sTrans[iCount - 2] = '\0';\r
            if(!StdLib.toBoolean(StdLib.strlen(sTrans))){\r
-               // \95¶\8e\9a\97ñ\82É\90\94\8e\9a\82ª\8ew\92è\82³\82ê\82Ä\82¢\82È\82¯\82ê\82Î\8aÖ\90\94\82ð\94²\82¯\82é\r
+               // 文字列に数字が指定されていなければ関数を抜ける\r
                //free(sTrans);\r
                //free(sBuff);\r
                sTrans = null;\r
@@ -172,9 +172,9 @@ public class StringEx {
                return 0;\r
            }\r
 \r
-           // \95K\97v\82È\94z\97ñ\82Ì\91å\82«\82³\82ð\8eæ\93¾\r
+           // 必要な配列の大きさを取得\r
            iBlock = 1;\r
-           // \83u\83\8d\83b\83N\90\94\82ð\90\94\82¦\82é\r
+           // ブロック数を数える\r
            iIndex = InStrEx(1, sTrans, StdLib.stoc(" "));\r
            while(iIndex > 0){\r
                iBlock++;\r
@@ -182,7 +182,7 @@ public class StringEx {
            }\r
 \r
            pdwBuff = new int[iBlock];\r
-           // \90®\8c`\82³\82ê\82½\95¶\8e\9a\97ñ\82ð\8e©\91R\90\94\82Ì\94z\97ñ\82É\95Ï\8a·\r
+           // 整形された文字列を自然数の配列に変換\r
            iStart = 0;\r
            for(i = 0; i < iBlock; i++){\r
                //strcpy(sBuff, sTrans + iStart);\r
@@ -190,13 +190,13 @@ public class StringEx {
                iEnd = InStrEx(1, sBuff, StdLib.stoc(" "));\r
                iIndex = InStrEx(1, sBuff, StdLib.stoc("-"));\r
                if(StdLib.toBoolean(iEnd))\r
-                   // \8bæ\90Ø\82è\82ª\82 \82ê\82Î\82»\82Ì\91O\82Ü\82Å\r
+                   // 区切りがあればその前まで\r
                    sBuff[iEnd - 1] = '\0';\r
                else\r
-                   // \82È\82¯\82ê\82Î\8dÅ\8cã\82Ü\82Å\r
+                   // なければ最後まで\r
                    iEnd = StdLib.strlen(sBuff) + 1;\r
                if(StdLib.toBoolean(iIndex) && iIndex < iEnd){\r
-                   // \94Í\88Í\8ew\92è\82Ì\8fê\8d\87\r
+                   // 範囲指定の場合\r
                    sBuff[iIndex - 1] = '\0';\r
                    wFirst = StdLib.atoi(sBuff);\r
                    //wLast = StdLib.atoi(sBuff + iIndex);\r
@@ -204,24 +204,24 @@ public class StringEx {
                    if(iIndex == iEnd - 1)\r
                        wLast = 0xFFFF;\r
                    if(wFirst > wLast){\r
-                       // \94Í\88Í\82Ì\8aJ\8en\90\94\82ª\8fI\97¹\90\94\82æ\82è\91å\82«\82¯\82ê\82Î\82±\82ê\82ð\8cð\8a·\r
+                       // 範囲の開始数が終了数より大きければこれを交換\r
                        wSwap = wFirst;\r
                        wFirst = wLast;\r
                        wLast = wSwap;\r
                    }\r
                    if(wFirst == wLast)\r
-                       // \94Í\88Í\82Ì\8aJ\8en\90\94\82Æ\8fI\97¹\90\94\82ª\93¯\82¶\82È\82ç\92P\93Æ\82Ì\90\94\92l\82Æ\82Ý\82È\82·\r
+                       // 範囲の開始数と終了数が同じなら単独の数値とみなす\r
                        pdwBuff[i] = wFirst;\r
                    else\r
                        pdwBuff[i] = StdLib.MAKELONG(wFirst, wLast);\r
                }\r
                else\r
-                   // \92P\93Æ\82Ì\90\94\92l\82Ì\8fê\8d\87\r
+                   // 単独の数値の場合\r
                    pdwBuff[i] = StdLib.atoi(sBuff);\r
                iStart += iEnd;\r
            }\r
 \r
-           // \90\94\8e\9a\82Ì\8f¸\8f\87\82É\95À\82×\91Ö\82¦\r
+           // 数字の昇順に並べ替え\r
            for(i = 0; i < iBlock - 1; i++){\r
                for(j = i + 1; j < iBlock; j++){\r
                    if(StdLib.LOWORD(pdwBuff[j]) < StdLib.LOWORD(pdwBuff[i])){\r
@@ -231,22 +231,22 @@ public class StringEx {
                    }\r
                }\r
            }\r
-           // \92P\93Æ\82Ì 0 \82ª\82 \82é\82©\82Ç\82¤\82©\92²\82×\82é\r
+           // 単独の 0 があるかどうか調べる\r
            if(StdLib.toBoolean(pdwBuff[0]))\r
                bZero = false;\r
            else\r
                bZero = true;\r
 \r
-           // \8fç\92·\82È\90\94\8e\9a\82ð\8dí\8f\9c\r
+           // 冗長な数字を削除\r
            if(bCompress){\r
-               // \91S\82­\93¯\82¶\90\94\8e\9a\82ª\82 \82ê\82Î\8dí\8f\9c\r
+               // 全く同じ数字があれば削除\r
                for(i = 0; i < iBlock - 1; i++){\r
                    for(j = i + 1; j < iBlock; j++){\r
                        if(StdLib.toBoolean(pdwBuff[j]) && pdwBuff[j] == pdwBuff[i])\r
                            pdwBuff[j] = 0;\r
                    }\r
                }\r
-               // \98A\91±\82·\82é\92P\93Æ\82Ì\90\94\8e\9a\82ð\94Í\88Í\82É\95Ï\8a·\82·\82é\r
+               // 連続する単独の数字を範囲に変換する\r
                for(i = 0; i < iBlock - 1; i++){\r
                    if(!StdLib.toBoolean(StdLib.HIWORD(pdwBuff[i]))){\r
                        wFirst = StdLib.LOWORD(pdwBuff[i]);\r
@@ -263,18 +263,18 @@ public class StringEx {
                        }\r
                    }\r
                }\r
-               // \94Í\88Í\93à\82É\92P\93Æ\82Ì\90\94\8e\9a\81A\8fd\82È\82é\94Í\88Í\81A\82¨\82æ\82Ñ\82»\82Ì\91O\8cã\82Ì\90\94\8e\9a\82ð\8eæ\82è\8d\9e\82Þ\r
+               // 範囲内に単独の数字、重なる範囲、およびその前後の数字を取り込む\r
                for(i = 0; i < iBlock; i++){\r
                    wFirst = StdLib.LOWORD(pdwBuff[i]);\r
                    wLast  = StdLib.HIWORD(pdwBuff[i]);\r
                    if(StdLib.toBoolean(wLast)){\r
-                       // \94Í\88Í\8ew\92è\82ª\82 \82ê\82Î\8f\88\97\9d\82·\82é\r
+                       // 範囲指定があれば処理する\r
                        for(j = 0; j < iBlock; j++){\r
                            wSwap = StdLib.LOWORD(pdwBuff[j]);\r
                            if(j != i && (StdLib.toBoolean(wSwap) || bZero)){\r
-                               // \8e©\95ª\8e©\90g\82â\8ew\92è\82³\82ê\82Ä\82¢\82È\82¢ 0 \82Í\83`\83F\83b\83N\82µ\82È\82¢\r
+                               // 自分自身や指定されていない 0 はチェックしない\r
                                if(StdLib.toBoolean(StdLib.HIWORD(pdwBuff[j]))){\r
-                                   // \95Ê\82Ì\94Í\88Í\82¾\82Á\82½\8fê\8d\87\r
+                                   // 別の範囲だった場合\r
                                    if(wFirst <= wSwap && wSwap <= wLast){\r
                                        wLast = Math.max(wLast, StdLib.HIWORD(pdwBuff[j]));\r
                                        pdwBuff[i] = StdLib.MAKELONG(wFirst, wLast);\r
@@ -282,7 +282,7 @@ public class StringEx {
                                    }\r
                                }\r
                                else{\r
-                                   // \92P\93Æ\82Ì\90\94\8e\9a\82¾\82Á\82½\8fê\8d\87\r
+                                   // 単独の数字だった場合\r
                                    if(wFirst - 1 <= wSwap && wSwap <= wLast + 1){\r
                                        wFirst = Math.min(wFirst, wSwap);\r
                                        wLast  = Math.max(wLast,  wSwap);\r
@@ -294,7 +294,7 @@ public class StringEx {
                        }\r
                    }\r
                }\r
-               // 0\82ª\93ü\82Á\82½\94z\97ñ\82ð\8f\9c\82¢\82Ä\8bl\82ß\82é\r
+               // 0が入った配列を除いて詰める\r
                i = 0;\r
                while(i < iBlock - 1){\r
                    if(StdLib.toBoolean(pdwBuff[i]))\r
@@ -310,14 +310,14 @@ public class StringEx {
                while(i < iBlock && StdLib.toBoolean(pdwBuff[i]))\r
                    i++;\r
                iBlock = i;\r
-               // 0 \82ª\8ew\92è\82³\82ê\82Ä\82¢\82½\82Æ\82«\r
+               // 0 が指定されていたとき\r
                if(bZero){\r
                    wFirst = StdLib.LOWORD(pdwBuff[0]);\r
                    if(StdLib.toBoolean(wFirst)){\r
-                       // 0 \82ª\91¶\8dÝ\82µ\82È\82¯\82ê\82Î\82±\82ê\82ð\91}\93ü\r
+                       // 0 が存在しなければこれを挿入\r
                        wLast = StdLib.HIWORD(pdwBuff[0]);\r
                        if(StdLib.toBoolean(wLast)){\r
-                           // \8dÅ\8f\89\82Ì\90\94\8e\9a\82ª\94Í\88Í\82¾\82Á\82½\8fê\8d\87\r
+                           // 最初の数字が範囲だった場合\r
                            if(wFirst == 1)\r
                                pdwBuff[0] = StdLib.MAKELONG(0, wLast);\r
                            else{\r
@@ -328,7 +328,7 @@ public class StringEx {
                            }\r
                        }\r
                        else{\r
-                           // \8dÅ\8f\89\82Ì\90\94\8e\9a\82ª\92P\93Æ\82Ì\90\94\8e\9a\82¾\82Á\82½\8fê\8d\87\r
+                           // 最初の数字が単独の数字だった場合\r
                            if(wFirst == 1)\r
                                pdwBuff[0] = StdLib.MAKELONG(0, 1);\r
                            else{\r
@@ -345,14 +345,14 @@ public class StringEx {
                }\r
            }\r
 \r
-           // \90®\90\94\94z\97ñ\82ª\8ew\92è\82³\82ê\82Ä\82¢\82ê\82Î\82±\82±\82É\92l\82ð\8ai\94[\r
+           // 整数配列が指定されていればここに値を格納\r
            if(pdwValue != null && StdLib.toBoolean(iSize)){\r
                iBlock = Math.min(iBlock, iSize);\r
                for(i = 0; i < iBlock; i++)\r
                    pdwValue[i] = pdwBuff[i];\r
            }\r
 \r
-           // \8cã\8en\96\96\r
+           // 後始末\r
            //free(sTrans);\r
            //free(sBuff);\r
            //free(pdwBuff);\r

diff --git a/workspace/JuggleMaster/src/com/jm/opengl/JuggleDrawer.java b/workspace/JuggleMaster/src/com/jm/opengl/JuggleDrawer.java
index 997f245..ca7cc96 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/opengl/JuggleDrawer.java
+++ b/workspace/JuggleMaster/src/com/jm/opengl/JuggleDrawer.java
@@ -12,7 +12,7 @@ import com.jm.JugglingBalls;
 import com.jm.utility.JmException;\r
 import com.jm.utility.Resource;\r
 \r
-// JugglerCanvas\82Ì\91ã\82í\82è\r
+// JugglerCanvasの代わり\r
 public class JuggleDrawer {\r
        private static final int DENOMINATOR = 1000;\r
        private static final int N = 2;\r

diff --git a/workspace/JuggleMaster/src/com/jm/opengl/OpenGLSphere.java b/workspace/JuggleMaster/src/com/jm/opengl/OpenGLSphere.java
index 61789d1..c54ca04 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/opengl/OpenGLSphere.java
+++ b/workspace/JuggleMaster/src/com/jm/opengl/OpenGLSphere.java
@@ -51,16 +51,16 @@ public class OpenGLSphere {
                //this.mRadius = mRadius;\r
 \r
                // vertices\r
-               // vertices\94z\97ñ\82ð\90é\8c¾\r
+               // vertices配列を宣言\r
                int[] vertices = new int[(2 + (gridV1 - 2) * gridU) * 3];\r
                cnt = 0;\r
-               // \88ê\82Â\82Ìtop\83|\83C\83\93\83g\82Ì\90Ý\92u\r
+               // 一つのtopポイントの設置\r
 \r
                vertices[cnt++] = 0;\r
                vertices[cnt++] = -mRadius;\r
                vertices[cnt++] = 0;\r
 \r
-               // \90Ø\92f\96Ê\82Ì\90Ý\92u\r
+               // 切断面の設置\r
                double d = mRadius;\r
                double y, t, r;\r
                for (int iv = 1; iv < gridV1 - 1; ++iv) {\r
@@ -74,7 +74,7 @@ public class OpenGLSphere {
                        }\r
                }\r
 \r
-               // \82à\82¤\88ê\82Âtop\83|\83C\83\93\83g\82Ì\90Ý\92u\r
+               // もう一つtopポイントの設置\r
                vertices[cnt++] = 0;\r
                vertices[cnt++] = mRadius;\r
                vertices[cnt++] = 0;\r
@@ -142,14 +142,14 @@ public class OpenGLSphere {
        }\r
 \r
        /**\r
-        * IntBuffer\82Ì\8dì\90¬\r
+        * IntBufferの作成\r
         * \r
         * @param intArray\r
         * @return\r
         */\r
        public IntBuffer createIntBuffer(int[] intArray) {\r
                IntBuffer tmpIb;\r
-               /* \90F\82Ì\92l */\r
+               /* 色の値 */\r
                ByteBuffer tmpBb = ByteBuffer.allocateDirect(intArray.length * 4);\r
                tmpBb.order(ByteOrder.nativeOrder());\r
                tmpIb = tmpBb.asIntBuffer();\r
@@ -160,14 +160,14 @@ public class OpenGLSphere {
        }\r
 \r
        /**\r
-        * ByteBuffer\82Ì\8dì\90¬\r
+        * ByteBufferの作成\r
         * \r
         * @param byteArray\r
         * @return\r
         */\r
        public ByteBuffer createByteBuffer(byte[] byteArray) {\r
 \r
-               /* \90F\82Ì\92l */\r
+               /* 色の値 */\r
                ByteBuffer tmpBb = ByteBuffer.allocateDirect(byteArray.length);\r
                tmpBb.put(byteArray);\r
                tmpBb.position(0);\r

diff --git a/workspace/JuggleMaster/src/com/jm/utility/AsyncTaskCommand.java b/workspace/JuggleMaster/src/com/jm/utility/AsyncTaskCommand.java
index a0254d6..28bee70 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/utility/AsyncTaskCommand.java
+++ b/workspace/JuggleMaster/src/com/jm/utility/AsyncTaskCommand.java
@@ -108,8 +108,8 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
                        isCancel = true;\r
                        command.cancel();\r
                }\r
-               // onPostExecute()\82Ìdialog.dismiss();\82Å\83G\83\89\81[\82Æ\82È\82é\82½\82ß\r
-               // \96{\8e¿\93I\82È\89ð\8c\88\8dô\82Å\82Í\82È\82¢\r
+               // onPostExecute()のdialog.dismiss();でエラーとなるため\r
+               // 本質的な解決策ではない\r
 //             dialog = null;\r
                if (dialog != null){\r
                        dialog.dismiss();\r

diff --git a/workspace/JuggleMaster/src/com/jm/utility/ListViewArrayAdapter.java b/workspace/JuggleMaster/src/com/jm/utility/ListViewArrayAdapter.java
index 90a6716..832dd00 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/utility/ListViewArrayAdapter.java
+++ b/workspace/JuggleMaster/src/com/jm/utility/ListViewArrayAdapter.java
@@ -23,7 +23,7 @@ public class ListViewArrayAdapter extends ArrayAdapter<JmPattern> {
     public View getView(int position, View convertView, ViewGroup parent){\r
         View view = convertView;  \r
         if(view == null){  \r
-            //1\8ds\95ªlayout\82©\82çView\82Ì\89ò\82ð\90¶\90¬\r
+            //1行分layoutからViewの塊を生成\r
             view = inflater.inflate(android.R.layout.simple_list_item_1, null);  \r
         }      \r
 \r

diff --git a/workspace/JuggleMaster/src/com/jm/utility/Resource.java b/workspace/JuggleMaster/src/com/jm/utility/Resource.java
index 11fee13..f3922e0 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 = "\90Ý\92è\82ð\8f\89\8aú\89»\82µ\82Ü\82µ\82½\81B";\r
-       public static final String              MSG_NOTHING = "\93o\98^\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ";\r
-       public static final String              ERROR_TITLE = "\83G\83\89\81[";\r
-       public static final String              ERRMSG_DELETE = "\8dÅ\92á\82P\82Â\82Í\93o\98^\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B";\r
-       public static final String              ERRMSG_SITESWAP = " \82Í\90³\82µ\82¢\83T\83C\83g\83X\83\8f\83b\83v\95\\8c»\82Å\82Í\82 \82è\82Ü\82¹\82ñ\81B";\r
-       public static final String              ERRMSG_MOTION = " \82Í\90³\82µ\82­\82 \82è\82Ü\82¹\82ñ\81B";\r
-       public static final String              ERRMSG_JVIEWER = "\83p\83\89\83\81\81[\83^\82ª\95s\90³\82Å\82·\81B\83p\83\89\83\81\81[\83^\82ð\95Ï\8dX\82µ\82Ä\82à\82¤\88ê\93x\8eÀ\8ds\82µ\82Ä\82Ý\82Ä\82­\82¾\82³\82¢\81B";\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 = "\83w\83\8b\83v";\r
-       public static final String              HELPMSG_INDIVIDUAL = "\8bZ\82²\82Æ\82É\8cÅ\97L\82Ì\90Ý\92è\82Å\82·\81B\83}\83C\83\8a\83X\83g\82Å\82Ì\82Ý\95Ï\8dX\82ª\95Û\91¶\82³\82ê\82Ü\82·\81B\82»\82ê\88È\8aO\82Å\8ds\82í\82ê\82½\95Ï\8dX\82Í\83\81\83C\83\93\83\81\83j\83\85\81[\82É\96ß\82é\82Ü\82Å\97L\8cø\82Å\82·\81B";\r
-       public static final String              HELPMSG_NAME = "\83p\83^\81[\83\93\82Ì\96¼\91O\82ð\8c\88\92è\82µ\82Ü\82·\81B";\r
-       public static final String              HELPMSG_SITESWAP = "\83T\83C\83g\83X\83\8f\83b\83v\95\\8c»\82ð\8eg\82Á\82Ä\8bZ\82ð\95Ï\8dX\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82·\81B\93ü\97Í\8c\88\92è\8cã\82É\95¶\96@\83`\83F\83b\83N\82ª\8ds\82í\82ê\82Ä\81A\90³\82µ\82¯\82ê\82Î\95Ï\8dX\82ª\93K\97p\82³\82ê\82Ü\82·\81B\95¶\96@\82ÍJuggleMasterJava\82É\8f\80\82¶\82Ü\82·\81B";\r
-       public static final String              HELPMSG_MOTION = "\83W\83\83\83O\83\89\81[\82Ì\8eè\82Ì\93®\82«\82ð\8ew\92è\82Å\82«\82Ü\82·\81i\8cº\90l\8cü\82¯\81j\81B{x1,y1}{x2,y2}\82Æ\8ew\92è\82µ\82Ü\82·\81B\82±\82±\82Å\81Ax1,y1 \82Í\81A\83{\81[\83\8b\82ð\8eæ\82é x/y \8dÀ\95W\81Ax2,y2 \82Í\93\8a\82°\82é x/y \8dÀ\95W\82ð\8e¦\82µ\82Ü\82·\81BJuggleMasterJava\82É\8f\80\82¶\82Ü\82·\81B";\r
-       public static final String              HELPMSG_HEIGHT = "\83{\81[\83\8b\82ð\93\8a\82°\8fã\82°\82é\8d\82\82³\82ð\92²\90ß\82µ\82Ü\82·\81B\91å\82«\82¢\82Ù\82Ç\8d\82\82­\93\8a\82°\8fã\82°\82Ü\82·\81B";\r
-       public static final String              HELPMSG_DWELLRATE = "\83{\81[\83\8b\82ð\8e\9d\82Á\82Ä\82¢\82é\8a\84\8d\87\82ð\92²\90ß\82µ\82Ü\82·\81B\8f¬\82³\82¢\82Ù\82Ç\83L\83\83\83b\83`\82µ\82½\82 \82Æ\82·\82®\82É\93\8a\82°\8fã\82°\82Ü\82·\81B";\r
-       public static final String              HELPMSG_COMMON = "\82·\82×\82Ä\82Ì\8bZ\82É\8b¤\92Ê\82Ì\90Ý\92è\82Å\82·\81B\95Ï\8dX\82Í\83v\83\8d\83O\83\89\83\80\82ª\8fI\97¹\82·\82é\82Ü\82Å\97L\8cø\82Å\82·\81B";\r
-       public static final String              HELPMSG_SPEED = "\83W\83\83\83O\83\8a\83\93\83O\82Ì\91¬\82³\82ð\92²\90ß\82µ\82Ü\82·\81B\91å\82«\82¢\82Ù\82Ç\91\81\82­\82È\82è\82Ü\82·\81B";\r
-       public static final String              HELPMSG_MIRROR = "ON\82É\82·\82é\82Æ\8d¶\89E\82ð\94½\93]\82µ\82Ü\82·\81B";\r
-       public static final String              HELPMSG_SHOW_BODY = "OFF\82É\82·\82é\82Æ\83W\83\83\83O\83\89\81[\82ð\95\\8e¦\82µ\82Ü\82¹\82ñ\81B";\r
-       public static final String              HELPMSG_SHOW_SITESWAP = "OFF\82É\82·\82é\82Æ\83T\83C\83g\83X\83\8f\83b\83v\82ð\95\\8e¦\82µ\82Ü\82¹\82ñ\81B";\r
-       public static final String              HELPMSG_SETENV = "\82±\82Ì\90Ý\92è\82Í\95Û\91¶\82³\82ê\82Ü\82·\81B";\r
-       public static final String              HELPMSG_REDRAWRATE = "\95`\89æ\8aÔ\8au\82ð\92²\90ß\82µ\82Ü\82·\81B\91å\82«\82¢\82Ù\82Ç\93®\82«\82Í\83X\83\80\81[\83Y\82É\82È\82è\82Ü\82·\82ª\81A\8f\88\97\9d\82ª\8fd\82­\82È\82è\82Ü\82·\81B";\r
-       public static final String              HELPMSG_BGCOLOR = "\94w\8ci\90F\82ð\8c\88\92è\82µ\82Ü\82·\81B";\r
-       public static final String              HELPMSG_FGCOLOR = "\91O\8ci\90F\82ð\8c\88\92è\82µ\82Ü\82·\81B";\r
-       public static final String              HELPMSG_EMCOLOR = "\83T\83C\83g\83X\83\8f\83b\83v\95\\8bL\82Ì\8b­\92²\90F\82ð\8c\88\92è\82µ\82Ü\82·\81B";\r
-       public static final String              HELPMSG_INITIALIZE = "\8fã\8bL\82Ì\90Ý\92è\82ð\8f\89\8aú\8fó\91Ô\82É\96ß\82µ\82Ü\82·\81B";\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