MCL/sf/mw/homescreensrv: comparison contentpublishingsrv/contentpublishingutils/pluginvalidator/src/cpluginvalidator.cpp

equal deleted inserted replaced

-:a5a39a295112
+:8baec10861af
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 #include <ecom/ecom.h>
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 EXPORT_C CPluginValidator* CPluginValidator::NewL( TUid aUid,
 TAny *aParameter )
 {
 CPluginValidator* self = CPluginValidator::NewLC( aUid , aParameter );
 CleanupStack::Pop( self );
 return self;
 // ----------------------------------------------------------------------------
 //
 EXPORT_C CPluginValidator* CPluginValidator::NewLC( TUid aUid,
 TAny *aParameter )
 {
 CPluginValidator* self = new( ELeave ) CPluginValidator( aUid,
 aParameter );
 CleanupStack::PushL( self );
 self->ConstructL();
 return self;
 }
 //
 EXPORT_C TAny* CPluginValidator::GetImplementation( TUid aUid )
 {
 TPluginInfo pluginInfo;
 pluginInfo.iImplementationUid = aUid;
 TInt index = iPluginArray.Find( pluginInfo,
-			TIdentityRelation< TPluginInfo >(UidMatch) );
+TIdentityRelation< TPluginInfo >(UidMatch) );
 return GetImplementation( index );
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 EXPORT_C TAny* CPluginValidator::GetImplementation( TInt aIndex )
 {
 TAny* ret( NULL );
 if (( aIndex != KErrNotFound ) && ( aIndex < iPluginArray.Count() ))
-	{
+{
-	ret= iPluginArray[aIndex].iPlugin;
+ret= iPluginArray[aIndex].iPlugin;
-	}
+}
 return ret;
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 {
 iSession->Close();
 }
 REComSession::FinalClose( );
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CPluginValidator::RunL()
 {
+iSession->NotifyOnChange( iStatus );
+SetActive();
 ManagePluginsL();
-iSession->NotifyOnChange( iStatus );
-SetActive();
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 CPluginValidator::CPluginValidator( TUid aUid, TAny* aParameter ):
 CActive(EPriorityStandard),
 iUid( aUid ),
 iParameter( aParameter )
 {
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 TBool CPluginValidator::PresentInArrayL( TPluginInfo aPluginInfo,
-		const RImplInfoPtrArray& aInfoArray )
+const RImplInfoPtrArray& aInfoArray )
-	{
+{
-	TBool result(EFalse);
+TBool result( EFalse );
-	for ( TInt i = 0; i< aInfoArray.Count(); i++ )
+for( TInt i = 0; i < aInfoArray.Count(); i++ )
-		{
+{
-		if ( aPluginInfo.iImplementationUid.iUid ==
+if( aPluginInfo.iImplementationUid.iUid
-						aInfoArray[i]->ImplementationUid().iUid)
+== aInfoArray[i]->ImplementationUid().iUid )
-			{
+{
-			result = ETrue;
+result = ETrue;
-			break;
+break;
-			}
+}
-		}
+}
-	return result;
+return result;
-	}
+}
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CPluginValidator::DestroyPlugin( TInt aIndex )
 {
 CBase* plugin = static_cast<CBase*>( iPluginArray[aIndex].iPlugin );
 delete plugin;
 REComSession::DestroyedImplementation(
-		iPluginArray[aIndex].iDtor_ID_Key );
+iPluginArray[aIndex].iDtor_ID_Key );
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CPluginValidator::CleanPluginsTable()
 {
-for ( TInt i = 0; i < iPluginArray.Count(); i++ )
+for( TInt i = 0; i < iPluginArray.Count(); i++ )
-	{
+{
-	DestroyPlugin( i );
+DestroyPlugin( i );
-	}
+}
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CPluginValidator::ManagePluginsL()
 {
 // Read info about all implementations into infoArray
 RImplInfoPtrArray infoArray;
 CleanupResetAndDestroyPushL( infoArray );
 REComSession::ListImplementationsL( iUid , infoArray );
 TPluginInfo pluginInfo;
 //Load new plugins
 for ( TInt i = 0; i < infoArray.Count( ); i++ )
 {
 pluginInfo.iImplementationUid = infoArray[i]->ImplementationUid( );
 pluginInfo.iVersion = infoArray[i]->Version();
 TInt index = iPluginArray.Find( pluginInfo,
-			TIdentityRelation< TPluginInfo >(UidMatch) );
+TIdentityRelation< TPluginInfo >(UidMatch) );
-if ( index == KErrNotFound )
+if( index == KErrNotFound )
-	{
+{
-	//plugin wasn't present, we load it now
+//plugin wasn't present, we load it now
-			LoadPluginL( pluginInfo );
+LoadPluginL( pluginInfo );
-	}
+}
-else if ( pluginInfo.iVersion > iPluginArray[index].iVersion )
+else if( pluginInfo.iVersion > iPluginArray[index].iVersion )
-	{
+{
-	//plugin was present but it is a newer version,
+//plugin was present but it is a newer version,
-	//remove old and load a new one
+//remove old and load a new one
-			DestroyPlugin( index );
+DestroyPlugin( index );
-			iPluginArray.Remove( index );
+iPluginArray.Remove( index );
-			LoadPluginL( pluginInfo );
+LoadPluginL( pluginInfo );
-	}
+}
 }
 //Remove old plugins
-for ( TInt i = iPluginArray.Count() - 1 ; i >= 0; i-- )
+for( TInt i = iPluginArray.Count() - 1; i >= 0; i-- )
-	{
+{
-	pluginInfo = iPluginArray[i];
+pluginInfo = iPluginArray[i];
-	if ( !PresentInArrayL( pluginInfo, infoArray ) )
+if ( !PresentInArrayL( pluginInfo, infoArray ) )
-		{
+{
-		DestroyPlugin( i );
+DestroyPlugin( i );
-	    iPluginArray.Remove( i );
+iPluginArray.Remove( i );
-		}
+}
-	}
+}
 CleanupStack::PopAndDestroy( &infoArray );
 }
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CPluginValidator::LoadPluginL( TPluginInfo& aPluginInfo )
 {
-	TAny* plug ( NULL );
+TAny* plug( NULL );
-	TInt err( KErrNone );
+TInt err( KErrNone );
-	TRAP( err, plug = REComSession::CreateImplementationL(
+TRAP( err, plug = REComSession::CreateImplementationL(
-										aPluginInfo.iImplementationUid,
+aPluginInfo.iImplementationUid,
-										aPluginInfo.iDtor_ID_Key, iParameter ) );
+aPluginInfo.iDtor_ID_Key, iParameter ) );
-	if( err==KErrNone && plug )
+if( err == KErrNone && plug )
-		{
+{
-		CleanupStack::PushL( plug );
+CleanupStack::PushL( plug );
-		aPluginInfo.iPlugin = plug;
+aPluginInfo.iPlugin = plug;
-		iPluginArray.AppendL( aPluginInfo );
+iPluginArray.AppendL( aPluginInfo );
-		CleanupStack::Pop( plug );
+CleanupStack::Pop( plug );
-		}
+}
-	}
+}

branch	RCL_3
changeset 31	8baec10861af
parent 30	a5a39a295112