FCL/sf/app/jrt: comparison javaextensions/iapinfo/src.s60/javacommdb.cpp

equal deleted inserted replaced

-:ae942d28ec0e
+:2455ef1f5bbc
 #include <e32base.h>
 #include <e32debug.h>
 #include "logger.h"
 #include "javajniutils.h"
-#include "fs_methodcall.h"
-#include "com_nokia_mid_iapinfo_IAPInfoImpl.h"
 using namespace CommsDat;
 using namespace java::util;
 // CONSTANTS
 _LIT(KIAPTable, "IAP");
 _LIT(KGlobalSettingsTable, "GlobalSettings");
 //_LIT( KNetworkTable, "Network" );
 _LIT(KFieldNameRecordId, "RecordId");
 _LIT(KFieldNameName, "Name");
-JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_IAPInfoImpl__1createSession
-(JNIEnv *, jobject)
-{
-IapInfoSession *sess = NULL;
-TRAPD(err,sess =  IapInfoSession::NewL(););
-if (err!=KErrNone)
-{
-return err;
-}
-return reinterpret_cast<int>(sess);
-}
 JNIEXPORT void JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1destroy(JNIEnv* ,
 jclass,
-jint /*aHandle*/)
+jint aHandle)
 {
-LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + destroy()");
+LOG1(ESOCKET, EInfo, "CJAVACOMMDB + destroy() handle: %D", aHandle);
-// JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
+JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-//  delete commdb;
+delete commdb;
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - destroy()");
 }
+JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1construct(JNIEnv* ,
+jclass)
+{
+LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + construct()");
+JavaCommDB *cdb = new JavaCommDB();
+TInt handle = reinterpret_cast<jint>(cdb);
+LOG1(EJavaIapInfo, EInfo, "CJAVACOMMDB - construct() handle: %D", handle);
+return handle;
+}
 JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1open(JNIEnv* aJni,
-jclass, jint aSessionHandle,
+jclass, jint aHandle,
 jstring aTableName)
 {
-LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + open()gggggggggg");
+LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + open()");
-IapInfoSession* session = reinterpret_cast<IapInfoSession *>(aSessionHandle);
+JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-JavaCommDB *cdb = new JavaCommDB(session);
 JStringUtils table(*aJni, aTableName);
-int err = -1;
-TRAP(err,CallMethodL(cdb, &JavaCommDB::OpenL,table,cdb->iSession););
+//LOG1(EJavaIapInfo,  EInfo,  "CJAVACOMMDB opening table: %S", table );
-TInt handle = reinterpret_cast<jint>(cdb);
+TRAPD(error, commdb->OpenL(table));
-if (err < 0)
+LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - open()");
-handle = err;
+return error;
-LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - open()hhhhhh");
+}
-return handle;
-}
 JNIEXPORT void JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1close(JNIEnv* ,
 jclass, jint aHandle)
 {
 LOG1(EJavaIapInfo, EInfo, "CJAVACOMMDB + close() handle: %D", aHandle);
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-CallMethod(commdb, &JavaCommDB::Close,commdb->iSession);
+TRAP_IGNORE(commdb->Close());
-//TRAP_IGNORE(commdb->Close());
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - close()");
 }
-void JavaCommDB::Destroy(JavaCommDB* aObj)
-{
-delete aObj;
-}
 JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1getRecordCount(JNIEnv* ,
 jclass,
 jint aHandle)
 {
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + getRecordCount()");
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
 TInt count = 0;
-CallMethod(count, commdb, &JavaCommDB::GetRecordCount,commdb->iSession);
+count = commdb->GetRecordCount();
-//count = commdb->GetRecordCount();
 LOG1(EJavaIapInfo, EInfo, "CJAVACOMMDB returning value: %D", count);
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - getRecordCount()");
 return count;
 }
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
 JStringUtils field(*aJni, aFieldName);
 //LOG1(EJavaIapInfo,  EInfo,  "CJAVACOMMDB  reading field value: %S", field );
+TRAPD(err, value = commdb->GetIntFieldValueL(field));
-TRAPD(err,CallMethodL(value, commdb, &JavaCommDB::GetIntFieldValueL,field,commdb->iSession););
-//TRAPD(err, value = commdb->GetIntFieldValueL(field));
 // Put the native error code into the Java error array
 jint javaError[1] =
 {   err};
 aJni->SetIntArrayRegion(aError, 0, 1, javaError);
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
 JStringUtils field(*aJni, aFieldName);
 //LOG1(EJavaIapInfo,  EInfo,  "CJAVACOMMDB  reading field value: %S", field );
