Revision: 201011 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 31 Mar 2010 21:49:52 +0300
branchRCL_3
changeset 17 d440d4c7e9b4
parent 13 096dad6e50a9
child 18 cf376912743d
child 20 5964140ed25a
Revision: 201011 Kit: 201013
appfw/apparchitecture/apfile/apfmimecontentpolicy.rss
appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h
coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp
coreapplicationuis/SysAp/Src/SysApAppUi.cpp
coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp
coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp
sysresmonitoring/oodmonitor/conf/uiklaf.confml
sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml
sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h
sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp
sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomclient.h
sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties.h
sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties2.h
--- a/appfw/apparchitecture/apfile/apfmimecontentpolicy.rss	Mon Mar 15 12:41:10 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-NAME CCLS
-
-#include <uikon.rh>
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf=""; }
-
-//----------------------------------------------------
-//    r_commoneng_closed_content_list
-//	  Contains all MIME types in closed content list.	    
-//----------------------------------------------------
-//
-RESOURCE ARRAY r_commoneng_closed_content_list
-    {
-    items=
-        {	
-        LBUF { txt="application/vnd.oma.drm.message"; },
-		LBUF { txt="application/vnd.oma.drm.rights+xml"; },
-		LBUF { txt="application/vnd.oma.drm.rights+wbxml"; },
-		LBUF { txt="application/vnd.nokia.ringing-tone"; },
-		LBUF { txt="audio/amr-wb"; },
-		LBUF { txt="audio/sp-midi"; },
-		LBUF { txt="image/vnd.nok.3Dscreensaver"; },
-		LBUF { txt="image/vnd.nok-wallpaper"; },
-		LBUF { txt="image/vnd.nok-oplogo"; },
-		LBUF { txt="image/vnd.nok-oplogo-color"; },
-		LBUF { txt="application/java"; },
-		LBUF { txt="application/java-archive"; },
-		LBUF { txt="application/x-java-archive"; },
-		LBUF { txt="text/vnd.sun.j2me.app-descriptor"; },
-		LBUF { txt="application/x-NokiaGameData"; },
-		LBUF { txt="application/vnd.symbian.install"; },
-		LBUF { txt="x-epoc/x-sisx-app"; }  
-        };
-    }
-
-//----------------------------------------------------
-//    r_commoneng_closed_extensions_list
-//	  List of closed file extensions.	
-//----------------------------------------------------
-//
-RESOURCE ARRAY r_commoneng_closed_extensions_list
-    {
-    items=
-        {
-		LBUF { txt=".dm"; },
-		LBUF { txt=".dr"; },
-		LBUF { txt=".drc"; },
-		LBUF { txt=".ott"; },
-		LBUF { txt=".awb"; },
-		LBUF { txt=".mid"; },
-		LBUF { txt=".c3d"; },
-		LBUF { txt=".jar"; },
-		LBUF { txt=".ngd"; },
-		LBUF { txt=".sis"; },
-		LBUF { txt=".sisx"; }
-        };
-    }
-
-
-// End of file
--- a/appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h	Mon Mar 15 12:41:10 2010 +0200
+++ b/appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h	Wed Mar 31 21:49:52 2010 +0300
@@ -63,6 +63,13 @@
  */
 const TUint32 KUikOODDiskFreeSpaceWarningNoteLevel = 0x00000006;
 
+/**
+ * Threshold for disk space warning note level for mass memory.
+ * Read-only key. Default value: 20971520
+ */
+const TUint32 KUikOODDiskFreeSpaceWarningNoteLevelMassMemory = 0x00000007;
+
+
 #endif __UIKLAF_INTERNAL_CR_KEYS_H__
 
 // End of file
--- a/coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp	Mon Mar 15 12:41:10 2010 +0200
+++ b/coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp	Wed Mar 31 21:49:52 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // INCLUDES
-#include <HWRMLightDomainCRKeys.h>
+#include <hwrmlightdomaincrkeys.h>
 #include <coreapplicationuisdomainpskeys.h>
 #include <hal.h>
 #include <atcmdpluginresource.rsg>
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Mon Mar 15 12:41:10 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Wed Mar 31 21:49:52 2010 +0300
@@ -190,10 +190,6 @@
 _LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
 _LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
 
