parary [Fri, 11 Apr 2014 05:09:12 +0000 (14:09 +0900)]
DATABIND : change the check logic when add privilege.
Change-Id: I1e453cab18a25087f66f02cfd5ad4e4b23ef0073
Signed-off-by: parary <kyunghan80.park@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 09:07:51 +0000 (18:07 +0900)]
UIB : Merge tizen branch.
Change-Id: Ia0620f261ab230defa594747ed5a62892f5afa27
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:26:11 +0000 (17:26 +0900)]
UIB : version update.
Change-Id: I70e560c4c5ece9222fcf812688a5ca8a7640074d
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Thu, 10 Apr 2014 08:13:00 +0000 (17:13 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
UIB : Refactoring actions
DATABIND : Change the CompilationUnitEditor init method parameter.
PROP: fixed NPE
ANIMATOR : Implements Predefined Animation createion logic AnimatorFrame only has relative value for own's property and then computed property inserted when I/O occured for Predefined Animation
DATABIND : bufix - selection error - select widget after execute 'set data source' dialog.
DATABIND : Make the toolbar in the binding info panel
DATABIND : Add Privilege in config.xml when data sources[calendar, contact,call history] was defined.
UIB : code refactoring
SNIPPET : Refactoring snippet and template
DATABIND : modify the code generation for the meta file The data source can be saved in the metafile
DATABIND : Change and Add Source Type in Set Data Source Dialog. Change - Runtime API -> Contact. Add - Call History. Add - Calendar. Add - File System.
DATABIND: add sample file (callhistory.json) a. add sample file
DATABIND : Modified incorrect information in the binding info panel
PROP : Add reset styles.
DATABIND : Bug fix[ContactSubPage.loadData].
DATABIND : Changes UI Set Data Source Contact Dialog.
ANIMATOR : Keyframe add/edit command refactoring Implements logic that keyframe name modification for undo/redo. Integrate keyframe manipulation command from properties view.
DATABIND : Bug fixed in the databinding view Bug fixed that can not load
UIB : Removing warning message in feature.xml
UIB : remove NPE
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
Change-Id: I6138d0b12fffdc9408ad55c69648109722d0d1e4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jeonghwan kim [Thu, 10 Apr 2014 03:29:43 +0000 (12:29 +0900)]
UIB : Refactoring actions
Change-Id: I038966f755bc87a19e7e7b67357caca7a6345937
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
parary [Thu, 10 Apr 2014 02:02:05 +0000 (11:02 +0900)]
DATABIND : Change the CompilationUnitEditor init method parameter.
Change-Id: I0290cd7485529222f735ed6b854929cbd94f5037
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Wed, 9 Apr 2014 09:24:36 +0000 (02:24 -0700)]
Merge "PROP: fixed NPE" into develop
gyeongmin.ju [Wed, 9 Apr 2014 09:05:51 +0000 (18:05 +0900)]
PROP: fixed NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I48677b4bb93cb02b99db93e78a668565f314c740
seongwon.shim [Wed, 9 Apr 2014 05:31:06 +0000 (14:31 +0900)]
ANIMATOR : Implements Predefined Animation createion logic
AnimatorFrame only has relative value for own's property and then computed property inserted when I/O occured for Predefined Animation
Change-Id: Ibde29c1ae9169bd5652f20616b4c0df0118bb95a
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
parary [Wed, 9 Apr 2014 04:25:21 +0000 (13:25 +0900)]
DATABIND : bufix
- selection error - select widget after execute 'set data source'
dialog.
Change-Id: Ie94f311002702cb42e343dc24bdfb53ca7c5da22
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Wed, 9 Apr 2014 01:53:29 +0000 (18:53 -0700)]
Merge "DATABIND : Make the toolbar in the binding info panel" into develop
jaeyeol lee [Tue, 8 Apr 2014 07:53:38 +0000 (16:53 +0900)]
DATABIND : Make the toolbar in the binding info panel
Change-Id: Ieca48f0e1794f6af6673000483710dde3ae881db
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
parary [Tue, 8 Apr 2014 01:38:29 +0000 (10:38 +0900)]
DATABIND : Add Privilege in config.xml when data sources[calendar, contact,call history] was defined.
Change-Id: I068295aff659e6960629b822d9c1010ff3a810f9
Signed-off-by: parary <kyunghan80.park@samsung.com>
gyeongmin.ju [Mon, 7 Apr 2014 10:47:20 +0000 (19:47 +0900)]
UIB : code refactoring
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I220ff3fa647135b4f2ff1af8d861d4eb650d9805
Changyeon Lee [Mon, 7 Apr 2014 10:18:00 +0000 (03:18 -0700)]
Merge "SNIPPET : Refactoring snippet and template" into develop
jeonghwan kim [Mon, 7 Apr 2014 10:11:44 +0000 (19:11 +0900)]
SNIPPET : Refactoring snippet and template
Change-Id: I148e444b57dc6646c92ed5550814a6d8c447d9b8
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
jaeyeol lee [Mon, 7 Apr 2014 05:50:16 +0000 (14:50 +0900)]
DATABIND : modify the code generation for the meta file
The data source can be saved in the metafile
Change-Id: Ia1ef236e9f6c7aa7b3f8575ae556240461159a4d
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
parary [Fri, 4 Apr 2014 08:17:49 +0000 (17:17 +0900)]
DATABIND : Change and Add Source Type in Set Data Source Dialog.
Change - Runtime API -> Contact.
Add - Call History.
Add - Calendar.
Add - File System.
Change-Id: Iacaaa038741a145a3c7623b834a4a6bf1f456082
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Fri, 4 Apr 2014 07:57:25 +0000 (00:57 -0700)]
Merge "DATABIND: add sample file (callhistory.json) a. add sample file" into develop
Changyeon Lee [Fri, 4 Apr 2014 07:57:12 +0000 (00:57 -0700)]
Merge "PROP : Add reset styles." into develop
Heekyoung, Oh [Fri, 4 Apr 2014 07:49:57 +0000 (16:49 +0900)]
DATABIND: add sample file (callhistory.json)
a. add sample file
Change-Id: Ib6a789956beb9442713e9715cb13140a3abbc7cc
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
jaeyeol lee [Fri, 4 Apr 2014 07:12:26 +0000 (16:12 +0900)]
DATABIND : Modified incorrect information in the binding info panel
Change-Id: Ibcce73da03ca638cd83fd6eb98b76e27f2251ffd
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Fri, 4 Apr 2014 05:17:06 +0000 (14:17 +0900)]
PROP : Add reset styles.
Reset feature on StyleTab. When the reset button is clicked, all removed styles of current css selector.
Change-Id: I866bddeb73faf93b9bdc827e5c088d81633493db
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
parary [Thu, 3 Apr 2014 07:39:51 +0000 (16:39 +0900)]
DATABIND : Bug fix[ContactSubPage.loadData].
Change-Id: I9eb02605b23c4f78acf0342e8eb1c4d80e7c2b22
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Thu, 3 Apr 2014 07:31:04 +0000 (00:31 -0700)]
Merge "DATABIND : Bug fixed in the databinding view Bug fixed that can not load" into develop
Changyeon Lee [Thu, 3 Apr 2014 07:30:50 +0000 (00:30 -0700)]
Merge "DATABIND : Changes UI Set Data Source Contact Dialog." into develop
Changyeon Lee [Thu, 3 Apr 2014 07:30:18 +0000 (00:30 -0700)]
Merge "ANIMATOR : Keyframe add/edit command refactoring Implements logic that keyframe name modification for undo/redo. Integrate keyframe manipulation command from properties view." into develop
parary [Thu, 3 Apr 2014 07:09:05 +0000 (16:09 +0900)]
DATABIND : Changes UI Set Data Source Contact Dialog.
Change-Id: I68daf150f1fcbfe4bf35bb6d79fc03cf21344543
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Thu, 3 Apr 2014 07:03:18 +0000 (16:03 +0900)]
ANIMATOR : Keyframe add/edit command refactoring
Implements logic that keyframe name modification for undo/redo.
Integrate keyframe manipulation command from properties view.
Change-Id: I7f5dc709612e85a2e02e87fc16080c0a7bb71402
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Thu, 3 Apr 2014 06:11:38 +0000 (23:11 -0700)]
Merge "UIB : Removing warning message in feature.xml" into develop
nakyoung2.choi [Thu, 3 Apr 2014 06:10:14 +0000 (15:10 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
UIB : remove NPE
Change-Id: Icd66bdc2a68a6154d29ee85ee43218bc4fa1bdf9
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Thu, 3 Apr 2014 06:07:34 +0000 (15:07 +0900)]
DATABIND : Bug fixed in the databinding view
Bug fixed that can not load
Change-Id: I41cb1318e1ebaf12a0fd12c89b00e0b98e72777a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jeonghwan kim [Thu, 3 Apr 2014 04:55:09 +0000 (13:55 +0900)]
UIB : Removing warning message in feature.xml
Change-Id: Idf3bfd5148952a03bf291cd5c0403b1d7578ef3b
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
gyeongmin.ju [Thu, 3 Apr 2014 01:18:40 +0000 (10:18 +0900)]
UIB : remove NPE
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I40989148b1950f55346b5c2252ec5d7adc9cf645
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
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
Changyeon Lee [Tue, 1 Apr 2014 09:25:08 +0000 (02:25 -0700)]
Merge "DATABIND : bug Fix remove combo in Tree." into develop
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
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>
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>
Changyeon Lee [Tue, 1 Apr 2014 04:26:52 +0000 (21:26 -0700)]
Merge "DATABIND : Remove unused fields." 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
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>
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>
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>
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>
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
Changyeon Lee [Mon, 31 Mar 2014 07:13:52 +0000 (00:13 -0700)]
Merge "DATABIND : Remove NPE." into develop
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>
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>
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>
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>
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>
Changyeon Lee [Fri, 28 Mar 2014 08:25:23 +0000 (01:25 -0700)]
Merge "DATABIND: syntax changes(switch -> if)." into develop
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>
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>
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
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
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>
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>
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>
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
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>
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>
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>
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
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>
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>
Changyeon Lee [Thu, 27 Mar 2014 07:29:48 +0000 (00:29 -0700)]
Merge "UIB : Update Version Update Version" into tizen
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>
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>
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>
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>
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>
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>
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>
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
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>
Changyeon Lee [Wed, 26 Mar 2014 08:20:51 +0000 (01:20 -0700)]
Merge "PROP : Refactoring CssSelectorCategory." into develop
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>
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>
Changyeon Lee [Tue, 25 Mar 2014 10:23:43 +0000 (03:23 -0700)]
Merge "SNIPPET : Refactoring id policy" into develop
Changyeon Lee [Tue, 25 Mar 2014 10:23:22 +0000 (03:23 -0700)]
Merge "PROP : Fix dispose exception on CssStyleTab." into develop
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
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>
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>
Changyeon Lee [Tue, 25 Mar 2014 06:47:11 +0000 (23:47 -0700)]
Merge "PROP : Fix exception on CssSelectorCategory." into develop
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>
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>
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
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>
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>
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
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
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>
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>
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>
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>
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
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
projects / sdk / ide / web-ui-builder-eplugin.git / log