javaruntimes/starterutils/src.s60/j9starters60.cpp
branchRCL_3
changeset 83 26b2b12093af
parent 77 7cee158cb8cd
equal deleted inserted replaced
77:7cee158cb8cd 83:26b2b12093af
     1 /*
     1 /*
     2 * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3 * All rights reserved.
     3 * All rights reserved.
     4 * This component and the accompanying materials are made available
     4 * This component and the accompanying materials are made available
     5 * under the terms of "Eclipse Public License v1.0"
     5 * under the terms of "Eclipse Public License v1.0"
     6 * which accompanies this distribution, and is available
     6 * which accompanies this distribution, and is available
     7 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
     7 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
    53     return new J9StarterS60();
    53     return new J9StarterS60();
    54 }
    54 }
    55 
    55 
    56 J9StarterS60::J9StarterS60()
    56 J9StarterS60::J9StarterS60()
    57 #ifdef __WINSCW__
    57 #ifdef __WINSCW__
    58     :
    58         :
    59     mVariant(0)
    59         mVariant(0)
    60 #endif // __WINSCW__
    60 #endif // __WINSCW__
    61 {
    61 {
    62     JELOG2(EJavaRuntime);
    62     JELOG2(EJavaRuntime);
    63 }
    63 }
    64 
    64 
    65 J9StarterS60::J9StarterS60(const Configuration configuration,
    65 J9StarterS60::J9StarterS60(const Configuration configuration,
    66                            const std::wstring& indetifier)
    66                            const std::wstring& indetifier)
    67 #ifdef __WINSCW__
    67 #ifdef __WINSCW__
    68     :
    68         :
    69     mVariant(0)
    69         mVariant(0)
    70 #endif // __WINSCW__
    70 #endif // __WINSCW__
    71 {
    71 {
    72     JELOG2(EJavaRuntime);
    72     JELOG2(EJavaRuntime);
    73     mConfiguration = configuration;
    73     mConfiguration = configuration;
    74     mIdentifier = indetifier;
    74     mIdentifier = indetifier;
   110                        L"com.nokia.mj.impl.rt.ui.qt.RuntimeUiQt");
   110                        L"com.nokia.mj.impl.rt.ui.qt.RuntimeUiQt");
   111 #else // RD_JAVA_UI_QT
   111 #else // RD_JAVA_UI_QT
   112     mJvmArgs.push_back(L"-Xmso16k"); // Native thread stack size.
   112     mJvmArgs.push_back(L"-Xmso16k"); // Native thread stack size.
   113     mJvmArgs.push_back(L"-Dcom.nokia.mj.impl.rt.ui="
   113     mJvmArgs.push_back(L"-Dcom.nokia.mj.impl.rt.ui="
   114                        L"com.nokia.mj.impl.rt.ui.avkon.RuntimeUiAvkon");
   114                        L"com.nokia.mj.impl.rt.ui.avkon.RuntimeUiAvkon");
       
   115     mJvmArgs.push_back(L"-Dcom.nokia.coreui=coreuiavkon");
   115 #endif // RD_JAVA_UI_QT
   116 #endif // RD_JAVA_UI_QT
   116 
   117 
   117     mJvmArgs.push_back(L"-Dfile.encoding=ISO-8859-1");
   118     mJvmArgs.push_back(L"-Dfile.encoding=ISO-8859-1");
   118     mJvmArgs.push_back(L"-Dmicroedition.connection.pkgs="
   119     mJvmArgs.push_back(L"-Dmicroedition.connection.pkgs="
   119                        L"com.nokia.mj.impl.gcf.protocol");
   120                        L"com.nokia.mj.impl.gcf.protocol");
   181 }
   182 }
   182 
   183 
   183 void J9StarterS60::doOverideHeap(const std::wstring& arg, const std::wstring& size)
   184 void J9StarterS60::doOverideHeap(const std::wstring& arg, const std::wstring& size)
   184 {
   185 {
   185     JELOG2(EJavaRuntime);
   186     JELOG2(EJavaRuntime);
   186     std::wstring maxHeapArg(arg);
   187 	std::wstring maxHeapArg(arg);
   187     maxHeapArg += size;
   188     maxHeapArg += size;
   188     maxHeapArg += L"K";
   189     maxHeapArg += L"K";
   189     mJvmArgs.push_back(maxHeapArg);
   190     mJvmArgs.push_back(maxHeapArg);
   190 }
   191 }
   191 
   192 
   226         pathType = BOOT_CLASSPATH_INSTALLER;
   227         pathType = BOOT_CLASSPATH_INSTALLER;
   227     }
   228     }
   228     else if (mIdentifier == L"TCK_runner")
   229     else if (mIdentifier == L"TCK_runner")
   229     {
   230     {
   230         pathType = BOOT_CLASSPATH_TCKRUNNER;
   231         pathType = BOOT_CLASSPATH_TCKRUNNER;
   231     }
       
   232     else if (mIdentifier == L"JavaControlPanel")
       
   233     {
       
   234         pathType = BOOT_CLASSPATH_JAVACONTROLPANEL;
       
   235     }
   232     }
   236 
   233 
   237     std::list<std::wstring> odcFiles;
   234     std::list<std::wstring> odcFiles;
   238     std::list<std::wstring> bcpEntities;
   235     std::list<std::wstring> bcpEntities;
   239     JavaOsLayer::bootClassPath(odcFiles, bcpEntities, pathType);
   236     JavaOsLayer::bootClassPath(odcFiles, bcpEntities, pathType);