トグル入力以外のフリック完成（ガイドはまだ）

[nicownn/NicoWnn.git] / src / com / hiroshica / android / input / nicownn2 / JAJP / DefaultSoftKeyboardJAJP.java

diff --git a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
index 1a53790..c8d7a24 100644 (file)
--- a/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
+++ b/src/com/hiroshica/android/input/nicownn2/JAJP/DefaultSoftKeyboardJAJP.java
@@ -306,22 +306,6 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        /** Type of input mode */
        private int mInputType = INPUT_TYPE_TOGGLE;
 
-       /** Previous input character code */
-       private int mPrevInputKeyCode = 0;
-
-       /** flick nicoinput **/
-       private static final int NICOFLICK_NONE       = 0;
-       private static final int NICOFLICK_1STROKE    = 1;
-       private static final int NICOFLICK_NICOSTROKE = 2;
-
-       private int mFlickNicoInput = 0;
-       private boolean mNicoFlick = false;
-       private static final HashMap<String, Integer> flickModeTable = new HashMap<String, Integer>() {{
-                       put("none_flick", 0);
-                       put("normal_stroke", 1);
-                       put("nico_stroke", 2);
-               }};
-
        /** **/
        private int mFlickLimitX;
        private int mFlickLimitY;
@@ -704,7 +688,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        /**
         * Change the keyboard to default
         */
-       public void setDefaultKeyboard() {
+       @Override public void setDefaultKeyboard() {
                Locale locale = Locale.getDefault();
                int keymode = KEYMODE_JA_FULL_HIRAGANA;
 
@@ -726,7 +710,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
        /**
         * Change to the next input mode
         */
-       public void nextKeyMode() {
+       @Override public void nextKeyMode() {
                /* Search the current mode in the toggle table */
                boolean found = false;
                int index;
@@ -890,7 +874,7 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
         * @param index     The key code
         * @return          The index of the toggle table for input
         */
-       private int getTableIndex(int keyCode) {
+       @Override public int getTableIndex(int keyCode) {
                int index =
                        (keyCode == KEYCODE_JP12_1)     ?  0 :
                        (keyCode == KEYCODE_JP12_2)     ?  1 :
@@ -1082,7 +1066,8 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                int targetMode = keyMode;
                int[] limits = mLimitedKeyMode;
 
-               if (!mHardKeyboardHidden) { /* for hardware keyboard */
+/*
+               if (!mHardKeyboardHidden) { // for hardware keyboard
                        if ((targetMode != KEYMODE_JA_FULL_NICO) && (targetMode != KEYMODE_JA_FULL_HIRAGANA) && (targetMode != KEYMODE_JA_HALF_ALPHABET)) {
                                Locale locale = Locale.getDefault();
                                int keymode = KEYMODE_JA_HALF_ALPHABET;
@@ -1096,14 +1081,14 @@ public class DefaultSoftKeyboardJAJP extends DefaultSoftKeyboard {
                                                //keymode = KEYMODE_JA_FULL_NICO;
                                                break;
                                        default:
-                                               /* half-alphabet */
+                                               // half-alphabet
                                                break;
                                        }
                                }
                                targetMode = keymode;
                        }
                } 
-
+*/
                /* restrict by the type of the text field */
                if (limits != null) {
                        boolean hasAccepted = false;