Merge remote-tracking branch 'origin/develop' into nscreen

* origin/develop: (47 commits)
  ANIMATOR : Remove unused source code Remove decrease id call and id related source code from AnimatorModelManager
  DATABIND : support multi binding in the widget
  ANIMATOR : Change model change method in commands Just change specific property that is manipulated in commands which access to Animator model
  DATABIND : XML type file Support(Static Source/File System Source).
  PROP : Fix select CSSSelector when new CSSSelector created. When new CSSSelector created, select the new CSSSelector on CSSSelector category.
  ResourcesView : 1. Modify selection condition                 2. Modify import file (using Job (thread) for progress monitor)
  UIB : Modify deprecated API
  PROP : Fix expansion function of CSS Selector Category.
  PROP : Add validate routine in Metrics.
  ANIMATOR : Check duplication animationgroup name This will check for duplicate animationgroup names.
  ANIMATOR : Add Filter This is a timeline that shows the treeItem is just contain animations.
  PAGETEMP : apply PageWriter, PageReader This commit will be allow us to add a new page by PageTemplate.
  DATABIND : Modify the delete functions in the databinding view
  PROP : Fix refresh bug in font-size/metrics. font-size/metrics did not refresh, well. Fit this bug.
  ANIMATOR : Change AnimatorModelManager lifecycle
  DATABIND : modify the rename can not change the source name in the view model tree
  PROP : bug fixed runtime java script function in the action tab not used the wrong index
  ANIMATOR : Show animationGroup id This is showing menu for user.
  ANIAMTOR : Add Z-order in timeline This is z-order for show keyframe in timeline.
  SNIPPET: Apply ModelSerializer ModelSerializer was applied on Snippet. It is used when a Snippet is converted from Model to String and from String to Model.
  ...

Conflicts:
	org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java

Change-Id: I385db466dbfb7da57e7ac8021e672c49fbdf11f7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
index 462558d,2e184f7..1051ce4
--- 1/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
--- 2/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,14 -24,17 +24,10 @@@ a * UI Builde
  package org.tizen.webuibuilder.model.app.io;
  
  import java.util.ArrayList;
 -import java.util.Iterator;
+ import java.util.HashMap;
  import java.util.List;
+ import java.util.Map;
  
--import org.w3c.dom.Attr;
--import org.w3c.dom.Document;
--import org.w3c.dom.Element;
--import org.w3c.dom.NamedNodeMap;
--import org.w3c.dom.Node;
--import org.w3c.dom.NodeList;
  import org.tizen.webuibuilder.BuilderConstants;
  import org.tizen.webuibuilder.model.Part;
  import org.tizen.webuibuilder.model.PartFactory;
@@@ -39,12 -42,9 +35,18 @@@ import org.tizen.webuibuilder.model.app
  import org.tizen.webuibuilder.model.css.CssSelector;
  import org.tizen.webuibuilder.model.filedata.HtmlMetaFileData;
  import org.tizen.webuibuilder.model.io.file.TizenFileFormatter;
 +import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 +import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType;
 +import org.tizen.webuibuilder.model.nscreen.NScreenModel.Orientation;
 +import org.tizen.webuibuilder.model.nscreen.NScreenModel.Scan;
  import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
  import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
 -import org.tizen.webuibuilder.ui.views.nscreen.model.NScreenModel;
++import org.w3c.dom.Attr;
++import org.w3c.dom.Document;
++import org.w3c.dom.Element;
++import org.w3c.dom.NamedNodeMap;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
  
  
  public class HtmlMetaReader_ver_1 {
@@@ -469,32 -430,35 +524,34 @@@
              Part childpart = null;
              for (int i = 0; i < elem.getChildNodes().getLength(); i++) {
                  child = elem.getChildNodes().item(i);
-                 if (child instanceof Element) {
-                     if (child.getNodeName().equals("event")) {
-                         attrList = child.getAttributes();
-                         for (int j = 0; j < attrList.getLength(); j++) {
-                             Attr eventAttr = (Attr) attrList.item(j);
-                             part.setEventValue(eventAttr.getName(), eventAttr.getValue());
-                         }
-                     } else if (child.getNodeName().equals("gotoPage")) {
-                         List<String> strList = new ArrayList<String>();
- 
-                         attrList = child.getAttributes();
-                         for (int j = 0; j < attrList.getLength(); j++) {
-                             Attr eventAttr = (Attr) attrList.item(j);
-                             strList.add(eventAttr.getValue());
-                         }
-                         part.setGotoPageEventValue(strList.get(0), strList.get(1), strList.get(2));
- 
-                     } else {
-                         childpart = parseElement(fileData, (Element) child, partFactory, selectors);
-                         part.addChildWhenPageRead(childpart);
-                     }
-                 }
+               if(child instanceof Element){
+                       if (child.getNodeName().equals("event")) {
+                               attrList = child.getAttributes();
+                           for (int j = 0; j < attrList.getLength(); j++) {
+                               Attr eventAttr = (Attr) attrList.item(j);
+                               part.setEventValue(eventAttr.getName(), eventAttr.getValue());
+                           }
+                       } else if (child.getNodeName().equals("gotoPage")) {
+                               attrList = child.getAttributes();
+                               String event = ((Attr)attrList.getNamedItem("event")).getValue();
+                         String destinationPage = ((Attr)attrList.getNamedItem("destinationPage")).getValue();
+                         String transition = ((Attr)attrList.getNamedItem("transition")).getValue();
+                               
+                         part.setGotoPageEventValue(event, destinationPage, transition);
+                       } else if (child.getNodeName().equals("openUrl")) {
+                           attrList = child.getAttributes();
+                         String event = ((Attr)attrList.getNamedItem("event")).getValue();
+                         String url = ((Attr)attrList.getNamedItem("url")).getValue();
+                         
+                         part.setOpenUrlEventValue(event, url);
+                       } else {
+                           childpart = parseElement(fileData, (Element)child, partFactory, selectors);
+                           part.addChildWhenPageRead(childpart);
+                       }
+               }
              }
          }
--
          return part;
      }
 -    
 +
  }

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
Simple merge