From: GiWoong Kim Date: Wed, 21 Jan 2015 02:27:48 +0000 (+0900) Subject: skin: added null check X-Git-Tag: Tizen_Studio_1.3_Release_p2.3~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da8d48403a4379ff1bb0d851091f92aaccda96da;p=sdk%2Femulator%2Fqemu.git skin: added null check Change-Id: I906a0077203e3a54bafefbd9a64059528f89be89 Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/GeneralKeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/GeneralKeyWindow.java index 6924459132..8857421703 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/GeneralKeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/GeneralKeyWindow.java @@ -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) {