From 4990e175dac8a89d4e06f184a7801ca4f5909325 Mon Sep 17 00:00:00 2001
From: "Heekyoung, Oh" <heekyoung.oh@samsung.com>
Date: Fri, 16 May 2014 15:01:48 +0900
Subject: [PATCH] DATABIND : update the descriptors a. add slider type -
 tizen.types.xml, DescriptorManager.java, TypeDescriptor.java b. add text
 binding for the headingone, headingtwo, headingthree, headingfour,
 headingfive headingsix widgets c. add attr[src] binding for the image and
 thumbnail widget d. add slider binding for the slider widget

Change-Id: Ibe90127afa8969db3659b52a6c0392c2c57460e5
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
---
 .../descriptors/Tizen-web-ui-fw/tizen.types.xml    |  6 ++++-
 .../widget/html.headingfive.widget.xml             |  2 ++
 .../widget/html.headingfour.widget.xml             |  2 ++
 .../widget/html.headingone.widget.xml              |  2 +-
 .../widget/html.headingsix.widget.xml              |  2 ++
 .../widget/html.headingthree.widget.xml            |  2 ++
 .../widget/html.headingtwo.widget.xml              |  2 ++
 .../Tizen-web-ui-fw/widget/html.image.widget.xml   |  2 +-
 .../widget/tizen.listitemthumbnail.widget.xml      |  2 +-
 .../Tizen-web-ui-fw/widget/tizen.slider.widget.xml |  2 ++
 .../model/descriptors/DescriptorManager.java       |  3 ++-
 .../model/descriptors/TypeDescriptor.java          | 26 +++++++++++++---------
 .../databinding/DataBindingTooltipParser.java      | 17 +++++++-------
 13 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/tizen.types.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 65d2c37..e3df02b 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@ -797,6 +797,10 @@
 		<constant value="foreach" displayName=""/>
 	</type>
 
+	<type id="slider@databinding">
+		<constant value="slider" displayName=""/>
+	</type>
+
 	<type id="textchecked@databinding">
 		<constant value="text" displayName=""/>
 		<constant value="checked" displayName=""/>
@@ -812,7 +816,7 @@
 		<constant value="text" displayName=""/>
 	</type>
 
-	<type id="attr@databinding">
+	<type id="attrsrc@databinding">
 		<constant value="attr" displayName="src"/>
 	</type>
 
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml
index 30ff2c6..5d54fb4 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml
@@ -15,6 +15,8 @@
 	</property>
 	<property name="text" type="string"            displayName="Text" default="" initValue="Heading5" xpath="text()"/>
 
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml
index 27c49d2..d853d5c 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml
@@ -15,6 +15,8 @@
 	</property>
 	<property name="text" type="string"            displayName="Text" default="" initValue="Heading4" xpath="text()"/>
 
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml
index 28854cf..3a0b161 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml
@@ -25,7 +25,7 @@
 		<condition name="disable-property-by-parent" value="tizen.header"/>
 	</property> -->
 	
-	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="text" initValue=""/>
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
 
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml
index a434e7e..be5c965 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml
@@ -15,6 +15,8 @@
 	</property>
 	<property name="text" type="string"            displayName="Text" default="" initValue="Heading6" xpath="text()"/>
 
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml
index cde1295..b2a31ca 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml
@@ -15,6 +15,8 @@
 	</property>
 	<property name="text" type="string"            displayName="Text" default="" initValue="Heading3" xpath="text()"/>
 
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml
index 5f6ae64..2a8b48a 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml
@@ -15,6 +15,8 @@
 	</property>
 	<property name="text" type="string"            displayName="Text" default="" initValue="Heading2" xpath="text()"/>
 
+	<property name="data-bind" type="text@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.image.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.image.widget.xml
index 6fc5729..702ec15 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.image.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.image.widget.xml
@@ -28,7 +28,7 @@
 		<property name="border-style" type="border@style" displayName="Style" selector="#%id%"/>
 	</property> -->
 	
-	<property name="data-bind" type="attr@databinding" displayName="Data Binding" default="" initValue=""/>
+	<property name="data-bind" type="attrsrc@databinding" displayName="Data Binding" default="" initValue=""/>
 
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml
index de2d6fc..8545eb3 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml
@@ -26,7 +26,7 @@
 		<property name="border-style" type="border@style" displayName="Style" selector="#%id%"/>
 	</property> -->
 	
