From 3e2f0cc5fef4f363d6f686652cc44ba6090c9adf Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Wed, 26 Mar 2014 13:14:19 +0900 Subject: [PATCH] skin: dereference after null check Change-Id: I6cb2ed95c031ca6dadbd5404e0b31228e772b3f4 Signed-off-by: GiWoong Kim --- .../skin/layout/GeneralPurposeSkinComposer.java | 2 +- .../org/tizen/emulator/skin/menu/PopupMenu.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java index e48d5679fc..6b49aad89f 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java @@ -151,7 +151,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { List keyMapList = SkinUtil.getHWKeyMapList( skin.getEmulatorSkinState().getCurrentRotationId()); - if (keyMapList.isEmpty() == false) { + if (keyMapList != null && keyMapList.isEmpty() == false) { toggleButton = createToggleButton(); toggleButton.setBackground(backgroundColor); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java index 9c33bd2698..cbb9ee8e53 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java @@ -252,10 +252,6 @@ public class PopupMenu { } if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null) { - advancedItem = new MenuItem(menu, SWT.CASCADE); - advancedItem.setText(ADVANCED_MENUITEM_NAME); - advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED)); - new MenuItem(advancedSubMenu, SWT.SEPARATOR); } @@ -270,8 +266,16 @@ public class PopupMenu { /* Force close menu */ forceCloseItem = createForceCloseItem( advancedSubMenu, FORCECLOSE_MENUITEM_NAME); + + if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null + || aboutItem != null || forceCloseItem != null) { + advancedItem = new MenuItem(menu, SWT.CASCADE); + advancedItem.setText(ADVANCED_MENUITEM_NAME); + advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED)); + + advancedItem.setMenu(advancedSubMenu); + } } - advancedItem.setMenu(advancedSubMenu); /* Shell menu */ if (itemProperties == null || -- 2.34.1