X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fbuilder%2Fbuilder.cpp;h=fbf422351fdc34fdd7a13b04ac68493a7e68fd1a;hp=dbb75b1a3a2e2b55569bb2cc4c994ce2921a0fcd;hb=9950e5ec78fa88379dbfa3fdf952a0c6b578adbd;hpb=022b76df6f53c2860f2684ef1ffee81af1805e2e

diff --git a/base/dali-toolkit/public-api/builder/builder.cpp b/base/dali-toolkit/public-api/builder/builder.cpp
index dbb75b1..fbf4223 100644
--- a/base/dali-toolkit/public-api/builder/builder.cpp
+++ b/base/dali-toolkit/public-api/builder/builder.cpp
@@ -1,18 +1,19 @@
-//
-// 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.
+ *
+ */
 
 // CLASS HEADER
 
@@ -93,16 +94,6 @@ Animation Builder::CreateAnimation( const std::string& animationName, const Prop
   return GetImpl(*this).CreateAnimation( animationName, map, sourceActor );
 }
 
-BaseHandle Builder::CreateFromStyle( const std::string& styleName )
-{
-  return BaseHandle();
-}
-
-BaseHandle Builder::CreateFromStyle( const std::string& styleName, const PropertyValueMap& map )
-{
-  return BaseHandle();
-}
-
 BaseHandle Builder::Create( const std::string& templateName )
 {
   return GetImpl(*this).Create( templateName );
@@ -113,44 +104,29 @@ BaseHandle Builder::Create( const std::string& templateName, const PropertyValue
   return GetImpl(*this).Create( templateName, map );
 }
 
-bool Builder::ApplyStyle( const std::string& styleName, Handle& handle )
-{
-  return GetImpl(*this).ApplyStyle( styleName, handle );
-}
-
-void Builder::AddActors( Actor toActor )
+BaseHandle Builder::CreateFromJson( const std::string& json )
 {
-  GetImpl(*this).AddActors( toActor );
+  return GetImpl(*this).CreateFromJson( json );
 }
 
-void Builder::AddActors( const std::string &sectionName, Actor toActor )
-{
-  GetImpl(*this).AddActors( sectionName, toActor );
-}
-
-Font Builder::GetFont( const std::string &name ) const
-{
-  return GetImpl(*this).GetFont( name );
-}
-
-TextStyle Builder::GetTextStyle( const std::string &name ) const
+bool Builder::ApplyStyle( const std::string& styleName, Handle& handle )
 {
-  return GetImpl(*this).GetTextStyle( name );
+  return GetImpl(*this).ApplyStyle( styleName, handle );
 }
 
-Image Builder::GetImage( const std::string &name ) const
+bool Builder::ApplyFromJson( Handle& handle, const std::string& json )
 {
-  return GetImpl(*this).GetImage( name );
+  return GetImpl(*this).ApplyFromJson( handle, json );
 }
 
-Actor Builder::GetActor( const std::string &name ) const
+void Builder::AddActors( Actor toActor )
 {
-  return GetImpl(*this).GetActor( name );
+  GetImpl(*this).AddActors( toActor );
 }
 
-Animation Builder::GetAnimation( const std::string &name ) const
+void Builder::AddActors( const std::string &sectionName, Actor toActor )
 {
-  return GetImpl(*this).GetAnimation( name );
+  GetImpl(*this).AddActors( sectionName, toActor );
 }
 
 void Builder::CreateRenderTask( const std::string &name )
@@ -168,9 +144,9 @@ FrameBufferImage Builder::GetFrameBufferImage( const std::string &name )
   return GetImpl(*this).GetFrameBufferImage( name );
 }
 
-ActorContainer Builder::GetTopLevelActors( void ) const
+Builder::Signal& Builder::QuitSignal()
 {
-  return GetImpl(*this).GetTopLevelActors();
+  return GetImpl( *this ).QuitSignal();
 }
 
 } // namespace Toolkit