Merge remote-tracking branch 'origin/develop' into tizen 71/18671/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Fri, 28 Mar 2014 01:09:28 +0000 (10:09 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Fri, 28 Mar 2014 01:09:28 +0000 (10:09 +0900)
commitdd22509a9d10dab6fc12915b2204f0b5cb448aa4
treeb6ebb0621e92e8d9a27a7b56bda6c43047115b90
parent2d7664d4f99c0d7732cedc5c903d828ec9b7a6f0
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  ANIMATOR : Fixed Forward null This code do not check forward null.
  PROP : Fix null pointer exception. Fix null pointer exception.
  UIB : Remove possibe Error. Add defense  code for possible error by static analyzer.
  UIB : Fix null point exception on ThumbnailManager, HtmlMetaFileData, SnippetManager
  TEMPLATE : Modify CreateAction
  UIB : Add error handling check null dereference
  UIB : Add JUnit project for Unittest
  SNIPPET : Refactoring snippet
  SNIPPET : Remove old format snippets / templates
  UIB : Add error handling
  DATABIND : Remove resource leak
  UIB : Fix null point exception on CodeGenerator, PageDataSet

Change-Id: I093ad7a0d961d54358a6e9192c010e58a8f8e6bd
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
45 files changed:
org.tizen.webuibuilder.test/.project [new file with mode: 0644]
org.tizen.webuibuilder.test/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
org.tizen.webuibuilder.test/META-INF/MANIFEST.MF [new file with mode: 0644]
org.tizen.webuibuilder.test/build.properties [new file with mode: 0644]
org.tizen.webuibuilder.test/src/org/tizen/webuibuilder/snippet/ResourceManagerUnitTest.java [new file with mode: 0644]
org.tizen.webuibuilder.test/src/org/tizen/webuibuilder/snippet/SnippetManagerUnitTest.java [new file with mode: 0644]
org.tizen.webuibuilder.test/src/org/tizen/webuibuilder/snippet/SnippetTest.java [new file with mode: 0644]
org.tizen.webuibuilder.test/src/org/tizen/webuibuilder/snippet/TemplateTest.java [new file with mode: 0644]
org.tizen.webuibuilder/res/page-templates/basic/empty/desciptor.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/empty/image.png [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/empty/meta.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/empty/template.xsl [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/multi/desciptor.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/multi/image.png [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/multi/index.html [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/multi/meta.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/multi/template.xsl [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/single/desciptor.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/single/image.png [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/single/index.html [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/single/meta.xml [deleted file]
org.tizen.webuibuilder/res/page-templates/basic/single/template.xsl [deleted file]
org.tizen.webuibuilder/res/snippets/1.test/descriptor.xml [deleted file]
org.tizen.webuibuilder/res/snippets/1.test/image.png [deleted file]
org.tizen.webuibuilder/res/snippets/1.test/meta.xml [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorModelManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/deserializer/AnimatorAnimationDeserializer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/builder/WebUIBuilderBuilder.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/ThumbnailManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CreateAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/manager/TemplateManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/ITemplateGroup.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/TemplateGroup.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/CreatePolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizards/CreateWizard.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizards/TemplateComposite.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/snippet/loader/DescriptorLoader.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/snippet/manager/ISnippetManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/snippet/manager/SnippetManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/snippet/ui/wizards/policy/CreatePolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/NavigatorIPageListener.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/CategoryComposite.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/PageManager.java