sdk/ide/web-ui-builder-eplugin.git
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 69/18869/1
nakyoung2.choi [Wed, 2 Apr 2014 08:21:19 +0000 (17:21 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  UIB : modify inner class scope
  DATABIND : bug Fix remove combo in Tree.
  ANIMATOR : Bug fix for predefined animation insertion Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted
  DATABIND : Remove unused fields.
  DATABIND : Change the Data Source Dialog Return Type.
  ANIMATOR : Bug fix for removed property value Put all property to map before edit properties
  ANIMATOR : Change keyframe add/edit policy Add only property that user put in and write tempolary computed properties to CSS
  PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes.
  DATABIND : Remove NPE.
  UIB: remove NPE

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorModelManager.java

Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Change-Id: Ic4e37e9510cfe82110a56e37c2539c7864ae9ecf

10 years agoMerge "ANIMATOR : Bug fix for predefined animation insertion Modify compare condition...
Changyeon Lee [Tue, 1 Apr 2014 09:25:20 +0000 (02:25 -0700)]
Merge "ANIMATOR : Bug fix for predefined animation insertion Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted" into develop

10 years agoMerge "DATABIND : bug Fix remove combo in Tree." into develop
Changyeon Lee [Tue, 1 Apr 2014 09:25:08 +0000 (02:25 -0700)]
Merge "DATABIND : bug Fix remove combo in Tree." into develop

10 years agoUIB : modify inner class scope 00/18800/1
gyeongmin.ju [Tue, 1 Apr 2014 09:24:30 +0000 (18:24 +0900)]
UIB : modify inner class scope

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ib8e03a37d3a132db9798fbf9e8e60779bfac62ad

10 years agoDATABIND : bug Fix remove combo in Tree. 92/18792/1
parary [Tue, 1 Apr 2014 08:31:25 +0000 (17:31 +0900)]
DATABIND : bug Fix remove combo in Tree.

Change-Id: Icdb3077e46455a8f403432bb10fa1ff5ae52ed8e
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoANIMATOR : Bug fix for predefined animation insertion 86/18786/1
seongwon.shim [Tue, 1 Apr 2014 07:37:32 +0000 (16:37 +0900)]
ANIMATOR : Bug fix for predefined animation insertion
Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted

Change-Id: I3cccf66e92f022ce8daa21c62af7d1af727835ba
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge "DATABIND : Remove unused fields." into develop
Changyeon Lee [Tue, 1 Apr 2014 04:26:52 +0000 (21:26 -0700)]
Merge "DATABIND : Remove unused fields." into develop

10 years agoMerge "DATABIND : Change the Data Source Dialog Return Type." into develop
Changyeon Lee [Tue, 1 Apr 2014 04:26:44 +0000 (21:26 -0700)]
Merge "DATABIND : Change the Data Source Dialog Return Type." into develop

10 years agoDATABIND : Remove unused fields. 76/18776/1
parary [Tue, 1 Apr 2014 03:43:55 +0000 (12:43 +0900)]
DATABIND : Remove unused fields.

Change-Id: Id60faef0e3b0419ab4d55c0ec1bf790fa489c9e9
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoDATABIND : Change the Data Source Dialog Return Type. 75/18775/1
parary [Tue, 1 Apr 2014 03:34:27 +0000 (12:34 +0900)]
DATABIND : Change the Data Source Dialog Return Type.

Change-Id: Ic5ccc22e7a286e680519d3dc186f7cc5681ee5d5
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoANIMATOR : Bug fix for removed property value 52/18752/1
seongwon.shim [Mon, 31 Mar 2014 09:13:04 +0000 (18:13 +0900)]
ANIMATOR : Bug fix for removed property value
Put all property to map before edit properties

Change-Id: Ibf113ed01744000103adfca629669f0a7c98d512
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 44/18744/1
yonghwan82.jeon [Mon, 31 Mar 2014 07:46:09 +0000 (16:46 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  ANIMATOR : Change keyframe add/edit policy Add only property that user put in and write tempolary computed properties to CSS
  PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes.
  DATABIND : Remove NPE.
  UIB: remove NPE

Change-Id: I4b004d125394b5dd496e22c52a8c92381f73e672
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoMerge "PROP : Refactoring code about properties. Advanced string/double compare code...
Changyeon Lee [Mon, 31 Mar 2014 07:13:59 +0000 (00:13 -0700)]
Merge "PROP : Refactoring code about properties. Advanced string/double compare code. Removes inner classes." into develop

10 years agoMerge "DATABIND : Remove NPE." into develop
Changyeon Lee [Mon, 31 Mar 2014 07:13:52 +0000 (00:13 -0700)]
Merge "DATABIND : Remove NPE." into develop

10 years agoANIMATOR : Change keyframe add/edit policy 40/18740/1
seongwon.shim [Mon, 31 Mar 2014 06:05:41 +0000 (15:05 +0900)]
ANIMATOR : Change keyframe add/edit policy
Add only property that user put in and write tempolary computed properties to CSS

Change-Id: I0afb49d630ed5d6926c005f21fdba61929d3c3eb
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoPROP : Refactoring code about properties. 37/18737/1
nakyoung2.choi [Mon, 31 Mar 2014 05:54:21 +0000 (14:54 +0900)]
PROP : Refactoring code about properties.
Advanced string/double compare code. Removes inner classes.

Change-Id: I10e0037dc40b7804ee6b2fe0c88c16a288554737
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoDATABIND : Remove NPE. 34/18734/1
parary [Mon, 31 Mar 2014 05:05:03 +0000 (14:05 +0900)]
DATABIND : Remove NPE.

Change-Id: I5caa59419bcf5f805cef282698bf551a10a5c712
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoUIB: remove NPE 10/18710/1
youngduk.hwang [Fri, 28 Mar 2014 10:14:35 +0000 (19:14 +0900)]
UIB: remove NPE

Change-Id: Iaf111d44f6e7b5a5b762419f91a9b0997e41dada
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 08/18708/1
jinwooim.bae [Fri, 28 Mar 2014 09:40:23 +0000 (18:40 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  DATABIND: syntax changes(switch -> if).
  DATABIND : Set expand & selection in the tree when it refreshed
  UIB : remove NPE
  ANIMATOR : Fixed bug timeline tree This bug is about timeline tree selection, tree expand, tree collapse.
  DATABIND: Refactoring SetSource dialog source. SetSourceDialog class rename to SetSourcePage in the org.tizen.webuibuilder.ui.views.databinding.dialog package. Split SetSourceDialog source code based on the setting panel to StaticSubPage, RemoteCallSubPage, RuntimeAPISubPage.
  ANIMATOR : Fixed Forward null This code do not check forward null.
  PROP : Fix null pointer exception. Fix null pointer exception.
  UIB : Remove possibe Error. Add defense  code for possible error by static analyzer.
  UIB : Fix null point exception on ThumbnailManager, HtmlMetaFileData, SnippetManager
  TEMPLATE : Modify CreateAction
  UIB : Add error handling check null dereference
  UIB : Add JUnit project for Unittest
  SNIPPET : Refactoring snippet
  SNIPPET : Remove old format snippets / templates
  UIB : Add error handling
  DATABIND : Remove resource leak
  UIB : Fix null point exception on CodeGenerator, PageDataSet

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java

Change-Id: I16d3f90c3d9d390672e866763a39fdcbbd73382e
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoMerge "DATABIND: syntax changes(switch -> if)." into develop
Changyeon Lee [Fri, 28 Mar 2014 08:25:23 +0000 (01:25 -0700)]
Merge "DATABIND: syntax changes(switch -> if)." into develop

10 years agoDATABIND: syntax changes(switch -> if). 99/18699/1
parary [Fri, 28 Mar 2014 08:22:17 +0000 (17:22 +0900)]
DATABIND: syntax changes(switch -> if).

Change-Id: I60d55dfa21cf67e2c864c5aecc3061caa1988d18
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoDATABIND : Set expand & selection in the tree when it refreshed 97/18697/1
jaeyeol lee [Fri, 28 Mar 2014 08:09:14 +0000 (17:09 +0900)]
DATABIND : Set expand & selection in the tree when it refreshed

Change-Id: Ie30abf46df9ce5e06eb8ac5f710216fcc897d7e0
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
10 years agoUIB : remove NPE 96/18696/1
gyeongmin.ju [Fri, 28 Mar 2014 07:58:32 +0000 (16:58 +0900)]
UIB : remove NPE

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Id8757b4c3d5e8b0bae3fd783dcca1ee09d81d6f8

10 years agoMerge "DATABIND: Refactoring SetSource dialog source. SetSourceDialog class rename...
Changyeon Lee [Fri, 28 Mar 2014 07:15:00 +0000 (00:15 -0700)]
Merge "DATABIND: Refactoring SetSource dialog source. SetSourceDialog class rename to SetSourcePage in the org.tizen.webuibuilder.ui.views.databinding.dialog package. Split SetSourceDialog source code based on the setting panel to StaticSubPage, RemoteCallSubPage, RuntimeAPISubPage." into develop

10 years agoANIMATOR : Fixed bug timeline tree 82/18682/1
jinwooim.bae [Fri, 28 Mar 2014 05:41:20 +0000 (14:41 +0900)]
ANIMATOR : Fixed bug timeline tree
This bug is about timeline tree selection, tree expand, tree collapse.

Change-Id: I6240fca399205feba82519cbcd94ce80f0084be8
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoDATABIND: Refactoring SetSource dialog source. 81/18681/2
parary [Fri, 28 Mar 2014 04:55:55 +0000 (13:55 +0900)]
DATABIND: Refactoring SetSource dialog source.
SetSourceDialog class rename to SetSourcePage in the
org.tizen.webuibuilder.ui.views.databinding.dialog package.
Split SetSourceDialog source code based on the setting panel to
StaticSubPage, RemoteCallSubPage, RuntimeAPISubPage.

Change-Id: If05e7f2cbf6ba43db89fedfeab54aafd35bc746a
Signed-off-by: parary <kyunghan80.park@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 71/18671/1
yonghwan82.jeon [Fri, 28 Mar 2014 01:09:28 +0000 (10:09 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  ANIMATOR : Fixed Forward null This code do not check forward null.
  PROP : Fix null pointer exception. Fix null pointer exception.
  UIB : Remove possibe Error. Add defense  code for possible error by static analyzer.
  UIB : Fix null point exception on ThumbnailManager, HtmlMetaFileData, SnippetManager
  TEMPLATE : Modify CreateAction
  UIB : Add error handling check null dereference
  UIB : Add JUnit project for Unittest
  SNIPPET : Refactoring snippet
  SNIPPET : Remove old format snippets / templates
  UIB : Add error handling
  DATABIND : Remove resource leak
  UIB : Fix null point exception on CodeGenerator, PageDataSet

Change-Id: I093ad7a0d961d54358a6e9192c010e58a8f8e6bd
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoMerge "PROP : Fix null pointer exception. Fix null pointer exception." into develop
Changyeon Lee [Thu, 27 Mar 2014 12:25:47 +0000 (05:25 -0700)]
Merge "PROP : Fix null pointer exception. Fix null pointer exception." into develop

10 years agoANIMATOR : Fixed Forward null 41/18641/1
jinwooim.bae [Thu, 27 Mar 2014 09:21:46 +0000 (18:21 +0900)]
ANIMATOR : Fixed Forward null
This code do not check forward null.

Change-Id: If9abc6f2bb05fc76dad1c26eccbb8808d4a1a473
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoPROP : Fix null pointer exception. 40/18640/1
nakyoung2.choi [Thu, 27 Mar 2014 09:15:15 +0000 (18:15 +0900)]
PROP : Fix null pointer exception.
Fix null pointer exception.

Change-Id: I398f7d69ff6305163c79d021286a69a7ca1ed05e
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoUIB : Remove possibe Error. 37/18637/1
yonghwan82.jeon [Thu, 27 Mar 2014 09:02:27 +0000 (18:02 +0900)]
UIB : Remove possibe Error.
Add defense  code for possible error by static analyzer.

Change-Id: Ib934f1df611cdf6d0d0f7a584d8bea8c84db948f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoUIB : Fix null point exception on ThumbnailManager, HtmlMetaFileData, SnippetManager 25/18625/1
gyeongmin.ju [Thu, 27 Mar 2014 08:13:41 +0000 (17:13 +0900)]
UIB : Fix null point exception on ThumbnailManager, HtmlMetaFileData, SnippetManager

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I43810bf0c8b3112f58100038f1cb8111b9415cc2

10 years agoTEMPLATE : Modify CreateAction 24/18624/1
jeonghwan kim [Thu, 27 Mar 2014 08:00:48 +0000 (17:00 +0900)]
TEMPLATE : Modify CreateAction

Change-Id: I68b4d20b5a6461bd827167658212171656d4bda6
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoUIB : Add error handling check null dereference 22/18622/1
jeonghwan kim [Thu, 27 Mar 2014 07:47:38 +0000 (16:47 +0900)]
UIB : Add error handling check null dereference

Change-Id: Idc4318a8ef6637e0c5db865aa74d346a2c9ef542
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoMerge "UIB : Update Version Update Version" into tizen
Changyeon Lee [Thu, 27 Mar 2014 07:29:48 +0000 (00:29 -0700)]
Merge "UIB : Update Version Update Version" into tizen

10 years agoUIB : Add JUnit project for Unittest 18/18618/1
jeonghwan kim [Thu, 27 Mar 2014 07:23:47 +0000 (16:23 +0900)]
UIB : Add JUnit project for Unittest

Change-Id: Ic5c8535ca25378b13295d2a071e04331e72bb630
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoUIB : Update Version 14/18614/2
jinwooim.bae [Thu, 27 Mar 2014 07:16:34 +0000 (16:16 +0900)]
UIB : Update Version
Update Version

Change-Id: Ic3af8beadc25030de9fe95adc4c8cffe7f70e40d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoSNIPPET : Refactoring snippet 16/18616/1
jeonghwan kim [Thu, 27 Mar 2014 07:22:53 +0000 (16:22 +0900)]
SNIPPET : Refactoring snippet

Change-Id: I287d1fe1f7bf16b00d68a5d487c0282376704af6
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoSNIPPET : Remove old format snippets / templates 15/18615/1
jeonghwan kim [Thu, 27 Mar 2014 07:20:10 +0000 (16:20 +0900)]
SNIPPET : Remove old format snippets / templates

Change-Id: I5eb79861f1b16bdc91fccdb0a47f8e40780b8345
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 10/18610/1
jinwooim.bae [Thu, 27 Mar 2014 07:03:56 +0000 (16:03 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  UIB : Add error handling
  DATABIND : Remove resource leak
  UIB : Fix null point exception on CodeGenerator, PageDataSet

Change-Id: Ia18f5bdf1e2cabb1dd144afea1115455ec6ab06d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoUIB : Add error handling 05/18605/1
jeonghwan kim [Thu, 27 Mar 2014 06:12:11 +0000 (15:12 +0900)]
UIB : Add error handling

Change-Id: I016f26f5b129e7fbeb90ec7bd9938fcbfd191e3d
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoDATABIND : Remove resource leak 97/18597/1
jaeyeol lee [Thu, 27 Mar 2014 04:53:38 +0000 (13:53 +0900)]
DATABIND : Remove resource leak

Change-Id: I715292a32dbf5dd5158fa920472355e4f6b3f2a3
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
10 years agoUIB : Fix null point exception on CodeGenerator, PageDataSet 74/18574/1
gyeongmin.ju [Wed, 26 Mar 2014 09:45:36 +0000 (18:45 +0900)]
UIB : Fix null point exception on CodeGenerator, PageDataSet

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ic86acd6e853e497ed1208f9d85b60b06f342d082

10 years agoMerge remote-tracking branch 'origin/develop' into tizen 72/18572/1
yonghwan82.jeon [Wed, 26 Mar 2014 08:54:01 +0000 (17:54 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROP : Refactoring CssSelectorCategory.
  DATABIND : Change the remove UX remove the X button add the del key input
  SNIPPET : Refactoring id policy
  PROP : Fix dispose exception on CssStyleTab.
  NSCREEN : Remove possible Error. Add defense code for possible error by static analyzer
  PROP : Fix exception on CssSelectorCategory.
  UIB : code refactoring for PREVENT

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java

Change-Id: I907aafa2018d0c11de30916a26b6bd9707d32663
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoMerge "PROP : Refactoring CssSelectorCategory." into develop
Changyeon Lee [Wed, 26 Mar 2014 08:20:51 +0000 (01:20 -0700)]
Merge "PROP : Refactoring CssSelectorCategory." into develop

10 years agoPROP : Refactoring CssSelectorCategory. 70/18570/1
nakyoung2.choi [Wed, 26 Mar 2014 07:53:35 +0000 (16:53 +0900)]
PROP : Refactoring CssSelectorCategory.

Refactoring CssSelectorCategory.

Change-Id: I6e5ea8db76076168ad3819249a60304822e7541c
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoDATABIND : Change the remove UX 59/18559/1
jaeyeol lee [Wed, 26 Mar 2014 06:10:52 +0000 (15:10 +0900)]
DATABIND : Change the remove UX
remove the X button
add the del key input

Change-Id: I104a3cfa98b145ab936fa658bde3e9457d87e843
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
10 years agoMerge "SNIPPET : Refactoring id policy" into develop
Changyeon Lee [Tue, 25 Mar 2014 10:23:43 +0000 (03:23 -0700)]
Merge "SNIPPET : Refactoring id policy" into develop

10 years agoMerge "PROP : Fix dispose exception on CssStyleTab." into develop
Changyeon Lee [Tue, 25 Mar 2014 10:23:22 +0000 (03:23 -0700)]
Merge "PROP : Fix dispose exception on CssStyleTab." into develop

10 years agoMerge "NSCREEN : Remove possible Error. Add defense code for possible error by static...
Changyeon Lee [Tue, 25 Mar 2014 09:11:07 +0000 (02:11 -0700)]
Merge "NSCREEN : Remove possible Error. Add defense code for possible error by static analyzer" into develop

10 years agoSNIPPET : Refactoring id policy 24/18524/1
jeonghwan kim [Tue, 25 Mar 2014 09:09:39 +0000 (18:09 +0900)]
SNIPPET : Refactoring id policy

Change-Id: I108bd86c570995ae28f5d6279f9c881966502948
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoPROP : Fix dispose exception on CssStyleTab. 21/18521/1
nakyoung2.choi [Tue, 25 Mar 2014 08:41:05 +0000 (17:41 +0900)]
PROP : Fix dispose exception on CssStyleTab.

When change mode to Animator from Design, had occurred dispose exception. Fixed.

Change-Id: I36e55d9f6fe4e7e640c73168874d848435154a1f
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoMerge "PROP : Fix exception on CssSelectorCategory." into develop
Changyeon Lee [Tue, 25 Mar 2014 06:47:11 +0000 (23:47 -0700)]
Merge "PROP : Fix exception on CssSelectorCategory." into develop

10 years agoNSCREEN : Remove possible Error. 18/18518/1
yonghwan82.jeon [Tue, 25 Mar 2014 06:44:50 +0000 (15:44 +0900)]
NSCREEN : Remove possible Error.
Add defense code for possible error by static analyzer

Change-Id: Ia6cc665da699ed849f5c86efda8cb66b5832b325
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoPROP : Fix exception on CssSelectorCategory. 17/18517/1
nakyoung2.choi [Tue, 25 Mar 2014 06:44:00 +0000 (15:44 +0900)]
PROP : Fix exception on CssSelectorCategory.

Fix exception on CssSelectorCategory.

Change-Id: I22887264f4de10c199d9d13d4901fa32504559d1
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoUIB : code refactoring for PREVENT 16/18516/1
gyeongmin.ju [Tue, 25 Mar 2014 06:37:03 +0000 (15:37 +0900)]
UIB : code refactoring for PREVENT

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ibbda6505669aad4ea7e5ab2a60a2dc71caf4ebe3

10 years agoMerge remote-tracking branch 'origin/develop' into tizen 73/18373/1
yonghwan82.jeon [Fri, 21 Mar 2014 09:45:49 +0000 (18:45 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop: (21 commits)
  UIB : Fixed null pointer dereferences
  ANIMATOR : Fixed null pointer dereferences This code is null pointer dereferences. so it is Fixed.
  UIB : throw Illegal ArgumentException -> Using Assert & Initialize class member
  UIB : Remove possible error. Add defense code for possible error by static analyzer.
  UIB : Modifying for static analyzer
  UIB : Removes null pointer exceptions. Removes null pointer exceptions.
  ANIMATOR : Remove possible error Add defense code for possible error by static analyzer
  UIB : Modifying for static analyzer
  DATABIND : refactoring databinding view Undo/redo is available in the DataSource panel Modify the save policy
  UIB : Modify violation for Prevent.
  NSCREEN : Fixed bug. Fixed BUG. When the editor is first opended, Nscreen does not display in Nscreen view. Now it  does diplay in Nscreen view.
  UIB : Modify violation. Modify violation of null point.
  ANIMATOR : Remove null point exception The Animator code has null point eception bug code. so It is removed.
  ANIMATOR : Fix prevents Fix prevents in animator related source(On going) -31985, 31984, 31981, 31982, 30420, 30421, 30422, 31962, 31999
  PROJTEMP: delete sample files a. delete the sample files (addressBook.json, addressBooks.json, defaultAddressBook.json, unifiedAddressBook.json) b. because the plan was changed.
  ANIMATOR : Replace Keyframe add logic Replace property copy logic when add Keyframe to writing related neighborhood keyfram's css property when build css
  DATABIND: add the sample for the dataSourceContact a. the sample for using tizen calendar APIs b. calendars
  PROP : Add CSS Selector category.
  DESIGNER: CSS Selector UX update Make DOM element tree and class list
  UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck null return.
  ...

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/SetDataSourceCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizards/NewPageWizardFirstPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/IDEUtil.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ImageUtils.java

Change-Id: Iaed7413f659e029032e591075b4f090552e225b7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoUIB : Fixed null pointer dereferences 62/18362/1
jaeyeol lee [Fri, 21 Mar 2014 07:35:28 +0000 (16:35 +0900)]
UIB : Fixed null pointer dereferences

Change-Id: Ib68b9cf6b5439d86c6055384e8155472f9f7fd41
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
10 years agoMerge "ANIMATOR : Fixed null pointer dereferences This code is null pointer dereferen...
Changyeon Lee [Fri, 21 Mar 2014 07:26:05 +0000 (00:26 -0700)]
Merge "ANIMATOR : Fixed null pointer dereferences This code is null pointer dereferences. so it is Fixed." into develop

10 years agoMerge "UIB : throw Illegal ArgumentException -> Using Assert & Initialize class membe...
Changyeon Lee [Fri, 21 Mar 2014 07:25:55 +0000 (00:25 -0700)]
Merge "UIB : throw Illegal ArgumentException -> Using Assert & Initialize class member" into develop

10 years agoANIMATOR : Fixed null pointer dereferences 50/18350/1
jinwooim.bae [Fri, 21 Mar 2014 03:13:30 +0000 (12:13 +0900)]
ANIMATOR : Fixed null pointer dereferences
This code is null pointer dereferences. so it is Fixed.

Change-Id: I5638026be3e9a64d4d7d1cec1449a653d22d928e
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoUIB : throw Illegal ArgumentException -> Using Assert 48/18348/1
jeonghwan kim [Fri, 21 Mar 2014 01:54:57 +0000 (10:54 +0900)]
UIB : throw Illegal ArgumentException -> Using Assert
& Initialize class member

Change-Id: I2dae9b8d78ae5789ce449c5d0c2889ee9fbcad0e
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoUIB : Remove possible error. 47/18347/1
yonghwan82.jeon [Fri, 21 Mar 2014 01:36:03 +0000 (10:36 +0900)]
UIB : Remove possible error.
Add defense code for possible error by static analyzer.

Change-Id: I25a10e973ead7c7e892882397d51ec208580ac46
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoUIB : Modifying for static analyzer 02/18302/1
jeonghwan kim [Thu, 20 Mar 2014 09:09:06 +0000 (18:09 +0900)]
UIB : Modifying for static analyzer

Change-Id: I9eacd0734151369c624ec353fd333e75bee35ed7
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoMerge "UIB : Removes null pointer exceptions. Removes null pointer exceptions." into...
Changyeon Lee [Wed, 19 Mar 2014 08:24:54 +0000 (01:24 -0700)]
Merge "UIB : Removes null pointer exceptions. Removes null pointer exceptions." into develop

10 years agoMerge "ANIMATOR : Remove possible error Add defense code for possible error by static...
Changyeon Lee [Wed, 19 Mar 2014 08:24:31 +0000 (01:24 -0700)]
Merge "ANIMATOR : Remove possible error Add defense code for possible error by static analyzer" into develop

10 years agoUIB : Removes null pointer exceptions. 40/18240/1
nakyoung2.choi [Wed, 19 Mar 2014 07:44:45 +0000 (16:44 +0900)]
UIB : Removes null pointer exceptions.
Removes null pointer exceptions.

Change-Id: I39f2b5173f7e77a4fe1c42ca45b8158bfeb072e4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 39/18239/1
jinwooim.bae [Wed, 19 Mar 2014 07:34:47 +0000 (16:34 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  UIB : Modifying for static analyzer
  DATABIND : refactoring databinding view Undo/redo is available in the DataSource panel Modify the save policy
  UIB : Modify violation for Prevent.
  NSCREEN : Fixed bug. Fixed BUG. When the editor is first opended, Nscreen does not display in Nscreen view. Now it  does diplay in Nscreen view.
  UIB : Modify violation. Modify violation of null point.
  ANIMATOR : Remove null point exception The Animator code has null point eception bug code. so It is removed.
  ANIMATOR : Fix prevents Fix prevents in animator related source(On going) -31985, 31984, 31981, 31982, 30420, 30421, 30422, 31962, 31999
  PROJTEMP: delete sample files a. delete the sample files (addressBook.json, addressBooks.json, defaultAddressBook.json, unifiedAddressBook.json) b. because the plan was changed.
  ANIMATOR : Replace Keyframe add logic Replace property copy logic when add Keyframe to writing related neighborhood keyfram's css property when build css
  DATABIND: add the sample for the dataSourceContact a. the sample for using tizen calendar APIs b. calendars
  PROP : Add CSS Selector category.
  DESIGNER: CSS Selector UX update Make DOM element tree and class list
  UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck null return.
  UIB : remove unnecessary code

Change-Id: I85d33aa84ffab7b077fa9b7dcd7c88683844c98a
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoANIMATOR : Remove possible error 36/18236/1
seongwon.shim [Wed, 19 Mar 2014 07:04:40 +0000 (16:04 +0900)]
ANIMATOR : Remove possible error
Add defense code for possible error by static analyzer

Change-Id: I5bec8e85d6ae3292b3f3154e24ce70d2eb2f52f9
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge "UIB : Modifying for static analyzer" into develop
Changyeon Lee [Wed, 19 Mar 2014 06:55:20 +0000 (23:55 -0700)]
Merge "UIB : Modifying for static analyzer" into develop

10 years agoMerge "PROJTEMP: delete sample files a. delete the sample files (addressBook.json...
Changyeon Lee [Wed, 19 Mar 2014 06:48:43 +0000 (23:48 -0700)]
Merge "PROJTEMP: delete sample files a. delete the sample files (addressBook.json, addressBooks.json, defaultAddressBook.json, unifiedAddressBook.json) b. because the plan was changed." into develop

10 years agoUIB : Modifying for static analyzer 34/18234/1
jeonghwan kim [Wed, 19 Mar 2014 06:48:21 +0000 (15:48 +0900)]
UIB : Modifying for static analyzer

Change-Id: I1abf143d8b903fb7a1ef34f718164a64d7aa99fd
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
10 years agoDATABIND : refactoring databinding view 31/18231/2
jaeyeol lee [Wed, 19 Mar 2014 06:28:40 +0000 (15:28 +0900)]
DATABIND : refactoring databinding view
Undo/redo is available in the DataSource panel
Modify the save policy

Change-Id: If105a9c8d8209210bb0e86f1a57bd347266f5681
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
10 years agoUIB : Modify violation for Prevent. 24/18224/1
gyeongmin.ju [Wed, 19 Mar 2014 02:51:08 +0000 (11:51 +0900)]
UIB : Modify violation for Prevent.

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ia953d50c5b519acadea390859bccfd805c44eb80

10 years agoMerge "NSCREEN : Fixed bug. Fixed BUG. When the editor is first opended, Nscreen...
Changyeon Lee [Wed, 19 Mar 2014 02:23:53 +0000 (19:23 -0700)]
Merge "NSCREEN : Fixed bug. Fixed BUG. When the editor is first opended, Nscreen does not display in Nscreen view. Now it  does diplay in Nscreen view." into develop

10 years agoMerge "ANIMATOR : Remove null point exception The Animator code has null point ecepti...
Changyeon Lee [Wed, 19 Mar 2014 02:23:03 +0000 (19:23 -0700)]
Merge "ANIMATOR : Remove null point exception The Animator code has null point eception bug code. so It is removed." into develop

10 years agoMerge "ANIMATOR : Fix prevents Fix prevents in animator related source(On going)...
Changyeon Lee [Wed, 19 Mar 2014 01:42:26 +0000 (18:42 -0700)]
Merge "ANIMATOR : Fix prevents Fix prevents in animator related source(On going) -31985, 31984, 31981, 31982, 30420, 30421, 30422, 31962, 31999" into develop

10 years agoMerge "ANIMATOR : Replace Keyframe add logic Replace property copy logic when add...
Changyeon Lee [Wed, 19 Mar 2014 01:42:05 +0000 (18:42 -0700)]
Merge "ANIMATOR : Replace Keyframe add logic Replace property copy logic when add Keyframe to writing related neighborhood keyfram's css property when build css" into develop

10 years agoNSCREEN : Fixed bug. 23/18223/1
yonghwan82.jeon [Wed, 19 Mar 2014 01:31:55 +0000 (10:31 +0900)]
NSCREEN : Fixed bug.
Fixed BUG. When the editor is first opended, Nscreen does not display in Nscreen view.
Now it  does diplay in Nscreen view.

Change-Id: I3c8303b43f6827fd96a474210cbee12d6507e1df
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoUIB : Modify violation. 99/18199/5
yonghwan82.jeon [Tue, 18 Mar 2014 07:42:02 +0000 (16:42 +0900)]
UIB : Modify violation.
Modify violation of null point.

Change-Id: Ib25193b13c8bb57b5c7bfbed438dd424aaf65aee
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
10 years agoANIMATOR : Remove null point exception 11/18211/1
jinwooim.bae [Tue, 18 Mar 2014 11:20:30 +0000 (20:20 +0900)]
ANIMATOR : Remove null point exception
The Animator code has null point eception bug code. so It is removed.

Change-Id: I5c751c316d7a7bba5d872244af555c558e1b461b
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoANIMATOR : Fix prevents 10/18210/1
seongwon.shim [Tue, 18 Mar 2014 09:55:40 +0000 (18:55 +0900)]
ANIMATOR : Fix prevents
Fix prevents in animator related source(On going) -31985, 31984, 31981, 31982, 30420, 30421, 30422, 31962, 31999

Change-Id: I7cc270e3c407fd592d31149d4024799bd491a733
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoPROJTEMP: delete sample files 00/18200/1
Heekyoung, Oh [Tue, 18 Mar 2014 07:53:06 +0000 (16:53 +0900)]
PROJTEMP: delete sample files
a. delete the sample files (addressBook.json, addressBooks.json, defaultAddressBook.json, unifiedAddressBook.json)
b. because the plan was changed.

Change-Id: Ib3aada572127fad399095feff26de207c4eb19a6
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
10 years agoANIMATOR : Replace Keyframe add logic 98/18198/1
seongwon.shim [Tue, 18 Mar 2014 07:24:57 +0000 (16:24 +0900)]
ANIMATOR : Replace Keyframe add logic
Replace property copy logic when add Keyframe to writing related neighborhood keyfram's css property when build css

Change-Id: Idbe6a392fea90aa818c9d13cb56a1398d91149af
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 97/18197/1
jinwooim.bae [Tue, 18 Mar 2014 07:15:20 +0000 (16:15 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  DATABIND: add the sample for the dataSourceContact a. the sample for using tizen calendar APIs b. calendars
  PROP : Add CSS Selector category.
  DESIGNER: CSS Selector UX update Make DOM element tree and class list
  UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck null return.
  UIB : remove unnecessary code

Change-Id: I2170b351bfc4fb30ebb74f9fd93886d49f1f9419
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
10 years agoDATABIND: add the sample for the dataSourceContact 98/18098/1
Heekyoung, Oh [Mon, 17 Mar 2014 10:49:29 +0000 (19:49 +0900)]
DATABIND: add the sample for the dataSourceContact
a. the sample for using tizen calendar APIs
b. calendars

Change-Id: I16adcb3d6a469a1fc03a4bfe9342b02bfa518cf9
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
10 years agoMerge remote-tracking branch 'origin/develop' into tizen 89/18089/1
YongHwan [Mon, 17 Mar 2014 08:16:36 +0000 (17:16 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROP : Add CSS Selector category.
  DESIGNER: CSS Selector UX update Make DOM element tree and class list
  UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck null return.
  UIB : remove unnecessary code

Change-Id: I7bb406fa743e417e974cdf92dbae9d83f5e00886
Signed-off-by: YongHwan <yonghwan82.jeon@samsung.com>
10 years agoPROP : Add CSS Selector category. 29/18029/1
mucikan [Fri, 14 Mar 2014 08:23:34 +0000 (17:23 +0900)]
PROP : Add CSS Selector category.

Add CSS Selector category. Advanced css reader.

Change-Id: I7ca64097cba1bacb3e7f7ba69bdfe218ffaa7b1d
Signed-off-by: mucikan <nakyoung2.choi@samsung.com>
10 years agoMerge "DESIGNER: CSS Selector UX update Make DOM element tree and class list" into...
Changyeon Lee [Fri, 14 Mar 2014 05:08:39 +0000 (22:08 -0700)]
Merge "DESIGNER: CSS Selector UX update Make DOM element tree and class list" into develop

10 years agoMerge "UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck...
Changyeon Lee [Fri, 14 Mar 2014 05:08:10 +0000 (22:08 -0700)]
Merge "UIB : Modify violation for Prevent. Modify violation for Prevent : iCheck null return." into develop

10 years agoDESIGNER: CSS Selector UX update 16/18016/1
jooyoul_lee [Fri, 14 Mar 2014 05:01:59 +0000 (14:01 +0900)]
DESIGNER: CSS Selector UX update
Make DOM element tree and class list

Change-Id: I8f1216b84338b5164e5a03f91307d168169416ed
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
10 years agoUIB : Modify violation for Prevent. 10/18010/2
YongHwan [Fri, 14 Mar 2014 02:20:55 +0000 (11:20 +0900)]
UIB : Modify violation for Prevent.
Modify violation for Prevent : iCheck null return.

Change-Id: I84eaa9809c20f7541523bbbefd580f072a088eb4
Signed-off-by: YongHwan <yonghwan82.jeon@samsung.com>
10 years agoUIB : remove unnecessary code 76/17976/1
gyeongmin.ju [Thu, 13 Mar 2014 11:06:26 +0000 (20:06 +0900)]
UIB : remove unnecessary code

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I6e690b71f5d673797d8e1963a668cb0d0be04fa5

10 years agoUIB : Modify changelog 66/17966/1
seongwon.shim [Thu, 13 Mar 2014 08:26:10 +0000 (17:26 +0900)]
UIB : Modify changelog

Change-Id: I915db0ae09173b306c4920a3a76d2df1baed2c6d
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoUIB update version 65/17965/1
seongwon.shim [Thu, 13 Mar 2014 08:14:21 +0000 (17:14 +0900)]
UIB update version
update version

Change-Id: I8e6bb0dfeafece1ae1f103c61eeb7aa677383c85
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/tizen' into develop 63/17963/1
seongwon.shim [Thu, 13 Mar 2014 07:33:41 +0000 (16:33 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop

* origin/tizen:
  UIB : Prevent the default editor for html files. prevent the default editor for html files.
  UIB : modify feature.xml Becaue Pakcage build fail, I modify feature.xml
  Merge remote-tracking branch 'origin/develop' into tizen
  UIB : Update version update version.
  UIB : fixed bug "Page Designer for index.html" unset default editor.
  UIB : Update version
  UIB : Merge develop

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/HTMLBlockPropertyModifier.java

Change-Id: I39b2125e6f3662d4dac49c3c5f7a865ce3ce7242
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
10 years agoMerge "NSCREEN : change view name. Remove the suffix(~View)." into develop
Changyeon Lee [Wed, 12 Mar 2014 08:00:03 +0000 (01:00 -0700)]
Merge "NSCREEN : change view name. Remove the suffix(~View)." into develop

10 years agoUIB : merge FileReader to TizenFileFormatter 97/17897/1
gyeongmin.ju [Wed, 12 Mar 2014 07:58:53 +0000 (16:58 +0900)]
UIB : merge FileReader to TizenFileFormatter

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I08407953b51f652a5ae45ae3a14a4ebaee62852d

10 years agoNSCREEN : change view name. 94/17894/1
YongHwan [Wed, 12 Mar 2014 06:13:15 +0000 (15:13 +0900)]
NSCREEN : change view name.
Remove the suffix(~View).

Change-Id: I881b52c434db319b3d5702829050079ddc3eaed2
Signed-off-by: YongHwan <yonghwan82.jeon@samsung.com>
10 years agoANIMATOR : Implements AnimatorPredefinedAnimationFactory and AnimatorModelFactory 75/17875/1
seongwon.shim [Wed, 12 Mar 2014 02:17:20 +0000 (11:17 +0900)]
ANIMATOR : Implements AnimatorPredefinedAnimationFactory and AnimatorModelFactory
AnimatorPredefinedAnimationFactory is class that create predefined animation keyframes and AnimatorModelFactory is factory class for animator related class

Change-Id: Iaf2da55aaf483ea52a22ce68d474fab83e1b0a13
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>