Merge remote-tracking branch 'origin/develop' into tizen 44/18744/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 31 Mar 2014 07:46:09 +0000 (16:46 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 31 Mar 2014 07:46:09 +0000 (16:46 +0900)
commit1262898dc05334703498099ad37e85f67807009e
treebe40de784c6182ff339af09ea413e79a26efa28c
parent0cef6d9fdab5d3ff97e078158ce5fed7d413f538
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>
34 files changed:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/action/AnimatorKeyHandler.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/command/AnimationCreateAndChangeFrameCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/policies/AnimatorDragEditPolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/viewer/AnimatorBrowserViewer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimationPathModel.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorModelManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/deserializer/AnimatorKeyframeDeserializer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/utils/AnimatorUtils.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/utils/Constants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CommandUtil.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/PastePartCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/SelectionBorder.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/CodeGenerator.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_1.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/action/ActionAnimationGroupComposite.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/action/ActionCustomEventComposite.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/action/ActionExpanderbleTriggerM.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/action/ActionGoToPageComposite.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ClipMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ColorData.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ColorFillMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/NewColorMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/TextEditor.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/UserColorData.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleAnimationEventDelegater.java