-TRAPD(err,CallMethodL(value, commdb, &JavaCommDB::GetStringFieldValueL,field,commdb->iSession););
+TRAPD(err, value = commdb->GetStringFieldValueL(field));
-// TRAPD(err, value = commdb->GetStringFieldValueL(field));
 if (NULL != value && KErrNone == err)
 {
 str = S60CommonUtils::NativeToJavaString(*aJni, value->Des());
 //LOG1(EJavaIapInfo, EInfo, "CJAVACOMMDB  returning value: %S", value->Des() );
 delete value;
 JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1next(JNIEnv* ,
 jclass, jint aHandle)
 {
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + next()");
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-TInt rec;
+TInt rec = commdb->Next();
-CallMethod(rec, commdb, &JavaCommDB::Next,commdb->iSession);
-//TInt rec = commdb->Next();
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - next()");
 return rec;
 }
 JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1previous(JNIEnv* ,
 {
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + findById()");
 TInt recId = 0;
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-CallMethod(recId, commdb, &JavaCommDB::FindById,aId,commdb->iSession);
+recId = commdb->FindById(aId);
-//recId = commdb->FindById(aId);
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - findById()");
 return recId;
 }
 JNIEXPORT jint JNICALL Java_com_nokia_mid_iapinfo_CommsTable__1findByName(JNIEnv* aJni,
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + findByName()");
 TInt recId = 0;
 JStringUtils name(*aJni, aName);
 JavaCommDB* commdb = reinterpret_cast<JavaCommDB *>(aHandle);
-TRAPD(err,CallMethodL(recId, commdb, &JavaCommDB::FindByNameL,name,commdb->iSession););
+TRAP(recId, recId = commdb->FindByNameL(name));
-if (err < KErrNone)
-recId = err;
-//TRAP(recId, recId = commdb->FindByNameL(name));
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - findByName()");
 return recId;
 }
 /* ---------------------------------------------------------------------------
 *    JavaCommDB class implementation ;
 * ---------------------------------------------------------------------------
 */
-JavaCommDB::JavaCommDB(IapInfoSession *aSession)
-{
-iSession = aSession;
-}
 // ---------------------------------------------------------------------------
 //    Delete allocated member objects.
 // -----------------------------------------------------------------------------
 JavaCommDB::~JavaCommDB()
 {
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB  - ~JavaCommDB()");
 }
 // ---------------------------------------------------------------------------
 //    Delete allocated member objects.
-// -----------------------------------------------------------------------------
+//    @return error code
-void JavaCommDB::Close()
+// -----------------------------------------------------------------------------
+TInt JavaCommDB::Close()
 {
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB + Close()");
 iCurrentRecord = 0;
-if (iTable)
+delete iTable;
-delete iTable;
 iTable = NULL;
+delete iDb;
+iDb = NULL;
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - Close()");
+return KErrNone;
 }
 // ---------------------------------------------------------------------------
 //    Opens the given table.
 //    @param aTablename name of the CommDB table to be opened
 //    @return error code
 // -----------------------------------------------------------------------------
 void JavaCommDB::OpenL(const TDesC& aTableName)
 {
 //LOG1(EJavaIapInfo, EInfo, "CJAVACOMMDB + OpenL(): open table: %S",   aTableName);
-//iDb = CMDBSession::NewL(KCDVersion1_1);
+iDb = CMDBSession::NewL(KCDVersion1_1);
 iCurrentRecord = 0;
 if (0 == aTableName.Compare(KIAPTable))
 {
 // Create IAP table recordset
 CCDConnectionPrefsRecord> (KCDTIdConnectionPrefsRecord);
 LOG(EJavaIapInfo, EInfo,
 "CJAVACOMMDB  OpenL(): ConnectionPreferences table opened.");
 }
 // Load the table
+iTable->LoadL(*iDb);
-iTable->LoadL(*(iSession->iDb));
 LOG(EJavaIapInfo, EInfo, "CJAVACOMMDB - OpenL()");
 }
 // ---------------------------------------------------------------------------
 //    Get number of records in the current table.

branch	RCL_3
changeset 66	2455ef1f5bbc
parent 65	ae942d28ec0e
child 71	d5e927d5853b