From 5003dd77da0d2f8b8c27d3de997cf27d045538bd Mon Sep 17 00:00:00 2001 From: "yonghwan82.jeon" Date: Thu, 29 May 2014 23:34:14 +0900 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into mw * origin/develop: ANIMATOR : Modify FileWrite Modified FileWrite after using the animator trigger action. NSCREEN : remove orientation button, etc. 1. fix default device of mobile 2. fix default device of common feature 3. hide orientation button PAGETEMP: Changed from 'Name' to 'ID' in New Page Template wizard NSCREEN: modify device list and screen feature list. Change-Id: Ie1e00fc75f2d1c8da55a0371e23e2977101cc539 Signed-off-by: yonghwan82.jeon --- .../webuibuilder/animator/model/io/AnimatorFileWriter.java | 6 +++--- .../org/tizen/webuibuilder/model/app/AppManagerForAppXML.java | 2 +- package/changelog | 3 +++ package/pkginfo.manifest | 10 +++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/io/AnimatorFileWriter.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/io/AnimatorFileWriter.java index 5cd95dc..05397e1 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/io/AnimatorFileWriter.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/io/AnimatorFileWriter.java @@ -254,7 +254,7 @@ public class AnimatorFileWriter { public static void writeCssFileModel(AppManager appManager, Part rootPart) { FileWriter fw = null; try { - String animationCssString = getAnimatorKeyFrameString(rootPart); + String animationCssString = getAnimatorKeyFrameString(appManager, rootPart); String modelCssFilePath = AnimatorUtils.getFilePath(appManager.getProjectManager().getProject(), @@ -290,13 +290,13 @@ public class AnimatorFileWriter { * @param rootPart * @return */ - public static String getAnimatorKeyFrameString(Part rootPart) { + public static String getAnimatorKeyFrameString(AppManager appManager, Part rootPart) { if(rootPart == null) { return null; } try { - AnimatorModelManager manager = AnimatorUtils.getAppManager().getAnimatorModelManager(); + AnimatorModelManager manager = appManager.getAnimatorModelManager(); StringBuffer animationCssString = new StringBuffer(new String("".getBytes(), "utf-8"));// ask // why? for (Part part : rootPart.getChildren()) { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForAppXML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForAppXML.java index 58e1865..1724c58 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForAppXML.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForAppXML.java @@ -276,7 +276,7 @@ public class AppManagerForAppXML extends AppManager { html = html.replace("%animator%", animator_script); Part aniRootPart = getPageDataSet().getBaseRootPart(); - String animatorCss = AnimatorFileWriter.getAnimatorKeyFrameString(aniRootPart); + String animatorCss = AnimatorFileWriter.getAnimatorKeyFrameString(this, aniRootPart); if(animatorCss != null){ html = html.replace("%animatorCss%", animatorCss); } diff --git a/package/changelog b/package/changelog index 82bfd2b..cab3da2 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 0.1.445 +- [Title] update version. +== yonghwan.jeon 2014-05-29 * 0.1.444 - [Title] update version. == yonghwan.jeon 2014-05-29 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 69f2986..bb84049 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package : web-ui-builder-eplugin -Version :0.1.444 +Version :0.1.445 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.444 +Version :0.1.445 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.444 +Version :0.1.445 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.444 +Version :0.1.445 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.444 +Version :0.1.445 OS : macos-64 Build-host-os : ubuntu-64 Maintainer : Hoon Kang -- 2.7.4