[Title] fix potential bug
authorjungwook.ryu <jungwook.ryu@samsung.com>
Wed, 2 Apr 2014 05:25:16 +0000 (14:25 +0900)
committerjungwook.ryu <jungwook.ryu@samsung.com>
Wed, 2 Apr 2014 05:25:16 +0000 (14:25 +0900)
[Desc.] compare floating value, potential null pointer exception
[Issue] -

org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardHeightChangeableItem.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java

index 823facc..447b266 100644 (file)
@@ -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;
index 8038e3b..38033bd 100644 (file)
@@ -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;
+                       }
                }
        }