From feafc05874c4264c052033ad89b3f2973b902305 Mon Sep 17 00:00:00 2001 From: "Heekyoung, Oh" Date: Thu, 24 Apr 2014 19:52:10 +0900 Subject: [PATCH] Merge remote-tracking branch 'origin/tizen' into develop * origin/tizen: DESIGNER : Designer going bridge bug fix java compile version error fix (java 1.7 -> java 1.6) Merge remote-tracking branch 'origin/develop' into tizen Change-Id: I62ba2fb58887f80731fd85c279c8fdf65fd7750a Signed-off-by: Heekyoung, Oh --- org.tizen.webuibuilder/res/html/ground.js | 2 +- .../webuibuilder/bridge/DesignerGoingBridge.java | 19 +++++++++++-------- .../ui/views/databinding/DataBindingPage.java | 2 +- .../ui/views/databinding/dialog/Helper.java | 2 +- package/changelog | 6 ++++++ package/pkginfo.manifest | 10 +++++----- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/org.tizen.webuibuilder/res/html/ground.js b/org.tizen.webuibuilder/res/html/ground.js index 69cd453..8550cdc 100644 --- a/org.tizen.webuibuilder/res/html/ground.js +++ b/org.tizen.webuibuilder/res/html/ground.js @@ -476,4 +476,4 @@ function getSelectedElementRect(id, tags, indexes) { function modifyStyle(selector, key, value) { $(selector).css(key,value); -} \ No newline at end of file +} diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java index 127deb7..c5df220 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java @@ -568,12 +568,14 @@ public class DesignerGoingBridge extends GoingBridge { } JSONObject jsonobj = (JSONObject) JSONValue.parse((String) retObj); - long x, y, w, h; + long x = 0, y = 0, w = 0, h = 0; - x = (long) jsonobj.get("left"); - y = (long) jsonobj.get("top"); - w = (long) jsonobj.get("width"); - h = (long) jsonobj.get("height"); + if (null != jsonobj) { + x = (Long) jsonobj.get("left"); + y = (Long) jsonobj.get("top"); + w = (Long) jsonobj.get("width"); + h = (Long) jsonobj.get("height"); + } return new Rectangle((int) x, (int) y, (int) w, (int) h); } @@ -585,8 +587,9 @@ public class DesignerGoingBridge extends GoingBridge { public void removeSelectionElement() { call("removeSelectionElement", new Jsonizable[0]); } - + public void modifyStyle(String selector, String key, String value) { - call("modifyStyle", new Jsonizable[] { new JsString(selector), new JsString(key), new JsString(value) }); + call("modifyStyle", new Jsonizable[] { new JsString(selector), new JsString(key), + new JsString(value) }); } -} \ No newline at end of file +} diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java index f9d2b78..152a9a0 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java @@ -1537,4 +1537,4 @@ public class DataBindingPage extends Page implements IBindingDataSetListener { refresh(); } -} \ No newline at end of file +} diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java index 78aacac..66db5a2 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java @@ -675,4 +675,4 @@ public class Helper { // } // return false; // } -} \ No newline at end of file +} diff --git a/package/changelog b/package/changelog index 2513880..3c35baf 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,9 @@ +* 0.1.425 +- [Title] update version +== Heekyoung Oh 2014-04-24 17:30 +* 0.1.424 +- [Title] update version +== Heekyoung Oh 2014-04-24 17:00 * 0.1.423 - [Title] update version == nakyoung2.choi 2014-04-10 17:24 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 4ab81e9..2dc6860 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package : web-ui-builder-eplugin -Version :0.1.423 +Version :0.1.425 OS : ubuntu-32 Build-host-os : ubuntu-32 Maintainer : Hoon Kang @@ -11,7 +11,7 @@ Source : web-ui-builder-eplugin Description : Package : web-ui-builder-eplugin -Version :0.1.423 +Version :0.1.425 OS : ubuntu-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang @@ -23,7 +23,7 @@ Source : web-ui-builder-eplugin Description : Package : web-ui-builder-eplugin -Version :0.1.423 +Version :0.1.425 OS : windows-32 Build-host-os : ubuntu-32 Maintainer : Hoon Kang @@ -35,7 +35,7 @@ Source : web-ui-builder-eplugin Description : Package : web-ui-builder-eplugin -Version :0.1.423 +Version :0.1.425 OS : windows-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang @@ -47,7 +47,7 @@ Source : web-ui-builder-eplugin Description : Package : web-ui-builder-eplugin -Version :0.1.423 +Version :0.1.425 OS : macos-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang -- 2.7.4