-//
-// 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) 2015 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
#include <dali/public-api/object/base-object.h>
#include <dali/internal/event/common/object-registry-impl.h>
#include <dali/internal/event/common/stage-impl.h>
#include <dali/internal/event/common/type-registry-impl.h>
-
-using namespace std;
+#include <dali/internal/event/common/thread-local-storage.h>
namespace Dali
{
void BaseObject::RegisterObject()
{
- if( Internal::Stage::IsInstalled() )
+ Internal::ThreadLocalStorage* tls = Internal::ThreadLocalStorage::GetInternal();
+ if ( tls )
{
- Internal::Stage::GetCurrent()->GetObjectRegistry().RegisterObject( this );
+ tls->GetEventThreadServices().RegisterObject( this );
}
}
void BaseObject::UnregisterObject()
{
+ Internal::ThreadLocalStorage* tls = Internal::ThreadLocalStorage::GetInternal();
+
// Guard to allow handle destruction after Core has been destroyed
- if( Internal::Stage::IsInstalled() )
+ if( tls )
{
- Internal::Stage::GetCurrent()->GetObjectRegistry().UnregisterObject( this );
+ tls->GetEventThreadServices().UnregisterObject( this );
}
}
-bool BaseObject::DoAction(const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool BaseObject::DoAction(const std::string& actionName, const Property::Map& attributes)
{
Dali::Internal::TypeRegistry* registry = Dali::Internal::TypeRegistry::Get();
if( registry )
{
- Dali::TypeInfo typeInfo = registry->GetTypeInfo(this);
+ Internal::TypeRegistry::TypeInfoPointer typeInfo = registry->GetTypeInfo(this);
if( typeInfo )
{
- return typeInfo.GetName();
+ return typeInfo->GetName();
}
}
- // We should not reach here
- static const std::string INVALID_NAME;
- DALI_LOG_ERROR( "TypeName Not Found\n" );
- return INVALID_NAME;
+ // Return an empty string if type-name not found.
+ DALI_LOG_WARNING( "TypeName Not Found\n" );
+ static std::string empty;
+ return empty;
+}
+
+bool BaseObject::GetTypeInfo(Dali::TypeInfo& typeInfo) const
+{
+ Dali::Internal::TypeRegistry* registry = Dali::Internal::TypeRegistry::Get();
+
+ Internal::TypeRegistry::TypeInfoPointer info = registry->GetTypeInfo(this);
+ if(info)
+ {
+ typeInfo = Dali::TypeInfo( info.Get() );
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
bool BaseObject::DoConnectSignal( ConnectionTrackerInterface* connectionTracker, const std::string& signalName, FunctorDelegate* functor )