-
-_LIT(KPowerSaveActivate,"Power saving mode activated");
-_LIT(KPowerSaveDeActivate,"Power saving mode deactivated");
-
 // ============================ MEMBER FUNCTIONS ==============================
 
 // ----------------------------------------------------------------------------
@@ -738,7 +734,10 @@
             {
             TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): aType == EEventKeyUp, PowerKeyIsLockKey = %d, iLastPowerKeyWasShort = %d, iPowerKeyPopupMenuActive = %d, iCharging = %d" ), iSysApFeatureManager->PowerKeyIsLockKey(), iLastPowerKeyWasShort, iPowerKeyPopupMenuActive, iCharging ) );
             if ( iSysApFeatureManager->PowerKeyIsLockKey()
-                    && iLastPowerKeyWasShort && !iPowerKeyPopupMenuActive && !haveStatusPane )
+                 && iLastPowerKeyWasShort 
+				 				 && !iPowerKeyPopupMenuActive
+                 && !haveStatusPane  
+                 && ( aKeyEvent.iScanCode == EStdKeyDevice2 ) )
                 {
                 //if the power key is the lock key && the last keypress was short && the power menu is not active
                 //then lock the phone
@@ -1342,7 +1341,6 @@
 void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
     {
     TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
-
     TInt tone( EAvkonSIDNoSound );
     TAknGlobalNoteType noteType( EAknGlobalBatteryLowNote );
     CAknGlobalNote* note = CAknGlobalNote::NewLC();
@@ -1441,7 +1439,7 @@
             tone = EAvkonSIDInformationTone;
             break;
         case EPowerSaveModeActivated:
-            noteType = EAknGlobalConfirmationNote;
+        		noteType = EAknGlobalConfirmationNote;
             tone = EAvkonSIDConfirmationTone;
             secondaryDisplayId = SecondaryDisplay::ECmdShowPowerSavingActivatedNote;
             break;
@@ -1548,11 +1546,11 @@
                 break;
                 }
             case EPowerSaveModeActivated:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_ACTIVATED_CONF_NOTE, iEikonEnv );
-                break;
+                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_ACTIVATED_CONF_NOTE,  iEikonEnv );
+                 break;
             case EPowerSaveModeDeactivated:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATED_CONF_NOTE, iEikonEnv );
-                break;
+                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATED_CONF_NOTE,  iEikonEnv );
+                 break;
             case ECannotActivatePowerSaveMode:
                 noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_FAILED_WARNING_NOTE, iEikonEnv );
                 break;
@@ -1588,16 +1586,6 @@
             {
             TPtr textBuffer = noteStringBuf->Des();
             TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL Next:note->ShowNoteL" ) ) );
-			if(textBuffer.Compare(KPowerSaveActivate)==0)
-                {
-                CleanupStack::PopAndDestroy(2); // note and noteStringbuf
-                return;
-                }
-            if(textBuffer.Compare(KPowerSaveDeActivate)==0)
-                     {
-                      CleanupStack::PopAndDestroy(2); // note and noteStringbuf
-                      return;
-                    }
             note->ShowNoteL( noteType, textBuffer );
             CleanupStack::PopAndDestroy( ); // noteStringbuf
             }
@@ -6715,7 +6703,7 @@
         case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
             UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
             ShowUiNoteL( EPowerSaveModeActivated );
-            break;
+           break;
         
         case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
             UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp	Mon Mar 15 12:41:10 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp	Wed Mar 31 21:49:52 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -287,46 +287,63 @@
 //
 void CBatteryPopupControl::Draw( const TRect& /*aRect*/ ) const
     {
-    FUNC_LOG
+   FUNC_LOG
       	
     CWindowGc& gc = SystemGc();
     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-    
+
     if( iIcon )
         {
-        CFbsBitmap* bmp = NULL;
         TRgb color( KRgbWhite ); // Default never used
-        bmp = AknsUtils::GetCachedBitmap( skin, KAknsIIDQsnComponentColorBmpCG2 );
+        
         AknsUtils::GetCachedColor( skin, color, 
-            KAknsIIDQsnComponentColors, EAknsCIQsnComponentColorsCG2 );
-
-        AknIconUtils::SetSize( iIcon->Mask(), iBitmapLayout.Rect().Size() );
-        if ( bmp )
-            {
-            iBitmapLayout.DrawImage( gc, bmp, iIcon->Mask() );
-            }
-        else
+                KAknsIIDQsnIconColors, EAknsCIQsnIconColorsCG6  );
+        
+        if (AknIconUtils::IsMifIcon(iIcon->Bitmap()))
             {
-            AknIconUtils::SetSize( iIcon->Bitmap(), iBitmapLayout.Rect().Size() );     
-            bmp = iIcon->Bitmap();
-            iBitmapLayout.DrawImage( gc, bmp, iIcon->Mask() );
+            AknIconUtils::SetIconColor( iIcon->Bitmap(), color );
             }
-        gc.Reset(); 
+
+        AknIconUtils::SetSize( iIcon->Bitmap(), iBitmapLayout.Rect().Size() );
+        iBitmapLayout.DrawImage( gc, iIcon->Bitmap(), iIcon->Mask() );
+
+        gc.Reset();
         }
