Fix for test cases

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / builder / builder-impl.h

diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/base/dali-toolkit/internal/builder/builder-impl.h
index 9854dbe..d533366 100644 (file)
--- a/base/dali-toolkit/internal/builder/builder-impl.h
+++ b/base/dali-toolkit/internal/builder/builder-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_H__
 #define __DALI_TOOLKIT_INTERNAL_BUILDER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
@@ -127,33 +128,21 @@ public:
    */
   BaseHandle Create( const std::string& templateName, const PropertyValueMap& map );
 
- /**
-   * @copydoc Toolkit::Builder::GetFont
-   */
-  Font GetFont(const std::string &name) const;
-
   /**
-   * @copydoc Toolkit::Builder::GetTextStyle
+   * @copydoc Toolkit::Builder::CreateFromJson( const std::string& json );
    */
-  TextStyle GetTextStyle(const std::string &name) const;
+  BaseHandle CreateFromJson( const std::string& json );
 
   /**
-   * @copydoc Toolkit::Builder::GetImage
+   * @copydoc Toolkit::Builder::ApplyFromJson( Handle& handle, const std::string& json );
    */
-  Image GetImage(const std::string &name) const;
-
-  /**
-   * @copydoc Toolkit::Builder::GetActor
-   */
-  Actor GetActor( const std::string &name ) const;
+  bool ApplyFromJson(  Handle& handle, const std::string& json );
 
   /**
    * @copydoc Toolkit::Builder::ApplyStyle
    */
   bool ApplyStyle( const std::string& styleName, Handle& handle );
 
-  void AnimateTo( const std::string& styleName, Handle& handle );
-
   /**
    * @copydoc Toolkit::Builder::AddActors
    */
@@ -165,11 +154,6 @@ public:
   void AddActors( const std::string &sectionName, Actor toActor );
 
   /**
-   * @copydoc Toolkit::Builder::GetAnimation
-   */
-  Animation GetAnimation( const std::string &name ) const;
-
-  /**
    * @copydoc Toolkit::Builder::CreateRenderTask
    */
   void CreateRenderTask( const std::string &name );
@@ -194,11 +178,6 @@ public:
    */
   FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
 
-  /**
-   * @copydoc Toolkit::Builder::GetTopLevelActors
-   */
-  ActorContainer GetTopLevelActors( void ) const;
-
 protected:
 
   virtual ~Builder();