From 95a178348e0df59ec2fe63d6deccc3a951cad097 Mon Sep 17 00:00:00 2001 From: "jungwook.ryu" Date: Wed, 2 Apr 2014 14:25:16 +0900 Subject: [PATCH] [Title] fix potential bug [Desc.] compare floating value, potential null pointer exception [Issue] - --- .../widgets/chartBoard/DAChartBoardHeightChangeableItem.java | 2 +- .../dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardHeightChangeableItem.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardHeightChangeableItem.java index 823facc..447b266 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardHeightChangeableItem.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardHeightChangeableItem.java @@ -17,7 +17,7 @@ public class DAChartBoardHeightChangeableItem extends DAChartBoardItem { public void setHeightRatio(double ratio) { originalHeightRatio = ratio; - if (getBoardItemHeightRatio() == DAChartBoard.ITEM_HEIGHT_RATIO_SHORT) { + if (Double.compare(getBoardItemHeightRatio(), DAChartBoard.ITEM_HEIGHT_RATIO_SHORT) == 0) { heightRatio = DAChartBoard.ITEM_HEIGHT_RATIO_SHORT; } else { heightRatio = ratio; diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java index 8038e3b..38033bd 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java @@ -364,8 +364,12 @@ public class DAChartBoardItem extends Composite { } else if (childFolded) { return (int) (heightRatio * DEFAULT_ITEM_HEIGHT); } else { - return (int) (heightRatio * DEFAULT_ITEM_HEIGHT + childItemList - .getListHeight()); + if (childItemList != null) { + return (int) (heightRatio * DEFAULT_ITEM_HEIGHT + childItemList + .getListHeight()); + } else { + return 0; + } } } -- 2.7.4