-    TRgb textColor;
-    AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnHighlightColors,
-                               EAknsCIQsnHighlightColorsCG3 );
-
-    gc.SetPenStyle( CGraphicsContext::ESolidPen ); 
-    gc.SetPenColor( textColor );
-
+    
+    gc.SetPenStyle( CGraphicsContext::ESolidPen );
     const CFont* font = iFont;
     if ( !font )
         {
         font = iCoeEnv->NormalFont();
         }
     gc.UseFont( font );
+        
+    if(iText)
+        {
+        TRect rect( iLinkRect );
+        TRgb textContentColor;
+        TInt err = AknsUtils::GetCachedColor( skin, textContentColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 );
+        
+        if (!err)
+            {
+            TRAP_IGNORE( AknLayoutUtils::OverrideControlColorL( *iText,
+                    EColorLabelText, textContentColor ) );
+            }
+        
+        gc.SetPenColor( textContentColor );
+         
+        TInt textBaseLineOffset = 0;
+        textBaseLineOffset = (rect.Height() - font->FontMaxHeight())/2;
+        gc.DrawText( *(iText->Text()), rect, textBaseLineOffset, CGraphicsContext::ELeft );
+        //gc.Reset();
+       
+        }
+    
+    TRgb textColor;
+    AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnHighlightColors,
+                               EAknsCIQsnHighlightColorsCG3 );
 
+    gc.SetPenColor( textColor );
     gc.SetUnderlineStyle( EUnderlineOn );
     if(iLinkText)
         {
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp	Mon Mar 15 12:41:10 2010 +0200
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp	Wed Mar 31 21:49:52 2010 +0300
@@ -48,12 +48,13 @@
     RFile file;
     User::LeaveIfError(fileSession.Connect());
     TInt err = file.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
-
+        
     if ( err != KErrNone )
         {
         RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , FileWrite : Failed to open the file"));
         return;
         }
+
     TInt pos = 0;
     file.Seek(ESeekEnd,pos);
     TInt size = files.Count();
@@ -74,6 +75,7 @@
         CleanupStack::PopAndDestroy();//Filename
         file.Flush();
         }
+
     file.Close();
     fileSession.Close();    
     }
@@ -93,14 +95,20 @@
     User::LeaveIfError(fileSession.Connect());
     TInt ret = excludeFileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead);
 
-    TInt err1 = fileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
-    
-    fileName.Seek(ESeekEnd,pos);
-    if ( ret != KErrNone || err1 != KErrNone)
+		if(ret != KErrNone)
+			{
+			RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , MergeFiles : Failed to open the file"));
+			return;
+			}
+    ret = fileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
+    if ( ret != KErrNone)
             {
+            excludeFileName.Close();
             RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , MergeFiles : Failed to open the file"));
             return;
             }
+    fileName.Seek(ESeekEnd,pos);
+    
     HBufC* buffer = HBufC::NewMaxLC( buffer_size );        
     TPtr8 bufferPtr( (TUint8*)buffer->Ptr(), buffer_size);
     
@@ -154,7 +162,7 @@
     file.Flush();
     file.Close();
     fileSession.Close();
-    
+    dir.Close();
     Swi::RSisRegistrySession session;
     CleanupClosePushL(session);
     User::LeaveIfError(session.Connect());
