javauis/lcdui_qt/src/javax/microedition/lcdui/KeyTable.java
changeset 56 abc41079b313
parent 23 98ccebc37403
child 72 1f0034e370aa
--- a/javauis/lcdui_qt/src/javax/microedition/lcdui/KeyTable.java	Fri Jul 09 16:35:45 2010 +0300
+++ b/javauis/lcdui_qt/src/javax/microedition/lcdui/KeyTable.java	Fri Jul 23 12:27:20 2010 +0300
@@ -27,29 +27,33 @@
     static final int[][] KEY_TO_GAME_TABLE =
     {
         {-1,  Canvas.UP},
-        {50,  Canvas.UP},
+        {Canvas.KEY_NUM2,  Canvas.UP},
         {SWT.ARROW_UP,  Canvas.UP},
 
         {-2,  Canvas.DOWN},
-        {56,  Canvas.DOWN},
+        {Canvas.KEY_NUM8,  Canvas.DOWN},
         {SWT.ARROW_DOWN,  Canvas.DOWN},
 
         {-3,  Canvas.LEFT},
-        {52,  Canvas.LEFT},
+        {Canvas.KEY_NUM4,  Canvas.LEFT},
         {SWT.ARROW_LEFT,  Canvas.LEFT},
 
         {-4,  Canvas.RIGHT},
-        {54,  Canvas.RIGHT},
+        {Canvas.KEY_NUM6,  Canvas.RIGHT},
         {SWT.ARROW_RIGHT,  Canvas.RIGHT},
 
         {-5,  Canvas.FIRE},
-        {53,  Canvas.FIRE},
+        {Canvas.KEY_NUM5,  Canvas.FIRE},
         {-10, Canvas.FIRE},
 
-        {55,  Canvas.GAME_A},
-        {57,  Canvas.GAME_B},
-        {42,  Canvas.GAME_C},
-        {35,  Canvas.GAME_D},
+        {Canvas.KEY_NUM7,  Canvas.GAME_A},
+        {Canvas.KEY_NUM9,  Canvas.GAME_B},
+        {Canvas.KEY_STAR,  Canvas.GAME_C},
+        {Canvas.KEY_POUND,  Canvas.GAME_D},
+        
+        {Canvas.KEY_NUM0, 0},
+        {Canvas.KEY_NUM1, 0},
+        {Canvas.KEY_NUM3, 0}
     };
 
     /**
@@ -91,43 +95,42 @@
 
         switch(keyCode)
         {
-            /*case Canvas.KEY_NUM0:
-                return "0";
+        case Canvas.KEY_NUM0:
+            return "0";
 
-            case Canvas.KEY_NUM1:
-                return "1";
+        case Canvas.KEY_NUM1:
+            return "1";
 
-            case Canvas.KEY_NUM2:
-                return "2";
+        case Canvas.KEY_NUM2:
+            return "2";
 
-            case Canvas.KEY_NUM3:
-                return "3";
+        case Canvas.KEY_NUM3:
+            return "3";
 
-            case Canvas.KEY_NUM4:
-                return "4";
+        case Canvas.KEY_NUM4:
+            return "4";
 
-            case Canvas.KEY_NUM5:
-                return "5";
+        case Canvas.KEY_NUM5:
+            return "5";
 
-            case Canvas.KEY_NUM6:
-                return "6";
+        case Canvas.KEY_NUM6:
+            return "6";
 
-            case Canvas.KEY_NUM7:
-                return "7";
+        case Canvas.KEY_NUM7:
+            return "7";
 
-            case Canvas.KEY_NUM8:
-                return "8";
+        case Canvas.KEY_NUM8:
+            return "8";
 
-            case Canvas.KEY_NUM9:
-                return "9";
-
+        case Canvas.KEY_NUM9:
+            return "9";
 
-            case Canvas.KEY_STAR:
-                return "*";
+        case Canvas.KEY_STAR:
+            return "*";
 
-            case Canvas.KEY_POUND:
-                return "#";
-                */
+        case Canvas.KEY_POUND:
+            return "#";
+                
         case -1:
             return OpenLcduiLocalization.getMessage("key_up");
 
@@ -144,7 +147,8 @@
             return OpenLcduiLocalization.getMessage("key_select");
 
         default:
-            return "";
+            throw new IllegalArgumentException(
+            MsgRepository.CANVAS_EXCEPTION_INVALID_KEY_CODE);
         }
     }