skin: added null check 63/34063/2
authorGiWoong Kim <giwoong.kim@samsung.com>
Wed, 21 Jan 2015 02:27:48 +0000 (11:27 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 22 Jan 2015 05:49:52 +0000 (21:49 -0800)
Change-Id: I906a0077203e3a54bafefbd9a64059528f89be89
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
tizen/src/skin/client/src/org/tizen/emulator/skin/menu/GeneralKeyWindow.java

index 6924459..8857421 100644 (file)
@@ -145,15 +145,18 @@ public class GeneralKeyWindow extends SkinWindow {
                                GeneralKeyWindowImageName.KEYBUTTON_PUSHED);
 
                /* calculate the key window size */
-               int cntButton = Math.min(keyMapList.size(), BUTTON_DEFAULT_CNT);
+               int cntButton = BUTTON_DEFAULT_CNT;
+               if (keyMapList != null) {
+                       cntButton = Math.min(keyMapList.size(), cntButton);
+               }
 
                widthBase = imageNormal.getImageData().width;
                heightBase = (imageNormal.getImageData().height * cntButton) +
                                (BUTTON_VERTICAL_SPACING * (cntButton - 1));
 
                widthScrollbar = SCROLLBAR_SIZE_WIDTH + SCROLLBAR_HORIZONTAL_SPACING;
-               int heightHeaderPart = (PAIRTAG_CIRCLE_SIZE + PAIRTAG_MARGIN_BOTTOM);
-               int heightTailPart = SHELL_MARGIN_BOTTOM;
+               final int heightHeaderPart = PAIRTAG_CIRCLE_SIZE + PAIRTAG_MARGIN_BOTTOM;
+               final int heightTailPart = SHELL_MARGIN_BOTTOM;
 
                /* make a frame image */
                if (keyMapList != null) {