Binary file sysresmonitoring/oodmonitor/conf/uiklaf.confml has changed
Binary file sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml has changed
--- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h	Mon Mar 15 12:41:10 2010 +0200
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h	Wed Mar 31 21:49:52 2010 +0300
@@ -90,6 +90,7 @@
         TInt                        iDefaultMassStorage;
         TInt                        iDefaultRomDrive;
         RResourceFile               iResourceFile;
+        TInt64                      iOODWarningThresholdMassMemory;
     };
 
 #endif // __OUTOFDISKMONITOR_H__
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp	Mon Mar 15 12:41:10 2010 +0200
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp	Wed Mar 31 21:49:52 2010 +0300
@@ -107,18 +107,22 @@
     CRepository* repository( NULL );
     TInt warningThreshold(0);
     TInt criticalThreshold(0);
+    TInt warningThresholdMassMemory(0);
     TRAPD( err, repository = CRepository::NewL( KCRUidUiklaf ) );
     if ( err == KErrNone )
         {
         err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevel, warningThreshold);
         err = repository->Get(KUikOODDiskCriticalThreshold, criticalThreshold);
+        err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevelMassMemory, warningThresholdMassMemory);
         }
     delete repository;
     iOODWarningThreshold = warningThreshold;
     iOODCriticalThreshold = criticalThreshold;
+    iOODWarningThresholdMassMemory = warningThresholdMassMemory;
     
-	TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold: %d percent",iOODWarningThreshold);
+	TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Phone Memory: %d percent",iOODWarningThreshold);
     TRACES1("COutOfDiskMonitor::ConstructL: Critical threshold: %ld bytes",iOODCriticalThreshold);
+    TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory);
     
     iOutOfDiskNotifyObserver = COutOfDiskNotifyObserver::NewL( this, iFs );
     TRACES("COutOfDiskMonitor::ConstructL: End");
@@ -208,8 +212,16 @@
         TRACES1("COutOfDiskMonitor::GetThreshold: Volume size: %ld",volSize);		
 		if ( ret == KErrNone )
 			{
-			TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold: Used disk space %d percent",iOODWarningThreshold);
-			threshold = ((volSize*(100-iOODWarningThreshold))/100);		
+			if(aDrive == EDriveC)
+			    {
+                TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold);
+                threshold = ((volSize*(100-iOODWarningThreshold))/100);
+			    }
+			else
+			    {
+                TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory);
+			    threshold = iOODWarningThresholdMassMemory;			                
+			    }
 			}
         }
     else if (aLevel == DISK_SPACE_CRITICAL)
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomclient.h	Mon Mar 15 12:41:10 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  
-*
-*/
-
-
-
-
-#ifndef __T_CLIENT_H__
-#define __T_CLIENT_H__
-
-#include <e32std.h>
-
-class ROOMAllocSession : public RSessionBase
-	{
-public:
-	IMPORT_C TInt Connect();
-	IMPORT_C TInt Reset();
-	IMPORT_C TInt StartAllocating();
-	IMPORT_C TInt StopAllocating();
-	IMPORT_C TInt Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit);
-	IMPORT_C TInt MemoryLow(TUid aPlugin);
-	IMPORT_C TInt MemoryGood(TUid aPlugin);
-	};
-
-#endif
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties.h	Mon Mar 15 12:41:10 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  
-*
-*/
-
-
-
-#ifndef DUMMYPLUGIN_PROPETIES_H_
-#define DUMMYPLUGIN_PROPETIES_H_
-
-const TUid KUidOomPropertyCategory = {0x10286A3E};
-
-//The key is the UID of the implementation instance, i.e. 10286A34 To 10286A3D
-const TInt KUidOOMDummyPluginFirstImplementation(0x10286A34);
-const TInt KUidOOMDummyPluginLastImplementation(0x10286A3D);
-
-const TUint KOOMDummyPluginImplementationCount = 10;
-
-const TUint KOOMDummyPluginLowMemoryCount = 0;
-const TUint KOOMDummyPluginGoodMemoryCount = 1 * KOOMDummyPluginImplementationCount;
-const TUint KOOMDummyPluginCurrentAllocationBytes = 2 * KOOMDummyPluginImplementationCount;
-const TUint KOOMDummyPluginBytesRequested = 3 * KOOMDummyPluginImplementationCount;
-
-#endif /* DUMMYPLUGIN_PROPETIES_H_ */
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties2.h	Mon Mar 15 12:41:10 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  
-*
-*/
-
-
-
-
-