-	<property name="data-bind" type="attr@databinding" displayName="Data Binding" default="" initValue=""/>
+	<property name="data-bind" type="attrsrc@databinding" displayName="Data Binding" default="" initValue=""/>
 
 	<event name="ontap" displayName="Tap" eventType="event.defaultevent" />
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml
index c0ea2d7..2bd5734 100644
--- a/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml
+++ b/org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml
@@ -68,6 +68,8 @@
 		tooltip="Enables or disables a pop-up showing the current value while the handle is dragged"/>
 	<property name="data-highlight"  type="tizen@boolean1"    displayName="Highlight"  default=""/>
 
+	<property name="data-bind" type="slider@databinding" displayName="Data Binding" default="" initValue=""/>
+
 	<!-- <event name="ontap" displayName="Tap" eventType="event.defaultevent" /> 
 	<event name="ontaphold" displayName="TapHold" eventType="event.defaultevent" />
 	<event name="onswipe" displayName="Swipe" eventType="event.defaultevent" />
diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/DescriptorManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/DescriptorManager.java
index 26165a5..b4eb1d8 100644
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/DescriptorManager.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/DescriptorManager.java
@@ -231,10 +231,11 @@ public final class DescriptorManager {
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_TEXT));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_VALUE));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_FOREACH));
+        addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_SLIDER));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_TEXT_CHECK));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_FOREACH_TEXT));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_VALUE_TEXT));
-        addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_ATTR));
+        addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_ATTR_SRC));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_DATABINDING_ATTR_TEXT));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_OPACITY));
         addTypeDescriptor(new TypeDescriptor(TypeDescriptor.ID_OF_ICON));
diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/TypeDescriptor.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/TypeDescriptor.java
index 2620f6f..e2a9ccc 100644
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/TypeDescriptor.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/TypeDescriptor.java
@@ -36,7 +36,7 @@ public class TypeDescriptor {
      * A property type.
      */
     public enum Types {
-        UNKNOWN, STRING, BOOLEAN, INTEGER, URL, IMAGE, COLOR, COLOR2, DATE, TIME, AUDIO, VIDEO, HTMLSTRING, GROUP, GROUP_TEXT, GROUP_POSITION, CSS_COLOR, CSS_FONT_SIZE, CSS_FONT_STYLE, CSS_FONT_WEIGHT, CSS_TEXT_ALIGN, CSS_TEXT_DECORATION, SIZE_INTEGER, SIZE_PERCENT, SIZE_REAL, SIZE, SIZE_PIXEL, SIZE_ANGLE, ENUM, OPACITY, ICON, ICON_TEXT_ALIGN, ICON_FONT_WEIGHT, ICON_FONT_STYLE, ICON_TEXT_DECORATION, ICON_TEXT_TRANSFORM, TEXT_LETTER_SPACING, TEXT_LINE_HEIGHT, GROUP_TRANSFORM, GROUP_BORDER, SEPARATOR, EMPTY, CHECK, NEW_COLOR, COLOR_FILL, SCALE, SCALE_PIXEL, SCALE_PERCENT, SCALE_ANGLE, LISTITEM_CLASS, GROUP_FILTER, GROUP_VALUE, METRICS, CUSTOM_CSS, CLIP, GROUP_ICON, DATABINDING_TEXT, DATABINDING_VALUE, DATABINDING_FOREACH, DATABINDING_TEXT_CHECK, DATABINDING_FOREACH_TEXT, DATABINDING_VALUE_TEXT, DATABINDING_ATTR, DATABINDING_ATTR_TEXT
+        UNKNOWN, STRING, BOOLEAN, INTEGER, URL, IMAGE, COLOR, COLOR2, DATE, TIME, AUDIO, VIDEO, HTMLSTRING, GROUP, GROUP_TEXT, GROUP_POSITION, CSS_COLOR, CSS_FONT_SIZE, CSS_FONT_STYLE, CSS_FONT_WEIGHT, CSS_TEXT_ALIGN, CSS_TEXT_DECORATION, SIZE_INTEGER, SIZE_PERCENT, SIZE_REAL, SIZE, SIZE_PIXEL, SIZE_ANGLE, ENUM, OPACITY, ICON, ICON_TEXT_ALIGN, ICON_FONT_WEIGHT, ICON_FONT_STYLE, ICON_TEXT_DECORATION, ICON_TEXT_TRANSFORM, TEXT_LETTER_SPACING, TEXT_LINE_HEIGHT, GROUP_TRANSFORM, GROUP_BORDER, SEPARATOR, EMPTY, CHECK, NEW_COLOR, COLOR_FILL, SCALE, SCALE_PIXEL, SCALE_PERCENT, SCALE_ANGLE, LISTITEM_CLASS, GROUP_FILTER, GROUP_VALUE, METRICS, CUSTOM_CSS, CLIP, GROUP_ICON, DATABINDING_TEXT, DATABINDING_VALUE, DATABINDING_FOREACH, DATABINDING_SLIDER, DATABINDING_TEXT_CHECK, DATABINDING_FOREACH_TEXT, DATABINDING_VALUE_TEXT, DATABINDING_ATTR_SRC, DATABINDING_ATTR_TEXT
     }
 
     // Id of type
@@ -108,12 +108,14 @@ public class TypeDescriptor {
     public static final String ID_OF_DATABINDING_TEXT = "text@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_VALUE = "value@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_FOREACH = "foreach@databinding"; //$NON-NLS-1$
+    public static final String ID_OF_DATABINDING_SLIDER = "slider@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_TEXT_CHECK = "textchecked@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_FOREACH_TEXT = "foreachtext@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_VALUE_TEXT = "valuetext@databinding"; //$NON-NLS-1$
-    public static final String ID_OF_DATABINDING_ATTR = "attr@databinding"; //$NON-NLS-1$
+    public static final String ID_OF_DATABINDING_ATTR_SRC = "attrsrc@databinding"; //$NON-NLS-1$
     public static final String ID_OF_DATABINDING_ATTR_TEXT = "attrtext@databinding"; //$NON-NLS-1$
 
+
     /**
      * A property type.
      */
@@ -217,21 +219,23 @@ public class TypeDescriptor {
             } else if (ID_OF_CSS_FONT_SIZE.equals(id)) {
                 type = Types.CSS_FONT_SIZE;
             } else if (ID_OF_DATABINDING_TEXT.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_TEXT;
             } else if (ID_OF_DATABINDING_VALUE.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_VALUE;
             } else if (ID_OF_DATABINDING_FOREACH.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_FOREACH;
+            } else if (ID_OF_DATABINDING_SLIDER.equals(id)) {
+            	type = Types.DATABINDING_SLIDER;
             } else if (ID_OF_DATABINDING_TEXT_CHECK.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_TEXT_CHECK;
             } else if (ID_OF_DATABINDING_FOREACH_TEXT.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_FOREACH_TEXT;
             } else if (ID_OF_DATABINDING_VALUE_TEXT.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
-            } else if (ID_OF_DATABINDING_ATTR.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_VALUE_TEXT;
+            } else if (ID_OF_DATABINDING_ATTR_SRC.equals(id)) {
+                type = Types.DATABINDING_ATTR_SRC;
             } else if (ID_OF_DATABINDING_ATTR_TEXT.equals(id)) {
-                type = Types.CSS_FONT_SIZE;
+                type = Types.DATABINDING_ATTR_TEXT;
             } else if (ID_OF_GROUP_TRANSFORM.equals(id)) {
                 type = Types.GROUP_TRANSFORM;
             } else if (ID_OF_SEPARATOR.equals(id)) {
diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingTooltipParser.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingTooltipParser.java
index 3736cb4..2e17d65 100644
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingTooltipParser.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingTooltipParser.java
@@ -135,15 +135,16 @@ public class DataBindingTooltipParser {
         }
         return bindingInfos;
     }
-    
+
     private static void put(Map<String, String> bindingInfos, String string) {
-        String[] infos = string.split(": ");
-        if ((infos[0] != null) && (!infos[0].isEmpty())) { 
-            if ((infos[1] != null) && (!infos[1].isEmpty())) {
-                bindingInfos.put(infos[0], infos[1]);
-            }
-        }
-        
+    	String[] infos = string.split(": ");
+    	if (infos.length == 2) {
+    		if ((infos[0] != null) && (!infos[0].isEmpty())) {
+    			if ((infos[1] != null) && (!infos[1].isEmpty())) {
+    				bindingInfos.put(infos[0], infos[1]);
+    			}
+    		}
+    	}
     }
 
     public static String makeStringFromMap(Map<String, String> bindingInfos) {
-- 
2.7.4