diff -r 2455ef1f5bbc -r d5e927d5853b javaruntimes/jvmargmodifier/file/src/jvmargsmodifier.cpp --- a/javaruntimes/jvmargmodifier/file/src/jvmargsmodifier.cpp Wed Sep 01 12:33:18 2010 +0100 +++ b/javaruntimes/jvmargmodifier/file/src/jvmargsmodifier.cpp Tue Sep 14 21:06:50 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: A default empty implementation for JvmArgs modifier. +* Description: A file argument reader implementation for JvmArgs modifier. * */ @@ -23,33 +23,17 @@ #include "jvmargsfilereader.h" #include "argsmodifier.h" -#ifdef __SYMBIAN32__ -#include -_LIT(KArgsTxt, "Note! Modified VM arguments used!"); -#endif - void logArguments(std::wstring aArg) { WLOG1(EJavaRuntime, " '%S'", aArg.c_str()); } -#ifdef __SYMBIAN32__ -void showWarningDialogL() -{ - ::CAknGlobalNote* globalNote = CAknGlobalNote::NewL(); - CleanupStack::PushL(globalNote); - globalNote->ShowNoteL(EAknGlobalInformationNote, KArgsTxt); - CleanupStack::PopAndDestroy(globalNote); -} -#endif - - OS_EXPORT void java::runtime::modifyJvmArguments(const std::wstring& aIdentifier, std::list& aJvmArgs, std::list& aApplicationAndArgs) { - JELOG2(EJavaRuntime); + PLOG(EJavaRuntime, "JVM File Argument modifier in use"); #ifdef __SYMBIAN32__ // Open the extension directory of the J9 VM. @@ -70,9 +54,6 @@ std::for_each(aJvmArgs.begin(), aJvmArgs.end(), logArguments); WLOG(EJavaRuntime, "new App arguments"); std::for_each(aApplicationAndArgs.begin(), aApplicationAndArgs.end(), logArguments); -#ifdef __SYMBIAN32__ - TRAP_IGNORE(showWarningDialogL()); -#endif } }