DATABIND : modify the code generation for system APIs

Change-Id: I61f39f8b4d4628b6a47180ec6242d958d2b57c90
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>

diff --git a/org.tizen.webuibuilder/res/xslt/index_managed_js_ver0_0_1.xslt b/org.tizen.webuibuilder/res/xslt/index_managed_js_ver0_0_1.xslt
index 5d33f36..e634cd3 100644 (file)
--- a/org.tizen.webuibuilder/res/xslt/index_managed_js_ver0_0_1.xslt
+++ b/org.tizen.webuibuilder/res/xslt/index_managed_js_ver0_0_1.xslt
@@ -175,24 +175,66 @@ app.init = function() {
        <xsl:variable name="newDataSource" select="concat($tab, 'app.ds.', $dataModel_name, ' = new uibinding.')"/>
                
        <xsl:choose>
-               <xsl:when test="@modelType = 'REMOTECALL'">
+               <xsl:when test="@modelType = 'Remote Call'">
                        <xsl:value-of select="concat($newDataSource, 'dataSourceRemote', '({', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, 'url: ', '&quot;', @url, '&quot;', ',', $newline)" disable-output-escaping="yes"/>
                        <xsl:value-of select="concat($tab, $tab, 'method: ', '&quot;', @type, '&quot;', ',', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, 'proxy: ', '&quot;', @proxy, '&quot;', ',', $newline)"/>
-                       <xsl:value-of select="concat($tab, $tab, 'query: ', '&quot;', @query, '&quot;', ',', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, 'sourceType: ', '&quot;', @sourceType, '&quot;', ',', $newline)"/>
-                       <xsl:value-of select="concat($tab, $tab, 'timeout: ', '&quot;', @timeout, '&quot;', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'timeout: ', '&quot;', @timeout, '&quot;', ',', $newline)"/>
+                       <xsl:if test="@query != ''">
+                               <xsl:value-of select="concat($tab, $tab, 'query: {', $newline)"/>
+                               <xsl:call-template name="splitQuery">
+                                       <xsl:with-param name="stringtosplit" select ="@query" />
+                               </xsl:call-template>
+                               <xsl:value-of select="concat($tab, $tab, '},', $newline)"/>
+                       </xsl:if>
+                       <xsl:if test="@headers != ''">
+                               <xsl:value-of select="concat($tab, $tab, 'headers: {', $newline)"/>
+                               <xsl:call-template name="splitQuery">
+                                       <xsl:with-param name="stringtosplit" select ="@headers" />
+                               </xsl:call-template>
+                               <xsl:value-of select="concat($tab, $tab, '},', $newline)"/>
+                       </xsl:if>       
                        <xsl:value-of select="concat($tab, '});', $newline)"/>
                </xsl:when>
-               <xsl:when test="@modelType = 'STATIC'">
+               <xsl:when test="@modelType = 'Static'">
                        <xsl:value-of select="concat($newDataSource, 'dataSourceStatic', '({', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, 'data: ', @jsonData, $newline)" disable-output-escaping="yes"/>
                    <xsl:value-of select="concat($tab, '});', $newline)"/>              
                </xsl:when>
-               <xsl:when test="@modelType = 'RUNTIMEAPI'">
-                       <xsl:value-of select="concat($newDataSource, 'dataSourceRuntime', '({', $newline)"/>
-                       <xsl:value-of select="concat($tab, $tab, 'url: ', '&quot;', @api, '&quot;', $newline)"/>
+               <xsl:when test="@modelType = 'Contact'">
+                       <xsl:value-of select="concat($newDataSource, 'dataSourceContact', '({', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'method: ', '&quot;', @method, '&quot;')"/>
+                       <xsl:choose>
+                       <xsl:when test="@addressBookId = ''">
+                               <xsl:value-of select="concat($newline)"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:value-of select="concat(',', $newline, $tab, $tab, 'addressBookId: ', '&quot;', @addressBookId, '&quot;', $newline)"/>
+                       </xsl:otherwise>
+                       </xsl:choose>
+                   <xsl:value-of select="concat($tab, '});', $newline)"/>              
+               </xsl:when>
+               <xsl:when test="@modelType = 'Calendar'">
+                       <xsl:value-of select="concat($newDataSource, 'dataSourceCalendar', '({', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'method: ', '&quot;', @method, '&quot;', ',', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'calendarType: ', '&quot;', @calendarType, '&quot;')"/>
+                       <xsl:choose>
+                       <xsl:when test="@calendarId = ''">
+                               <xsl:value-of select="concat($newline)"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:value-of select="concat(',', $newline, $tab, $tab, 'calendarId: ', '&quot;', @calendarId, '&quot;', $newline)"/>
+                       </xsl:otherwise>
+                       </xsl:choose>
+                   <xsl:value-of select="concat($tab, '});', $newline)"/>              
+               </xsl:when>
+               <xsl:when test="@modelType = 'Call History'">
+                       <xsl:value-of select="concat($newDataSource, 'dataSourceCallhistory', '({', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'type: ', '&quot;', @type, '&quot;', ',', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'direction: ', '&quot;', @direction, '&quot;', ',', $newline)"/>
+                       <xsl:value-of select="concat($tab, $tab, 'starttimeorder: ', '&quot;', @starttimeorder, '&quot;', $newline)"/>
                    <xsl:value-of select="concat($tab, '});', $newline)"/>              
                </xsl:when>
        </xsl:choose>
@@ -235,12 +277,12 @@ app.init = function() {
 
 <xsl:template match="observableObject" mode="fake">
        <xsl:choose>
-               <xsl:when test="@type = 'JSONArray'">
+               <xsl:when test="@type = 'Array'">
                        <xsl:value-of select="concat($tab, $tab, @name, ': [{', $newline)"/>
                        <xsl:apply-templates select="observableObject" mode="fake"/>
                        <xsl:value-of select="concat($tab, $tab, '}],', $newline)"/>
                </xsl:when>
-               <xsl:when test="@type = 'JSONObject'">
+               <xsl:when test="@type = 'Object'">
                        <xsl:value-of select="concat($tab, $tab, @name, ': {', $newline)"/>
                        <xsl:apply-templates select="observableObject" mode="fake"/>
                        <xsl:value-of select="concat($tab, $tab, '},', $newline)"/>                                             
@@ -253,7 +295,7 @@ app.init = function() {
 
 <xsl:template match="observableObject" mode="origin">
        <xsl:choose>
-               <xsl:when test="@type = 'JSONArray'">
+               <xsl:when test="@type = 'Array'">
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, '_self.', '_', @name, ' = function(obj) {', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, $tab, 'var _self = this;', $newline)"/>
                        <xsl:apply-templates select="observableObject" mode="origin"/>
@@ -265,7 +307,7 @@ app.init = function() {
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, $tab, '_self.', @name, '.push(new _self._', @name, '(_obj));', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, '}', $newline)"/>
                </xsl:when>
-               <xsl:when test="@type = 'JSONObject'">
+               <xsl:when test="@type = 'Object'">
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, '_self.', '_', @name, ' = function(obj) {', $newline)"/>
                        <xsl:value-of select="concat($tab, $tab, $tab, $tab, $tab, 'var _self = this;', $newline)"/>
                        <xsl:apply-templates select="observableObject" mode="origin"/>
@@ -280,6 +322,33 @@ app.init = function() {
        </xsl:choose>
 </xsl:template>
 
+<xsl:template name="splitQuery">
+       <xsl:param name="stringtosplit" />
+       <xsl:variable name="first" select="substring-before($stringtosplit, '&amp;')" />
+    <xsl:variable name="remaining" select="substring-after($stringtosplit, '&amp;')" />
+ 
+       <xsl:choose>
+               <xsl:when test="$first = ''">
+                       <xsl:if test="$stringtosplit">
+                               <xsl:variable name="key" select="substring-before($stringtosplit, '=')" />
+                       <xsl:variable name="value" select="substring-after($stringtosplit, '=')" />
+                       <xsl:value-of select="concat($tab, $tab, $tab, $key,': ', '&quot;', $value, '&quot;', ',', $newline)"/>
+                       </xsl:if>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:variable name="key" select="substring-before($first, '=')" />
+               <xsl:variable name="value" select="substring-after($first, '=')" />
+                       <xsl:value-of select="concat($tab, $tab, $tab, $key,': ', '&quot;', $value, '&quot;', ',', $newline)"/>
+               </xsl:otherwise>
+       </xsl:choose>   
+
+    <xsl:if test="$remaining">
+      <xsl:call-template name="splitQuery">
+        <xsl:with-param name="stringtosplit" select="$remaining" />
+      </xsl:call-template>
+    </xsl:if>  
+</xsl:template>
+
 <xsl:template match="updateOnStartUp">
        <xsl:value-of select="concat($tab, 'app.ds.', @name, '.update();', $newline)"/> 
 </xsl:template>
@@ -293,7 +362,7 @@ app.init = function() {
        <xsl:for-each select=".//observableObject">
                <xsl:variable name="observableObject_value" select="concat('&quot;', @value, '&quot;')"/>
                <xsl:choose>
-                       <xsl:when test="@type = 'JSONArray'">
+                       <xsl:when test="@type = 'Array'">
                                <xsl:value-of select="concat($tab, $tab, @name, ': ko.observableArray(),', $newline)"/>
                        </xsl:when>
                        <xsl:otherwise>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
index c6b687c..7106683 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
@@ -227,6 +227,14 @@ public class BuilderConstants {
        public static final String ATTRIBUTE_JSONDATA = "jsonData"; //$NON-NLS-1$
        public static final String ATTRIBUTE_FILEPATH = "filePath"; //$NON-NLS-1$
        public static final String ATTRIBUTE_API = "api"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_METHOD = "method"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_ADDRESS_BOOK_ID = "addressBookId"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_CALENDAR_TYPE = "calendarType"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_CALENDAR_ID = "calendarId"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_DIRECTION = "direction"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_START_TIME_ORDER = "starttimeorder"; //$NON-NLS-1$
+       public static final String ATTRIBUTE_HEADERS = "headers"; //$NON-NLS-1$
+       
        public static final String ATTRIBUTE_DATA_BIND = "data-bind"; //$NON-NLS-1$
 
        // Project file attribute value

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
index d732fa2..0f550eb 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
@@ -25,7 +25,9 @@ package org.tizen.webuibuilder.model.app.io;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import org.w3c.dom.Document;
@@ -230,10 +232,14 @@ public class AppMetaReader_ver_2 {
                 String sourceType = element2.getAttribute(BuilderConstants.ATTRIBUTE_SOURCETYPE);
                 String timeout = element2.getAttribute(BuilderConstants.ATTRIBUTE_TIMEOUT);
                 String jsonData = element2.getAttribute(BuilderConstants.ATTRIBUTE_JSONDATA);
+                String headersInfo = element2.getAttribute(BuilderConstants.ATTRIBUTE_HEADERS);
+                Map<String, String> headers = makeHeaders(headersInfo);
 
                 BindingData dataModel =
                         new BindingData(name, modelType, url, type, proxy, query, sourceType,
-                                        timeout, jsonData);
+                                        timeout, jsonData, headers);
+
+
                 descriptor.addDataSource(dataModel);
             } else if ((modelType != null) && (modelType.equals(BuilderConstants.DATABINDING_TYPE_STATIC))) {
                 String jsonData = element2.getAttribute(BuilderConstants.ATTRIBUTE_JSONDATA);
@@ -257,6 +263,18 @@ public class AppMetaReader_ver_2 {
             }
         }
     }
+    
+    private static Map<String, String> makeHeaders(String headersInfo) {
+       Map<String, String> headers = new HashMap<String, String>();
+       String[] headersInfoArray;
+       headersInfoArray = headersInfo.split("&");
+       for (String info : headersInfoArray) {
+               String[] infoArray = info.split("=");
+               headers.put(infoArray[0], infoArray[1]);
+       }
+       
+               return headers;
+       }
 
     private static void parseObservableObject(Element element, BindingData dataModel,
                                               BindingObject parentObject) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
index f8d7c29..a6cb6d7 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
@@ -24,8 +24,10 @@
 package org.tizen.webuibuilder.model.app.io;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -189,10 +191,12 @@ public class HtmlMetaReader_ver_1 {
                 String sourceType = element2.getAttribute(BuilderConstants.ATTRIBUTE_SOURCETYPE);
                 String timeout = element2.getAttribute(BuilderConstants.ATTRIBUTE_TIMEOUT);
                 String jsonData = element2.getAttribute(BuilderConstants.ATTRIBUTE_JSONDATA);
+                String headersInfo = element2.getAttribute(BuilderConstants.ATTRIBUTE_HEADERS);
+                Map<String, String> headers = makeHeaders(headersInfo);
 
                 BindingData dataModel =
                         new BindingData(sourceName, modelType, url, type, proxy, query, sourceType,
-                                        timeout, jsonData);
+                                        timeout, jsonData, headers);
 
                 parseObservableObject(element2, dataModel);
 
@@ -206,10 +210,42 @@ public class HtmlMetaReader_ver_1 {
                 parseObservableObject(element2, dataModel);
 
                 fileData.addDataSource(dataModel);
-            } else if ((modelType != null) && (modelType.equals("RUNTIMEAPI"))) {
-                String api = element2.getAttribute(BuilderConstants.ATTRIBUTE_API);
+            } else if ((modelType != null) && (modelType.equals("Contact"))) {
+                String method = element2.getAttribute(BuilderConstants.ATTRIBUTE_METHOD);
+                String addressBookId = element2.getAttribute(BuilderConstants.ATTRIBUTE_ADDRESS_BOOK_ID);
 
-                BindingData dataModel = new BindingData(sourceName, modelType, api);
+                BindingData dataModel = new BindingData();
+                dataModel.setSourceName(sourceName);
+                dataModel.setModelType(modelType);
+                dataModel.setRuntimeApiName(method);
+                dataModel.setRuntimeApiAddressBookID(addressBookId);
+                parseObservableObject(element2, dataModel);
+                fileData.addDataSource(dataModel);
+            } else if ((modelType != null) && (modelType.equals("Calendar"))) {
+               String method = element2.getAttribute(BuilderConstants.ATTRIBUTE_METHOD);
+                String calendarType = element2.getAttribute(BuilderConstants.ATTRIBUTE_CALENDAR_TYPE);
+                String calendarId = element2.getAttribute(BuilderConstants.ATTRIBUTE_CALENDAR_ID);
+
+                BindingData dataModel = new BindingData();
+                dataModel.setSourceName(sourceName);
+                dataModel.setModelType(modelType);
+                dataModel.setCalendarName(method);
+                dataModel.setCalendarType(calendarType);
+                dataModel.setCalendarID(calendarId);
+                parseObservableObject(element2, dataModel);
+                fileData.addDataSource(dataModel);
+            } else if ((modelType != null) && (modelType.equals("Call History"))) {
+               String type = element2.getAttribute(BuilderConstants.ATTRIBUTE_TYPE);
+                String direction = element2.getAttribute(BuilderConstants.ATTRIBUTE_DIRECTION);
+                String startTimeOrder = element2.getAttribute(BuilderConstants.ATTRIBUTE_START_TIME_ORDER);
+
+                BindingData dataModel = new BindingData();
+                dataModel.setSourceName(sourceName);
+                dataModel.setModelType(modelType);
+                dataModel.setCallHistoryType(type);
+                dataModel.setCallHistoryDirection(direction);
+                dataModel.setCallHistoryStartTimeOrder(startTimeOrder);
+                parseObservableObject(element2, dataModel);
                 fileData.addDataSource(dataModel);
             } else {
                 BindingData dataModel = new BindingData();
@@ -220,7 +256,22 @@ public class HtmlMetaReader_ver_1 {
         }
     }
 
-    private static void parseViewModel(HtmlMetaFileData fileData, Element element) {
+    private static Map<String, String> makeHeaders(String headersInfo) {
+       Map<String, String> headers = new HashMap<String, String>();
+       if (!headersInfo.isEmpty()) {
+               String[] headersInfoArray;
+               headersInfoArray = headersInfo.split("&");
+               for (String info : headersInfoArray) {
+                       String[] infoArray = info.split("=");
+                       if (infoArray.length == 2) {
+                               headers.put(infoArray[0], infoArray[1]);
+                       }
+               }
+       }
+               return headers;
+       }
+
+       private static void parseViewModel(HtmlMetaFileData fileData, Element element) {
        NodeList elementList = element.getElementsByTagName(BuilderConstants.ELEMENT_VIEWMODEL);
         for (int i = 0; i < elementList.getLength(); i++) {
             Element element2 = (Element) elementList.item(i);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
index f53347b..f275b4b 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
@@ -340,6 +340,13 @@ public class HtmlMetaWriter_ver_1 {
         element.setAttribute(BuilderConstants.ATTRIBUTE_MODELTYPE, dataModel.getModelType());
 
         if ((dataModel.getModelType() != null) && (dataModel.getModelType().equals(BuilderConstants.DATABINDING_TYPE_REMOTECALL))) {
+               String headerInfo = "";
+               if (dataModel.getHeaders() != null) {
+                       for (Entry<String, String> info : dataModel.getHeaders().entrySet()) {
+                       headerInfo += info.getKey() + "=" + info.getValue() + "&";
+               }
+               }
+               
             element.setAttribute(BuilderConstants.ATTRIBUTE_URL, dataModel.getURL());
             element.setAttribute(BuilderConstants.ATTRIBUTE_TYPE, dataModel.getMethod());
             element.setAttribute(BuilderConstants.ATTRIBUTE_PROXY, dataModel.getProxy());
@@ -347,6 +354,7 @@ public class HtmlMetaWriter_ver_1 {
             element.setAttribute(BuilderConstants.ATTRIBUTE_SOURCETYPE, dataModel.getSourceType());
             element.setAttribute(BuilderConstants.ATTRIBUTE_TIMEOUT, dataModel.getTimeout());
             element.setAttribute(BuilderConstants.ATTRIBUTE_JSONDATA, dataModel.getJsonData());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_HEADERS, headerInfo);
 
             List<BindingObject> observableObjects = dataModel.getDataSourceObjects();
             int size = observableObjects.size();
@@ -367,9 +375,35 @@ public class HtmlMetaWriter_ver_1 {
             element.setAttribute(BuilderConstants.ATTRIBUTE_JSONDATA, jsonData);
             element.setAttribute(BuilderConstants.ATTRIBUTE_FILEPATH, dataModel.getStaticFilePath());
         } else if ((dataModel.getModelType() != null)
-                && (dataModel.getModelType().equals("RUNTIMEAPI"))) {
-            element.setAttribute(BuilderConstants.ATTRIBUTE_API, dataModel.getRuntimeApiName());
-        }
+                && (dataModel.getModelType().equals("Contact"))) {
+            element.setAttribute(BuilderConstants.ATTRIBUTE_METHOD, dataModel.getRuntimeApiName());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_ADDRESS_BOOK_ID, dataModel.getRuntimeApiAddressBookID());
+            List<BindingObject> observableObjects = dataModel.getDataSourceObjects();
+            int size = observableObjects.size();
+            for (int i = 0; i < size; i++) {
+                element.appendChild(writeObservableObjects(doc, observableObjects.get(i)));
+            }
+        } else if ((dataModel.getModelType() != null)
+                && (dataModel.getModelType().equals("Calendar"))) {
+            element.setAttribute(BuilderConstants.ATTRIBUTE_METHOD, dataModel.getCalendarName());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_CALENDAR_TYPE, dataModel.getCalendarType());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_CALENDAR_ID, dataModel.getCalendarID());
+            List<BindingObject> observableObjects = dataModel.getDataSourceObjects();
+            int size = observableObjects.size();
+            for (int i = 0; i < size; i++) {
+                element.appendChild(writeObservableObjects(doc, observableObjects.get(i)));
+            }
+        } else if ((dataModel.getModelType() != null)
+                && (dataModel.getModelType().equals("Call History"))) {
+            element.setAttribute(BuilderConstants.ATTRIBUTE_TYPE, dataModel.getCallHistoryType());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_DIRECTION, dataModel.getCallHistoryDirection());
+            element.setAttribute(BuilderConstants.ATTRIBUTE_START_TIME_ORDER, dataModel.getCallHistoryStartTimeOrder());
+            List<BindingObject> observableObjects = dataModel.getDataSourceObjects();
+            int size = observableObjects.size();
+            for (int i = 0; i < size; i++) {
+                element.appendChild(writeObservableObjects(doc, observableObjects.get(i)));
+            }
+        } 
         return element;
     }
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/model/BindingData.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/model/BindingData.java
index 708be2c..6eb19a9 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/model/BindingData.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/model/BindingData.java
@@ -77,7 +77,7 @@ public class BindingData {
      * @param jsonData
      */
     public BindingData( String sourceName, String modelType, String url, String type, String proxy,
-            String query, String sourceType, String timeout, String jsonData ) {
+            String query, String sourceType, String timeout, String jsonData, Map<String, String> headers ) {
         this.sourceName = sourceName;
         this.modelType = modelType;
         this.url = url;
@@ -87,6 +87,7 @@ public class BindingData {
         this.sourceType = sourceType;
         this.timeout = timeout;
         this.jsonData = jsonData;
+        this.headers = headers;
     }
 
     /**