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

* origin/mw:
  Merge remote-tracking branch 'origin/develop' into mw
  UIB : update version.
  NSCREEN : change resolution. Change resolution by Profile type.
  Merge remote-tracking branch 'origin/develop' into mw
  UIB : It is re-add the missing page.
  Merge remote-tracking branch 'origin/develop' into mw
  UIB : Update version.
  Merge remote-tracking branch 'origin/develop' into mw
  Merge remote-tracking branch 'origin/mw' into tizen
  Merge remote-tracking branch 'origin/tizen' into mw
  Merge remote-tracking branch 'origin/develop' into tizen
  Merge remote-tracking branch 'origin/mw' into tizen
  Merge remote-tracking branch 'origin/tizen' into mw
  Merge remote-tracking branch 'origin/develop' into tizen
  MISC: package version up(0.1.428)
  MISC: package version up(0.1.428)
  CONFIGURATION: Changed configuration model package name
  CONFIGURATION: Changed configuration model package name
  UIBUILDER : Merge tizen branch. Merge tizen branch.

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

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java
index a0be0c9..a8d265e 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java
@@ -87,7 +87,6 @@ public class KeyFrame extends KeyFrameComponent {
                 || Platform.getOS().equals(Platform.OS_MACOSX)) {
             getKeyframe().y = TimelineConstants.DEFAULT_FRAME_WIDGET_MARGIN_LINUX;
         }
-
     }
 
     /**

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
index 6877f84..30d9fa1 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
@@ -1054,6 +1054,7 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
             }
         };
 
+        
         // GraphicalViewerKeyHandler keyHandler = new GraphicalViewerKeyHandler(viewer);
         keyHandler.put(KeyStroke.getPressed(SWT.DEL, 127, SWT.NONE),
                        getActionRegistry().getAction(ActionFactory.DELETE.getId()));

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
index ff56f3b..e2d2cbb 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
@@ -821,7 +821,7 @@ public class DataBindingPage extends Page implements IBindingDataSetListener {
         for (int i=1; i < itemPath.size(); i++) {
             parentItemPath.add(itemPath.get(i));
         }
-        
+
         if (parentItemPath.size() == 1) {
             childObjects = bindingData.getViewModelObjects();
         } else {
@@ -835,7 +835,7 @@ public class DataBindingPage extends Page implements IBindingDataSetListener {
         if (childObjects == null) {
             return false;
         }
-        
+
         for (BindingObject childObject : childObjects) {
             if (childObject.getName().equals(newName)) {
                 return false;

diff --git a/package/changelog b/package/changelog
index e02e123..70ce78d 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 0.1.440
+- [Title] update version.
+== yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-22
 * 0.1.439
 - [Title] Modify ProjectTemplateContributor.
 == yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-22

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 634eddd..9c90932 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package : web-ui-builder-eplugin
-Version :0.1.439
+Version :0.1.440
 OS : ubuntu-32
 Build-host-os : ubuntu-32
 Maintainer : Hoon Kang <h245.kang@samsung.com>
@@ -11,7 +11,7 @@ Source : web-ui-builder-eplugin
 Description : 
 
 Package : web-ui-builder-eplugin
-Version :0.1.439
+Version :0.1.440
 OS : ubuntu-64
 Build-host-os : ubuntu-64
 Maintainer : Hoon Kang <h245.kang@samsung.com>
@@ -23,7 +23,7 @@ Source : web-ui-builder-eplugin
 Description : 
 
 Package : web-ui-builder-eplugin
-Version :0.1.439
+Version :0.1.440
 OS : windows-32
 Build-host-os : ubuntu-32
 Maintainer : Hoon Kang <h245.kang@samsung.com>
@@ -35,7 +35,7 @@ Source : web-ui-builder-eplugin
 Description :
 
 Package : web-ui-builder-eplugin
-Version :0.1.439
+Version :0.1.440
 OS : windows-64
 Build-host-os : ubuntu-64
 Maintainer : Hoon Kang <h245.kang@samsung.com>
@@ -47,7 +47,7 @@ Source : web-ui-builder-eplugin
 Description :
 
 Package : web-ui-builder-eplugin
-Version :0.1.439
+Version :0.1.440
 OS : macos-64
 Build-host-os : ubuntu-64
 Maintainer : Hoon Kang <h245.kang@samsung.com>