about dlg : bug fix. Dynamic Analyzer window will be hang while go through "About...

Change-Id: Idcf5b16e76cce7425d0beaef62d79a7d10fce1f5
Signed-off-by: hyunjong.park <phjwithyou.park@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
index d8ce089..e5b149c 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
@@ -173,12 +173,15 @@ public class AboutDialog extends DAMessageBox {
                labelData.height = 17;
                titleText.setLayoutData(labelData);
 
-               labelData = new FormData();
-               labelData.left = new FormAttachment(0, 155);
-               labelData.right = new FormAttachment(100, 0);
-               labelData.top = new FormAttachment(0, textPos += (17 + 15));
-               labelData.height = 17;
-               version.setLayoutData(labelData);
+               textPos += (17 + 15);
+               if(!ideBuildVersionInfo.equals(CommonConstants.EMPTY)){
+                       labelData = new FormData();
+                       labelData.left = new FormAttachment(0, 155);
+                       labelData.right = new FormAttachment(100, 0);
+                       labelData.top = new FormAttachment(0, textPos);
+                       labelData.height = 17;
+                       version.setLayoutData(labelData);
+               }
 
                labelData = new FormData();
                labelData.left = new FormAttachment(0, 155);
@@ -327,7 +330,7 @@ public class AboutDialog extends DAMessageBox {
                } finally {
                        CommonUtil.tryClose(in);
                }
-               return null;
+               return CommonConstants.EMPTY;
        }
 
        private static void updateDABuildInfo() {

diff --git a/package/changelog b/package/changelog
index 3a648a1..70ef178 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.46
+- bug fix. Dynamic Analyzer window will be hang while go through "About Tizen Dynamic Analyzer"icon
+== Hyunjong Park <phjwithyou.park@samsung.com> 2014-08-14
 * 2.1.45
 - bug fix for OS Windows (misuse File.separator for separate swap imagePath)
 == jungwook ryu <jungwook.ryu@samsung.com> 2014-08-11

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 555c8e4..1952c62 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source:dynamic-analyzer
-Version:2.1.45
+Version:2.1.46
 Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim <j0.kim@samsung.com>
 
 Package:dynamic-analyzer-product