diff -r 7cee158cb8cd -r 26b2b12093af javaextensions/pim/jni/src/pimmanager.cpp --- a/javaextensions/pim/jni/src/pimmanager.cpp Wed Sep 15 12:05:25 2010 +0300 +++ b/javaextensions/pim/jni/src/pimmanager.cpp Wed Oct 13 14:23:59 2010 +0300 @@ -69,7 +69,6 @@ jint aManagerHandle, jint aPimListType, jstring aPimListName, - jstring aCalName, jintArray aError) { JELOG2(EPim); @@ -78,15 +77,13 @@ int error = 0; try { - list = manager->openPimList( - static_cast< TPIMListType>(aPimListType),aPimListName,aCalName, aJniEnv); + static_cast< TPIMListType>(aPimListType),aPimListName, aJniEnv); } catch (int aError) { error = aError; } - SetJavaErrorCode(aJniEnv, aError, error); // We now own the list (through the handle). The ownership of @@ -117,86 +114,6 @@ return javaStringArray; } -JNIEXPORT jint -JNICALL Java_com_nokia_mj_impl_pim_PIMManager__1createCalendar( - JNIEnv* aJniEnv, - jobject /*aPeer*/, - jint aManagerHandle, - jstring aCalName, - jstring aDisplayName) -{ - JELOG2(EPim); - pimbasemanager* manager = - reinterpret_cast< pimbasemanager *>(aManagerHandle); - TInt error = 0; - try - { - manager->createCalendar(aCalName, aDisplayName,aJniEnv); - } - catch (int aError) - { - error = aError; - } - return error; -} - -JNIEXPORT jint -JNICALL Java_com_nokia_mj_impl_pim_PIMManager__1deleteCalendar( - JNIEnv* aJniEnv, - jobject /*aPeer*/, - jint aManagerHandle, - jstring aCalName) -{ - JELOG2(EPim); - pimbasemanager* manager = - reinterpret_cast< pimbasemanager *>(aManagerHandle); - TInt error = 0; - - try - { - manager->deleteCalendar(aCalName,aJniEnv); - } - catch (int aError) - { - error = aError; - } - - return error; - -} - -JNIEXPORT jobjectArray -JNICALL Java_com_nokia_mj_impl_pim_PIMManager__1listCalendars( - JNIEnv* aJniEnv, - jobject /*aPeer*/, - jint aManagerHandle, - jintArray aError) -{ - JELOG2(EPim); - pimbasemanager* manager = - reinterpret_cast< pimbasemanager *>(aManagerHandle); - jobjectArray javaStringArray = NULL; - javaStringArray = manager->listCalendars(aError, - aJniEnv); - return javaStringArray; -} - -JNIEXPORT jobjectArray -JNICALL Java_com_nokia_mj_impl_pim_PIMManager__1listCalendarNames( - JNIEnv* aJniEnv, - jobject /*aPeer*/, - jint aManagerHandle, - jintArray aError) -{ - JELOG2(EPim); - pimbasemanager* manager = - reinterpret_cast< pimbasemanager *>(aManagerHandle); - - jobjectArray javaStringArray = NULL; - javaStringArray = manager->listCalendarNames(aError, - aJniEnv); - return javaStringArray; -} // End of File